MCU8MASS-3048 MCU8MASS-2997 Fix compatibility issues with latest version of ArduionJson. This commit also fixes some of the warnings when using the -Wall flag with arduino-cli, namely unused arguments in functions.

M65649 · M65649 · commit 407c9d51c0b5 · 2024-03-06T10:39:48.000+01:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,19 +1,9 @@
 {
     "C_Cpp.errorSquiggles": "enabled",
-    "cSpell.words": [
-        "atcab",
-        "CEREG",
-        "CFUN",
-        "CREG",
-        "Sequans",
-        "SQNHTTPQRY",
-        "SQNHTTPRCV",
-        "SQNHTTPSND"
-    ],
-    "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 }",
+    "C_Cpp.clang_format_fallbackStyle": "{ IndentWidth: 4, AllowShortLoopsOnASingleLine: true, AllowShortBlocksOnASingleLine: true, ColumnLimit: 80, BinPackParameters: false, BinPackArguments: 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=COM12",
+        "--port=COM14",
         "--ignore=lib",
         "-s"
     ],
diff --git a/examples/extract_certificates/extract_certificates.ino b/examples/extract_certificates/extract_certificates.ino
@@ -28,7 +28,7 @@ void setup() {
     ATCA_STATUS atca_status = ECC608.begin();
 
     if (atca_status != ATCA_SUCCESS) {
-        Log.errorf(F("Failed to initialize ECC608, status code: 0x%X\r\n"),
+        Log.errorf(F("Failed to initialize ECC608, status code: %d\r\n"),
                    atca_status);
         return;
     }
@@ -46,28 +46,26 @@ void setup() {
              &max_root_certificate_size)) != ATCACERT_E_SUCCESS) {
 
         Log.errorf(F("Failed to get root certificate's max size, status code: "
-                     "0x%X\r\n"),
+                     "%d\r\n"),
                    atca_cert_status);
         return;
     }
 
     if ((atca_cert_status = ECC608.getSignerCertificateSize(
              &max_signer_certificate_size)) != ATCACERT_E_SUCCESS) {
 
-        Log.errorf(
-            F("Failed to get signer certificate's max size, status code: "
-              "0x%X\r\n"),
-            atca_cert_status);
+        Log.errorf(F("Failed to get signer certificate's max size, status "
+                     "code: %d\r\n"),
+                   atca_cert_status);
         return;
     }
 
     if ((atca_cert_status = ECC608.getDeviceCertificateSize(
              &max_device_certificate_size)) != ATCACERT_E_SUCCESS) {
 
-        Log.errorf(
-            F("Failed to get device certificate's max size, status code: "
-              "0x%X\r\n"),
-            atca_cert_status);
+        Log.errorf(F("Failed to get device certificate's max size, status "
+                     "code: %d\r\n"),
+                   atca_cert_status);
         return;
     }
 
