identify backoff logic

Author: zfields

src/ArduinoIoTCloudNotecard.cpp

@@ -43,8 +43,10 @@
  * CONSTANTS
  ******************************************************************************/
 
+#ifdef BACKOFF
 static size_t const BACKOFF_BASE_MS = 60000;           // 1 minute
 static uint32_t const BACKOFF_MAX_MS = 3600000;        // 1 hour
+#endif
 static size_t const CBOR_NOTE_MSG_MAX_SIZE = 255;
 static size_t const DEFAULT_READ_INTERVAL_MS = 1000;   // 1 second
 static size_t const FAILSAFE_READ_INTERVAL_MS = 10000; // 10 seconds
@@ -74,8 +76,10 @@ ArduinoIoTCloudNotecard::ArduinoIoTCloudNotecard()
   ,_message_stream(std::bind(&ArduinoIoTCloudNotecard::sendMessage, this, std::placeholders::_1))
   ,_thing(&_message_stream)
   ,_device(&_message_stream)
+#ifdef BACKOFF
   ,_backoff_multiplier{1}
   ,_last_failed_attach_request_ms{0}
+#endif
   ,_notecard_last_read_ms{static_cast<uint32_t>(-DEFAULT_READ_INTERVAL_MS)}
   ,_notecard_read_interval_ms{DEFAULT_READ_INTERVAL_MS}
   ,_interrupt_pin{-1}
@@ -217,6 +221,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Connected()
   /* Poll Notecard for new messages */
   pollNotecard();
 
+#ifdef BACKOFF
   /* Respect back-off */
   if (_last_failed_attach_request_ms) {
     const uint32_t backoff_ms = (BACKOFF_BASE_MS * _backoff_multiplier);
@@ -228,6 +233,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Connected()
       _last_failed_attach_request_ms = 0;
     }
   }
+#endif
 
   /* Call CloudDevice process to get configuration */
   _device.update();
@@ -395,20 +401,23 @@ void ArduinoIoTCloudNotecard::processCommand(const uint8_t *buf, size_t len)
         String new_thing_id = String(command.thingUpdateCmd.params.thing_id);
 
         if (!new_thing_id.length()) {
+#ifdef BACKOFF
           _last_failed_attach_request_ms = ::millis();
           DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s received null Thing ID (current back-off: %u minute%s).", __FUNCTION__, _backoff_multiplier, ((_backoff_multiplier == 1) ? "" : "s"));
+#endif
           _thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
 
           /* Send message to device state machine to inform we have received a null thing-id */
           Message message;
           message = { DeviceRegisteredCmdId };
           _device.handleMessage(&message);
         } else {
+#ifdef BACKOFF
           DEBUG_VERBOSE("ArduinoIoTCloudNotecard::%s resetting back-off variables", __FUNCTION__);
           /* Reset back-off variables */
           _backoff_multiplier = 1;
           _last_failed_attach_request_ms = 0;
-
+#endif
           if (_device.isAttached() && _thing_id != new_thing_id) {
             DEBUG_DEBUG("ArduinoIoTCloudNotecard::%s detaching Thing ID: %s", __FUNCTION__, _thing_id.c_str());
             detachThing();

src/ArduinoIoTCloudNotecard.h

@@ -107,8 +107,10 @@ class ArduinoIoTCloudNotecard : public ArduinoIoTCloudClass
     ArduinoCloudDevice _device;
 
     // Notecard member variables
+#ifdef BACKOFF
     uint32_t _backoff_multiplier;
     uint32_t _last_failed_attach_request_ms;
+#endif // BACKOFF
     uint32_t _notecard_last_read_ms;
     uint32_t _notecard_read_interval_ms;
     int _interrupt_pin;