Channel status handling and some utility functions

Author: cujomalainey

src/BaseClasses/ANTPLUS_BaseProfile.cpp

@@ -62,25 +62,26 @@ void BaseProfile::pushChannelConfig() {
 
 void BaseProfile::openChannel() {
     OpenChannel oc = OpenChannel(_channel);
+    _channelStatus = CHANNEL_STATUS_SEARCHING;
     _router->send(oc);
 }
 
 void BaseProfile::closeChannel() {
     CloseChannel cc = CloseChannel(_channel);
+    _channelStatus = CHANNEL_STATUS_ASSIGNED;
     _router->send(cc);
 }
 
 void BaseProfile::onChannelEventResponse(ChannelEventResponse& msg) {
     uint8_t event = msg.getCode();
-    // TODO maybe define an explicit state enum?
+
     switch (event) {
     case STATUS_EVENT_CHANNEL_CLOSED:
-        _channelStatus = STATUS_EVENT_CHANNEL_CLOSED;
-        break;
     case STATUS_EVENT_RX_FAIL_GO_TO_SEARCH:
-        _channelStatus = STATUS_EVENT_RX_FAIL_GO_TO_SEARCH;
+        _channelStatus = CHANNEL_STATUS_ASSIGNED;
         break;
     }
+
     _onChannelEvent.call(msg);
 }
 
@@ -110,11 +111,19 @@ void BaseProfile::onBurstTransferData(BurstTransferData& msg) {
     _onDataPage.call(msg);
 }
 
+void BaseProfile::onChannelStatus(ChannelStatus& msg) {
+    _channelStatus = msg.getChannelState();
+}
+
 void BaseProfile::checkProfileStatus() {
     if (!getDeviceNumber() || !getTransmissionType()) {
         RequestMessage rm = RequestMessage(CHANNEL_ID, _channel);
         send(rm);
     }
+    if (_channelStatus == CHANNEL_STATUS_SEARCHING) {
+        RequestMessage rm = RequestMessage(CHANNEL_STATUS, _channel);
+        send(rm);
+    }
 }
 
 void BaseProfile::send(AntRequest& msg) {
@@ -127,4 +136,8 @@ uint8_t BaseProfile::getTransmissionType() {
 
 uint16_t BaseProfile::getDeviceNumber() {
     return _deviceNumber;
+}
+
+void BaseProfile::loop() {
+    _router->loop();
 }

src/BaseClasses/ANTPLUS_BaseProfile.h

@@ -74,6 +74,7 @@ class BaseProfile {
     virtual void onBurstTransferData(BurstTransferData& msg);
     virtual void onChannelEventResponse(ChannelEventResponse& msg);
     virtual void onChannelIdResponse(ChannelIdResponse& msg);
+    virtual void onChannelStatus(ChannelStatus& msg);
     void setRouter(AntPlusRouter* router);
     void setChannelNumber(uint8_t channel);
     // TODO this should probably have the whole message passed in so
@@ -90,6 +91,7 @@ class BaseProfile {
     void pushChannelConfig();
     void openChannel();
     void closeChannel();
+    void loop();
 private:
     void checkProfileStatus();
     AntPlusRouter* _router;

src/BaseClasses/ANTPLUS_BaseSlaveProfile.cpp

@@ -12,3 +12,16 @@ BaseSlaveProfile::BaseSlaveProfile(uint16_t deviceNumber) : BaseProfile(deviceNu
 BaseSlaveProfile::BaseSlaveProfile(uint16_t deviceNumber, uint8_t transmissionType) : BaseProfile(deviceNumber, transmissionType) {
 
 }
+
+void BaseSlaveProfile::searchForDevices(uint16_t* buffer) {
+    // TODO
+}
+
+uint8_t BaseSlaveProfile::waitForPair() {
+    // TODO add a timeout in the event packed was dropped?
+    while (getChannelStatus() == CHANNEL_STATUS_SEARCHING) {
+        // If a event saying we disconnected happened then we will check it, otherwise wait for data to come in
+        loop();
+    }
+    return getChannelStatus();
+}

src/BaseClasses/ANTPLUS_BaseSlaveProfile.h

@@ -9,7 +9,16 @@ class BaseSlaveProfile : public BaseProfile {
     BaseSlaveProfile(uint16_t deviceNumber);
     BaseSlaveProfile(uint16_t deviceNumber, uint8_t transmissionType);
 
-    // TODO add a search method
+    /**
+     * Pass in a pointer to an array uint16_t[ANTPLUS_MAX_CHANNELS_POSSIBLE]
+     *
+     * Any non-0 entry after the function returned is a nearby device
+     */
+    void searchForDevices(uint16_t* buffer);
+    /**
+     * Will return once the device either pairs or timesout its search
+     */
+    uint8_t waitForPair();
 
 private:
 };

src/MainClasses/ANTPLUS_AntPlusRouter.cpp

@@ -172,7 +172,10 @@ void AntPlusRouter::onChannelIdResponse(ChannelIdResponse& msg) {
 }
 
 void AntPlusRouter::onChannelStatus(ChannelStatus& msg) {
-    // TODO
+    uint8_t channel = msg.getChannelNumber();
+    if (_profiles[channel]) {
+        _profiles[channel]->onChannelStatus(msg);
+    }
 }
 
 void AntPlusRouter::onEncryptionModeParameters(EncryptionModeParameters& msg) {