Request channel ID if we are receiving data on a wildcard

Author: cujomalainey

src/BaseClasses/ANTPLUS_BaseProfile.cpp

@@ -88,4 +88,43 @@ void BaseProfile::onChannelIdResponse(ChannelIdResponse& msg) {
     setDeviceNumber(msg.getDeviceNumber());
     setTransmissionType(msg.getTransmissionType());
     _onChannelIdResponse.call(msg);
+}
+
+void BaseProfile::onAcknowledgedData(AcknowledgedData& msg) {
+    checkProfileStatus();
+    _onDataPage.call(msg);
+}
+
+void BaseProfile::onAdvancedBurstData(AdvancedBurstData& msg) {
+    checkProfileStatus();
+    _onDataPage.call(msg);
+}
+
+void BaseProfile::onBroadcastData(BroadcastData& msg) {
+    checkProfileStatus();
+    _onDataPage.call(msg);
+}
+
+void BaseProfile::onBurstTransferData(BurstTransferData& msg) {
+    checkProfileStatus();
+    _onDataPage.call(msg);
+}
+
+void BaseProfile::checkProfileStatus() {
+    if (!getDeviceNumber() || !getTransmissionType()) {
+        RequestMessage rm = RequestMessage(CHANNEL_ID, _channel);
+        send(rm);
+    }
+}
+
+void BaseProfile::send(AntRequest& msg) {
+    _router->send(msg);
+}
+
+uint8_t BaseProfile::getTransmissionType() {
+    return _transmissionType;
+}
+
+uint16_t BaseProfile::getDeviceNumber() {
+    return _deviceNumber;
 }

src/BaseClasses/ANTPLUS_BaseProfile.h

@@ -60,14 +60,18 @@ class BaseProfile {
      * Close radio channel and stop transmitting
      */
     virtual void stop() = 0;
+    /**
+     * Sends a message through the connected router
+     */
+    void send(AntRequest& msg);
 
     /******************************************
      *LIBRARY INTERNAL ONLY FUNCTIONS BELOW
      ******************************************/
-    virtual void onAcknowledgedData(AcknowledgedData& msg) { _onDataPage.call(msg); }
-    virtual void onAdvancedBurstData(AdvancedBurstData& msg) { _onDataPage.call(msg); }
-    virtual void onBroadcastData(BroadcastData& msg) { _onDataPage.call(msg); }
-    virtual void onBurstTransferData(BurstTransferData& msg) { _onDataPage.call(msg); }
+    virtual void onAcknowledgedData(AcknowledgedData& msg);
+    virtual void onAdvancedBurstData(AdvancedBurstData& msg);
+    virtual void onBroadcastData(BroadcastData& msg);
+    virtual void onBurstTransferData(BurstTransferData& msg);
     virtual void onChannelEventResponse(ChannelEventResponse& msg);
     virtual void onChannelIdResponse(ChannelIdResponse& msg);
     void setRouter(AntPlusRouter* router);
@@ -87,6 +91,7 @@ class BaseProfile {
     void openChannel();
     void closeChannel();
 private:
+    void checkProfileStatus();
     AntPlusRouter* _router;
     Callback<AntRxDataResponse&> _onDataPage;
     Callback<AntRxDataResponse&> _onOtherDataPage;