chore: Refactor after on-device test

Author: zfields

examples/Example0_LibrarylessCommunication/Example0_LibrarylessCommunication.ino

@@ -62,7 +62,7 @@ void setup()
     delay(250);
 
     // This command (required) causes the data to be delivered to the Project on
-    // notehub.io that has claimed this Product ID.  (see above)
+    // notehub.io that has claimed this Product ID (see above).
     if (myProductID[0])
     {
         txRxPinsSerial.println("{\"cmd\":\"hub.set\",\"product\":\"" myProductID "\"}");
@@ -88,7 +88,7 @@ void loop()
     // Count the simulated measurements that we send to the cloud, and stop the
     // demo before long.
     static unsigned eventCounter = 0;
-    if (eventCounter++ > 25)
+    if (++eventCounter > 25)
     {
         return;
     }

examples/Example1_NotecardBasics/Example1_NotecardBasics.ino

@@ -65,10 +65,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 
@@ -125,7 +125,7 @@ void loop()
     // Count the simulated measurements that we send to the cloud, and stop the
     // demo before long.
     static unsigned eventCounter = 0;
-    if (eventCounter++ > 25)
+    if (++eventCounter > 25)
     {
         return;
     }

examples/Example2_PeriodicCommunications/Example2_PeriodicCommunications.ino

@@ -84,10 +84,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 
@@ -171,7 +171,7 @@ void loop()
     // Count the simulated measurements that we send to the cloud, and stop the
     // demo before long.
     static unsigned eventCounter = 0;
-    if (eventCounter++ > 25)
+    if (++eventCounter > 25)
     {
         return;
     }

examples/Example3_InboundPolling/Example3_InboundPolling.ino

@@ -54,10 +54,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 

examples/Example4_InboundInterrupts/Example4_InboundInterrupts.ino

@@ -67,10 +67,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 

examples/Example5_UsingTemplates/Example5_UsingTemplates.ino

@@ -72,10 +72,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 
@@ -151,13 +151,13 @@ void setup()
 }
 
 // In the Arduino main loop which is called repeatedly, add outbound data every
-// 5 seconds
+// 15 seconds
 void loop()
 {
     // Count the simulated measurements that we send to the cloud, and stop the
     // demo before long.
     static unsigned eventCounter = 0;
-    if (eventCounter++ > 25)
+    if (++eventCounter > 25)
     {
         return;
     }
@@ -213,5 +213,5 @@ void loop()
     }
 
     // Delay between measurements
-    delay(5 * 1000); // 5 seconds
+    delay(15 * 1000); // 5 seconds
 }

examples/Example6_SensorTutorial/Example6_SensorTutorial.ino

@@ -34,10 +34,10 @@ void setup()
 #ifdef usbSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    usbSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
     for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
     notecard.setDebugOutputStream(usbSerial);
 #endif
 
@@ -57,8 +57,18 @@ void setup()
     notecard.sendRequestWithRetry(req, 5); // 5 seconds
 }
 
+// In the Arduino main loop which is called repeatedly, add outbound data every
+// 15 seconds
 void loop()
 {
+    // Count the simulated measurements that we send to the cloud, and stop the
+    // demo before long.
+    static unsigned eventCounter = 0;
+    if (++eventCounter > 25)
+    {
+        return;
+    }
+
     float temperature = sensor.temp();
     float humidity = sensor.humidity();
 

examples/Example7_PowerControl/Example7_PowerControl.ino

@@ -5,7 +5,6 @@
 //
 // This tutorial requires a Notecarrier-F (or equivalently-wired carrier board)
 // designed enable the Notecard's ATTN pin to control a host MCU's power supply.
-//
 
 #include <Notecard.h>
 
@@ -20,8 +19,21 @@
 #define notehubUploadPeriodMins 10
 #define hostSleepSeconds 60
 
-// Arduino serial debug monitor port definitions
-#define usbSerial Serial
+// Arduino serial debug monitor port definitions.
+// Note this is using the TX/RX pins for logging and not the USB connector. An
+// FTDI cable is required to read the logs produced by this sketch. Power is
+// delivered over USB, which interferes with the way the Notecard puts the
+// Feather MCU to sleep. As a result, USB cannot be used to capture logs.
+#ifdef ARDUINO_AVR_UNO
+  #define txRxSerial Serial
+#elif ARDUINO_FEATHER_F405
+  // https://github.com/stm32duino/Arduino_Core_STM32/issues/1990
+  #define txRxSerial Serial3
+#elif ARDUINO_NUCLEO_L432KC
+  #define txRxSerial Serial2
+#else
+  #define txRxSerial Serial1
+#endif
 
 // Notecard I2C port definitions
 Notecard notecard;
@@ -52,14 +64,14 @@ const char voltSensorSegmentID[] = "VOLT";
 void setup()
 {
     // Set up for debug output (if available).
-#ifdef usbSerial
+#ifdef txRxSerial
     // If you open Arduino's serial terminal window, you'll be able to watch
     // JSON objects being transferred to and from the Notecard for each request.
+    txRxSerial.begin(115200);
     const size_t usb_timeout_ms = 3000;
-    for (const size_t start_ms = millis(); !usbSerial && (millis() - start_ms) < usb_timeout_ms;)
+    for (const size_t start_ms = millis(); !txRxSerial && (millis() - start_ms) < usb_timeout_ms;)
         ;
-    usbSerial.begin(115200);
-    notecard.setDebugOutputStream(usbSerial);
+    notecard.setDebugOutputStream(txRxSerial);
 #endif
 
     // Initialize the physical I2C I/O channel to the Notecard
@@ -120,7 +132,10 @@ void setup()
 void loop()
 {
     // Bump the number of cycles
-    globalState.cycles++;
+    if (++globalState.cycles > 25)
+    {
+        return;
+    }
 
     // Simulation of a device taking a measurement of a temperature sensor.
     // Because we don't have an actual external hardware sensor in this example,