@@ -90,7 +88,7 @@ void setup() {
              &root_certificate_size)) != ATCACERT_E_SUCCESS) {
 
         Log.errorf(F("Failed to get root certificate, status code: "
-                     "0x%X\r\n"),
+                     "%d\r\n"),
                    atca_cert_status);
         return;
     } else {
@@ -110,7 +108,7 @@ void setup() {
              &signer_certificate_size)) != ATCACERT_E_SUCCESS) {
 
         Log.errorf(F("Failed to get signer certificate, status code: "
-                     "0x%X\r\n"),
+                     "%d\r\n"),
                    atca_cert_status);
         return;
     } else {
diff --git a/examples/mqtt_aws/mqtt_aws.ino b/examples/mqtt_aws/mqtt_aws.ino
@@ -90,7 +90,7 @@ void setup() {
         if (published_successfully) {
             Log.info(F("Published message"));
         } else {
-            Log.error(F("Failed to publish\r\n"));
+            Log.error(F("Failed to publish"));
         }
 
         delay(2000);
diff --git a/examples/plant_monitoring/plant_monitoring.ino b/examples/plant_monitoring/plant_monitoring.ino
@@ -109,7 +109,7 @@ void setup() {
  */
 size_t retrieveData(char* data, const size_t data_capacity) {
     // Get air metrics
-    StaticJsonDocument<50> air_data;
+    JsonDocument air_data;
     sensors_event_t humidity, temperature;
     aht.getEvent(&humidity, &temperature);
 
@@ -118,16 +118,16 @@ size_t retrieveData(char* data, const size_t data_capacity) {
     air_data["Illumination"] = veml.readLux();
 
     // Get soil metrics
-    StaticJsonDocument<25> soil_data;
+    JsonDocument soil_data;
     const float moisture_level = 100 * ((float)seesaw.touchRead(0) / 1023);
     soil_data["Moisture"]      = moisture_level;
 
     // Get device metrics
-    StaticJsonDocument<25> device_data;
+    JsonDocument device_data;
     device_data["SupplyVoltage"] = LowPower.getSupplyVoltage();
 
     // Build data payload
-    StaticJsonDocument<200> payload;
+    JsonDocument payload;
     payload["Device_ID"] = DEVICE_ID;
     payload["Air"]       = air_data;
     payload["Soil"]      = soil_data;
diff --git a/examples/provision/provision.ino b/examples/provision/provision.ino
@@ -1142,7 +1142,8 @@ static ATCA_STATUS constructCSR(char* pem, size_t* pem_size) {
         .cert_elements       = NULL,
         .cert_elements_count = 0,
         .cert_template       = csr,
-        .cert_template_size  = length};
+        .cert_template_size  = length,
+        .ca_cert_def         = NULL};
 
     return (ATCA_STATUS)atcacert_create_csr_pem(&csr_definition, pem, pem_size);
 }
@@ -1672,7 +1673,7 @@ void otherServiceMqttProvision() {
 
         while (!requestAndSaveToNVM(
             F("Please paste in the CA certificate and press enter. It "
-              "should be on the follwing form:\r\n"
+              "should be on the following form:\r\n"
               "-----BEGIN CERTIFICATE-----\r\n"
               "MIIDXTCCAkWgAwIBAgIJAJC1[...]j3tCx2IUXVqRs5mlSbvA==\r\n"
               "-----END CERTIFICATE-----\r\n"),
@@ -1775,7 +1776,7 @@ void otherServiceMqttProvision() {
                 while (!requestAndSaveToNVM(
                     F("Please paste in the public key certificate provide by "
                       "your broker after having signed the CSR\r\nand press "
-                      "enter. It should be on the follwing form:\r\n"
+                      "enter. It should be on the following form:\r\n"
                       "-----BEGIN CERTIFICATE-----\r\n"
                       "MIIDXTCCAkWgAwIBAgIJAJC1[...]j3tCx2IUXVqRs5mlSbvA=="
                       "\r\n"
@@ -1870,7 +1871,7 @@ void otherServiceMqttProvision() {
             while (!requestAndSaveToNVM(
                 F("Please paste in the public key certificate and press "
                   "enter. It "
-                  "should be on the follwing form:\r\n"
+                  "should be on the following form:\r\n"
                   "-----BEGIN CERTIFICATE-----\r\n"
                   "MIIDXTCCAkWgAwIBAgIJAJC1[...]j3tCx2IUXVqRs5mlSbvA==\r\n"
                   "-----END CERTIFICATE-----\r\n"),
@@ -2001,7 +2002,7 @@ void provisionHttp() {
         while (!requestAndSaveToNVM(
             F("Please paste in the CA certificate and press enter. It "
               "should "
-              "be on the follwing form:\r\n"
+              "be on the following form:\r\n"
               "-----BEGIN CERTIFICATE-----\r\n"
               "MIIDXTCCAkWgAwIBAgIJAJC1[...]j3tCx2IUXVqRs5mlSbvA=="
               "\r\n"
diff --git a/examples/sandbox/sandbox.ino b/examples/sandbox/sandbox.ino
@@ -95,8 +95,8 @@ void resetInterrupt(void) {
 void disconnectedFromNetwork(void) { event_flags |= NETWORK_DISCONN_FLAG; }
 void disconnectedFromBroker(void) { event_flags |= BROKER_DISCONN_FLAG; }
 
-void receivedMessage(const char* topic,
-                     const uint16_t msg_length,
+void receivedMessage(__attribute__((unused)) const char* topic,
+                     __attribute__((unused)) const uint16_t msg_length,
                      const int32_t msg_id) {
 
     received_message_identifiers_head = (received_message_identifiers_head +
@@ -143,7 +143,7 @@ void startStreamTimer() {
 
 void stopStreamTimer() { TCA0.SINGLE.CTRLA = 0; }
 
-static StaticJsonDocument<256> doc;
+static JsonDocument doc;
 
 void decodeMessage(const char* message) {
     DeserializationError error = deserializeJson(doc, message);
@@ -182,12 +182,12 @@ void decodeMessage(const char* message) {
 
         if (strcmp_P(target_led, PSTR("USER")) == 0) {
             led = Led::USER;
-        } else if (strcmp(target_led, "ERROR") == 0) {
+        } else if (strcmp_P(target_led, PSTR("ERROR")) == 0) {
             led = Led::ERROR;
         } else {
             Log.errorf(F("Invalid LED value provided, "
                          "led provided = %s\r\n"),
-                       led);
+                       target_led);
             return;
         }
 
diff --git a/scripts/compile_examples.sh b/scripts/compile_examples.sh
@@ -5,7 +5,7 @@ BOARD_CONFIG="DxCore:megaavr:avrdb:appspm=no,chip=avr128db48,clock=24internal,bo
 # Test for AVR-IoT Cellular Mini
 for d in examples/*/ ; do
         echo "Compiling $d...";
-        arduino-cli compile -b $BOARD_CONFIG --libraries=".." "$d" --build-path "builds/mini/$(basename $d)";
+        arduino-cli compile -b $BOARD_CONFIG --libraries=".." "$d" --build-path "builds/mini/$(basename $d)" --warnings all;
 
         # Check the error code
         if [ $? != 0 ]; then 
diff --git a/scripts/make.bat b/scripts/make.bat
@@ -4,12 +4,12 @@ pushd %~dp0
 set SCRIPTPATH=%CD%
 popd
 
-set TARGET="%SCRIPTPATH%\..\examples\mqtt_azure\mqtt_azure.ino"
+set TARGET="%SCRIPTPATH%\..\examples\mqtt_custom_broker\mqtt_custom_broker.ino"
 set BUILD_DIR="%SCRIPTPATH%\..\build"
 set BOARD_CONFIG="DxCore:megaavr:avrdb:appspm=no,chip=avr128db48,clock=24internal,bodvoltage=1v9,bodmode=disabled,eesave=enable,resetpin=reset,millis=tcb2,startuptime=8,wiremode=mors2,printf=full"
 
 rmdir /s /q %BUILD_DIR%
 
 echo Compiling...
 
-arduino-cli compile %TARGET% -b %BOARD_CONFIG% --build-path %BUILD_DIR% 
+arduino-cli compile %TARGET% -b %BOARD_CONFIG% --build-path %BUILD_DIR% --warnings all
diff --git a/scripts/make.sh b/scripts/make.sh
@@ -11,4 +11,4 @@ fi
 echo "Compiling..."
 
 # Extra args appended to the end, e.g. --clean by the $1 flag
-arduino-cli compile "$TARGET" -b $BOARD_CONFIG --build-path "$SCRIPTPATH/../build" $1
+arduino-cli compile "$TARGET" -b $BOARD_CONFIG --build-path "$SCRIPTPATH/../build" --warnings all $1
diff --git a/src/cryptoauthlib/lib/atca_iface.c b/src/cryptoauthlib/lib/atca_iface.c
@@ -465,7 +465,7 @@ uint8_t ifacecfg_get_address(ATCAIfaceCfg * cfg)
 ATCA_STATUS ifacecfg_set_address(
     ATCAIfaceCfg * cfg,     /**< [in] Interface configuration structure to update */
     uint8_t addr,           /**< [in] Desired address */
-    ATCAKitType kitiface    /**< [in] Optional parameter to set the kit iface type */
+    __attribute__((unused)) ATCAKitType kitiface    /**< [in] Optional parameter to set the kit iface type */
 )
 {
     ATCA_STATUS status = ATCA_BAD_PARAM;
diff --git a/src/cryptoauthlib/lib/calib/calib_sha.c b/src/cryptoauthlib/lib/calib/calib_sha.c
@@ -108,7 +108,7 @@ ATCA_STATUS calib_sha_base(ATCADevice device, uint8_t mode, uint16_t length, con
 
         if ((data_out != NULL) && (packet.data[ATCA_COUNT_IDX] > 4))
         {
-            if (packet.data[ATCA_COUNT_IDX] - ATCA_PACKET_OVERHEAD > *data_out_size)
+            if ((size_t) (packet.data[ATCA_COUNT_IDX] - ATCA_PACKET_OVERHEAD) > (size_t) *data_out_size)
             {
                 status = ATCA_SMALL_BUFFER;
                 break;
diff --git a/src/ecc608.cpp b/src/ecc608.cpp
@@ -175,7 +175,7 @@ ECC608Class::writeProvisionData(const size_t number_of_provision_items,
                    32;
 
     if (payload_size > slot_size) {
-        return ATCA_INVALID_LENGTH;
+        return ATCA_INVALID_SIZE;
     }
 
     // Now we can build the payload data which includes the headers and the
@@ -256,6 +256,13 @@ int ECC608Class::getSignerCertificateSize(size_t* size) {
 }
 
 int ECC608Class::getSignerCertificate(uint8_t* certificate, size_t* size) {
+
+    const ATCA_STATUS status = atcab_wakeup();
+
+    if (status != ATCA_SUCCESS) {
+        return -99;
+    }
+
     return tng_atcacert_read_signer_cert(certificate, size);
 }
 
diff --git a/src/ecc608.h b/src/ecc608.h
@@ -88,7 +88,7 @@ class ECC608Class {
      * @param data_sizes [in] Array of the data sizes for each provisioning
      * item.
      *
-     * @return ATCA_STATUS error code. Will return ATCA_INVALID_LENGTH if the
+     * @return ATCA_STATUS error code. Will return ATCA_INVALID_SIZE if the
      * size of the data in total is greater than the slot size. If the read back
      * data does not match the written content, ATCA_ASSERT_FAILURE will be
      * returned.
diff --git a/src/hal_i2c_driver.cpp b/src/hal_i2c_driver.cpp
@@ -5,6 +5,7 @@
  * for i2c communication, but we have to provide the implementation for them.
  * Thus we have to have these functions here.
  */
+
 #include "cryptoauthlib/lib/cryptoauthlib.h"
 
 #include <Arduino.h>
@@ -13,17 +14,20 @@
 #define WIRE     Wire
 #define WIRE_MUX 2
 
-ATCA_STATUS hal_i2c_init(ATCAIface iface, ATCAIfaceCfg* cfg) {
+ATCA_STATUS hal_i2c_init(__attribute__((unused)) ATCAIface iface,
+                         ATCAIfaceCfg* cfg) {
     WIRE.swap(WIRE_MUX);
     WIRE.setClock(cfg->atcai2c.baud);
     WIRE.begin();
 
     return ATCA_SUCCESS;
 }
 
-ATCA_STATUS hal_i2c_post_init(ATCAIface iface) { return ATCA_SUCCESS; }
+ATCA_STATUS hal_i2c_post_init(__attribute__((unused)) ATCAIface iface) {
+    return ATCA_SUCCESS;
+}
 
-ATCA_STATUS hal_i2c_send(ATCAIface iface,
+ATCA_STATUS hal_i2c_send(__attribute__((unused)) ATCAIface iface,
                          uint8_t word_address,
                          uint8_t* txdata,
                          int txlength) {
@@ -52,7 +56,7 @@ ATCA_STATUS hal_i2c_send(ATCAIface iface,
     return ATCA_SUCCESS;
 }
 
-ATCA_STATUS hal_i2c_receive(ATCAIface iface,
+ATCA_STATUS hal_i2c_receive(__attribute__((unused)) ATCAIface iface,
                             uint8_t word_address,
                             uint8_t* rxdata,
                             uint16_t* rxlength) {
@@ -75,11 +79,14 @@ ATCA_STATUS hal_i2c_receive(ATCAIface iface,
 }
 
 ATCA_STATUS
-hal_i2c_control(ATCAIface iface, uint8_t option, void* param, size_t paramlen) {
+hal_i2c_control(__attribute__((unused)) ATCAIface iface,
+                __attribute__((unused)) uint8_t option,
+                __attribute__((unused)) void* param,
+                __attribute__((unused)) size_t paramlen) {
     return ATCA_UNIMPLEMENTED;
 }
 
-ATCA_STATUS hal_i2c_release(void* hal_data) {
+ATCA_STATUS hal_i2c_release(__attribute__((unused)) void* hal_data) {
     WIRE.end();
     return ATCA_SUCCESS;
 }
diff --git a/src/http_client.cpp b/src/http_client.cpp
diff --git a/src/mqtt_client.cpp b/src/mqtt_client.cpp
diff --git a/test/test_examples.py b/test/test_examples.py

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void setup() {`
`90`	`90`	`if (published_successfully) {`
`91`	`91`	`Log.info(F("Published message"));`
`92`	`92`	`} else {`
`93`		`- Log.error(F("Failed to publish\r\n"));`
	`93`	`+ Log.error(F("Failed to publish"));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`delay(2000);`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ uint8_t ifacecfg_get_address(ATCAIfaceCfg * cfg)`
`465`	`465`	`ATCA_STATUS ifacecfg_set_address(`
`466`	`466`	`ATCAIfaceCfg * cfg, /*< [in] Interface configuration structure to update /`
`467`	`467`	`uint8_t addr, /*< [in] Desired address /`
`468`		`- ATCAKitType kitiface /*< [in] Optional parameter to set the kit iface type /`
	`468`	`+ __attribute__((unused)) ATCAKitType kitiface /*< [in] Optional parameter to set the kit iface type /`
`469`	`469`	`)`
`470`	`470`	`{`
`471`	`471`	`ATCA_STATUS status = ATCA_BAD_PARAM;`