MCU8MASS-2364 Minor corrections

- Correct some serial output for tests
- Update atca_config
- Make Azure example subscribe to same topic as publishing to

Author: M65649

.vscode/settings.json

@@ -13,7 +13,7 @@
     "C_Cpp.clang_format_fallbackStyle": "{ IndentWidth: 4, AllowShortLoopsOnASingleLine: true, AllowShortBlocksOnASingleLine: true, ColumnLimit: 80, BinPackParameters: false, BinPackArguments: false, AllowAllParametersOfDeclarationOnNextLine: false, AlignConsecutiveMacros: true, FixNamespaceComments: false, NamespaceIndentation: All, AlignConsecutiveAssignments: true, AlignEscapedNewlines: true, AlignOperands: Align, AlignTrailingComments: true, AllowAllParametersOfDeclarationOnNextLine: false, AllowAllArgumentsOnNextLine: false, PenaltyBreakAssignment: 50, PointerAlignment: Left, ReferenceAlignment: Left }",
     "pytest.testing.cwd": "${workspaceFolder}/test",
     "python.testing.pytestArgs": [
-        "--port=COM18",
+        "--port=COM12",
         "--ignore=lib",
         "-s"
     ],

examples/mqtt_azure/mqtt_azure.ino

@@ -13,7 +13,7 @@
 #include <mqtt_client.h>
 
 const char MQTT_PUB_TOPIC_FMT[] PROGMEM = "devices/%s/messages/events/";
-const char MQTT_SUB_TOPIC_FMT[] PROGMEM = "%s/messages/devicebound/#";
+const char MQTT_SUB_TOPIC_FMT[] PROGMEM = "devices/%s/messages/events/";
 
 static char mqtt_sub_topic[128];
 static char mqtt_pub_topic[128];

examples/mqtt_custom_broker/mqtt_custom_broker.ino

@@ -28,7 +28,7 @@ void setup() {
     LedCtrl.begin();
     LedCtrl.startupCycle();
 
-    Log.info(F("Starting MQTT with custom broker example (polling mode)"));
+    Log.info(F("Starting MQTT with custom broker"));
 
     // Establish LTE connection
     if (!Lte.begin()) {

examples/mqtt_low_power/mqtt_low_power.ino

@@ -77,9 +77,6 @@ static uint32_t counter = 0;
 
 void loop() {
 
-    Mcp9808.wake();
-    Veml3328.wake();
-
     // If we're not using PSM, all connections will be terminated when power
     // down is issued, so we need to re-establish s connection
 #if !USE_PSM
@@ -113,5 +110,9 @@ void loop() {
 #endif
 
     Log.info(F("Woke up!"));
+
+    Mcp9808.wake();
+    Veml3328.wake();
+
     delay(10000);
 }

examples/power_save/power_save.ino

@@ -78,7 +78,12 @@ void setup() {
     Mcp9808.shutdown();
 
     // Connecting to the network might fail, so we just retry
-    while (!Lte.begin()) {}
+    if (!Lte.begin()) {
+        Log.error(F("Failed to connect to operator"));
+
+        // Halt here
+        while (true) {}
+    }
 
     Log.infof(F("Connected to operator: %s\r\n"), Lte.getOperator().c_str());
 }

src/cryptoauthlib/atca_config.h

@@ -60,7 +60,7 @@
 #define ATCAB_SELFTEST_EN                 FEATURE_DISABLED
 #define ATCAB_SHA_HMAC_EN                 FEATURE_DISABLED
 #define ATCAB_SIGN_INTERNAL_EN            FEATURE_DISABLED
-#define ATCAB_UPDATEEXTRA_EN              FEATURE_DISABLED
+#define ATCAB_UPDATEEXTRA_EN              FEATURE_ENABLED
 #define ATCAB_AES_CCM_RAND_IV_EN          FEATURE_DISABLED
 #define ATCAB_VERIFY_EXTERN_STORED_MAC_EN FEATURE_DISABLED
 #define ATCAB_AES_GFM_EN                  FEATURE_DISABLED

src/mqtt_client.cpp

@@ -726,6 +726,7 @@ bool MqttClientClass::publish(const char* topic,
                                       timeout_ms)) {
         Log.warn(F("Timed out waiting for publish confirmation. Consider "
                    "increasing timeout for publishing\r\n"));
+        LedCtrl.off(Led::DATA, true);
         return false;
     }
 
@@ -741,6 +742,7 @@ bool MqttClientClass::publish(const char* topic,
 
         Log.error(
             F("Failed to retrieve status code from publish notification"));
+        LedCtrl.off(Led::DATA, true);
         return false;
     }
 

test/test_examples.py

@@ -310,7 +310,7 @@ def example_test_data():
                 "expectation": "\\[INFO\\] Connecting to operator.{0,}OK!"
             },
             {
-                "expectation": "\\[INFO\\] Connecting to AWS.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Published message"
@@ -345,7 +345,7 @@ def example_test_data():
                 "expectation": "\\[INFO\\] Connecting to operator.{0,}OK!"
             },
             {
-                "expectation": "\\[INFO\\] Connecting to Azure IoT Hub.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Published message"
@@ -371,13 +371,13 @@ def example_test_data():
         ],
         "mqtt_custom_broker": [
             {
-                "expectation": "\\[INFO\\] Starting MQTT with custom broker example (polling mode)"
+                "expectation": "\\[INFO\\] Starting MQTT with custom broker"
             },
             {
                 "expectation": "\\[INFO\\] Connecting to operator.{0,}OK!"
             },
             {
-                "expectation": "\\[INFO\\] Connecting to broker.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Published message: Hello world: (\\d{1,})"
@@ -410,7 +410,7 @@ def example_test_data():
             },
             {
                 "timeout": 90,
-                "expectation": "\\[INFO\\] Connecting to broker.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Published message: \\d{1,}"
@@ -427,7 +427,7 @@ def example_test_data():
             },
             {
                 "timeout": 90,
-                "expectation": "\\[INFO\\] Connecting to broker.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Published message: \\d{1,}"
@@ -451,7 +451,7 @@ def example_test_data():
                 "expectation": "\\[INFO\\] Connecting to operator.{0,}OK!"
             },
             {
-                "expectation": "\\[INFO\\] Connecting to broker.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "expectation": "\\[INFO\\] Subscribed to mchp_topic"
@@ -495,7 +495,7 @@ def example_test_data():
                 "expectation": "\\[INFO\\] Not connected to broker. Attempting to connect!"
             },
             {
-                "expectation": "\\[INFO\\] Connecting to broker.{0,}OK!"
+                "expectation": "\\[INFO\\] Connecting to MQTT broker.{0,}OK!"
             },
             {
                 "repeat": 5,
@@ -671,9 +671,9 @@ def program(request, backend):
         os.mkdir(build_directory)
 
     compilation_return_code = subprocess.run(
-        ["arduino-cli", "compile", f"{sketch_path}", "-b", f"{BOARD_CONFIG}", "--output-dir", f"{build_directory}"], shell=True).returncode
+        ["arduino-cli", "compile", f"{sketch_path}", "-b", f"{BOARD_CONFIG}", "--build-path", f"{build_directory}"], shell=True).returncode
 
-    assert compilation_return_code == 0, f"{example_name} failed to compile"
+    assert compilation_return_code == 0, f"{example_name} failed to compile, return code: {compilation_return_code}"
 
     hex_file = build_directory / f"{os.path.basename(sketch_path)}.hex"
 
@@ -783,19 +783,23 @@ def test_https_with_header(request, backend, session_config, example_test_data):
     run_test(request, backend, session_config, example_test_data)
 
 
-def test_mqtt_low_power(request, backend, session_config, example_test_data):
+def test_mqtt_aws(request, backend, session_config, example_test_data):
     run_test(request, backend, session_config, example_test_data)
 
 
-def test_mqtt_password_authentication(request, backend, session_config, example_test_data):
+def test_mqtt_azure(request, backend, session_config, example_test_data):
     run_test(request, backend, session_config, example_test_data)
 
 
-def test_mqtt_polling(request, backend, session_config, example_test_data):
+def test_mqtt_custom_broker(request, backend, session_config, example_test_data):
     run_test(request, backend, session_config, example_test_data)
 
 
-def test_mqtt_polling_aws(request, backend, session_config, example_test_data):
+def test_mqtt_low_power(request, backend, session_config, example_test_data):
+    run_test(request, backend, session_config, example_test_data)
+
+
+def test_mqtt_password_authentication(request, backend, session_config, example_test_data):
     run_test(request, backend, session_config, example_test_data)