Merge branch '1x'

Author: nicklasb

components/robusto/base/src/logging/logging_esp-idf.c

@@ -44,7 +44,7 @@ void compat_rob_log_writev(rob_log_level_t level, const char *tag, const char *f
 // On the ESP platform, there is no need for the sparse mode.
 void compat_rob_log_write_sparse(const char *tag, const char *format)
 {
-    va_list arg_list = NULL;
+    va_list arg_list;
     compat_rob_log_writev(ROB_LOG_LOCAL_LEVEL, tag, format, arg_list);
 }
 #endif

components/robusto/base/src/system/robusto_interrupts_esp32.c

@@ -78,9 +78,17 @@ uint8_t digitalPinToGPIO(uint8_t pin) {
       case 18: return GPIO_NUM_18;
       case 19: return GPIO_NUM_19;
       case 21: return GPIO_NUM_21;
+      // These are not always available
+      #ifdef GPIO_NUM_22
       case 22: return GPIO_NUM_22;
+      #endif
+      #ifdef GPIO_NUM_23
       case 23: return GPIO_NUM_23;
+      #endif
+      #ifdef GPIO_NUM_25
       case 25: return GPIO_NUM_25;
+      #endif
+
       case 26: return GPIO_NUM_26;
       case 27: return GPIO_NUM_27;
       /* Not exposed 

components/robusto/base/src/system/robusto_system.c

@@ -84,7 +84,7 @@ void *robusto_malloc(size_t size)
 #endif
 }
 
-void *robusto_realloc(void **ptr, size_t size)
+void *robusto_realloc(void *ptr, size_t size)
 {
 #ifdef USE_ESPIDF
     return heap_caps_realloc(ptr, size, MALLOC_CAP_8BIT);

components/robusto/conductor/src/robusto_conductor_client.c

@@ -147,6 +147,8 @@ void robusto_add_conductor() {
         e_media_type media_type = robusto_mt_lora;
     #elif defined(CONFIG_ROBUSTO_CONDUCTOR_CLIENT_CONDUCTOR_MEDIA_I2C)
         e_media_type media_type = robusto_mt_i2c;
+    #elif defined(CONFIG_ROBUSTO_NETWORK_MOCK_TESTING)
+        e_media_type media_type = robusto_mt_mock;
     #else
         #error "No media type selected for initial contact with the conductor."
     #endif

components/robusto/idf_component.yml

@@ -1,4 +1,4 @@
-version: "2.0.1"
+version: "1.3.1"
 description: "Robusto framework"
 url: "https://github.com/RobustoFramework"
 repository: "https://github.com/RobustoFramework/Robusto.git"
@@ -9,7 +9,7 @@ dependencies:
   espressif/esp_modem: "^1"
   jgromes/radiolib: "^6.4"
   # Screen support
-  lvgl/lvgl: "^9" 
+  lvgl/lvgl: "^8" 
   espressif/esp_lvgl_port: "^2"
   espressif/esp_lcd_sh1107: "^1"
 maintainers:

components/robusto/include/robusto_message.h

@@ -222,7 +222,7 @@ typedef rob_ret_val_t cb_send_message(robusto_peer_t *peer, uint8_t *data, uint3
  * @return If true, send receipt (used in initialisation, but not with parts)
  */
 
-bool handle_fragmented(robusto_peer_t *peer, e_media_type media_type, uint8_t *data, int len, uint32_t fragment_size, cb_send_message * send_message);
+bool handle_fragmented(robusto_peer_t *peer, e_media_type media_type, const uint8_t *data, int len, uint32_t fragment_size, cb_send_message * send_message);
 
 
 /**

components/robusto/include/robusto_system.h

@@ -73,7 +73,7 @@ void * robusto_malloc(size_t size);
  * @param size  Number of bytes to allocate
  * @return void* Pointer to the re-allocated memory
  */
-void * robusto_realloc(void **ptr, size_t size);
+void * robusto_realloc(void *ptr, size_t size);
 
 /**
  * @brief Deallocates the memory at the pointer

components/robusto/input/src/robusto_input_resistance.c

@@ -42,8 +42,10 @@ rob_ret_val_t adc_calibration_init(adc_unit_t _adc_unit, adc_channel_t _adc_chan
         ROB_LOGE(input_log_prefix, "adc_cali_check_scheme failed with the %i error code.", sch_res);
         return ROB_FAIL;
     }
+#if ADC_CALI_SCHEME_VER_LINE_FITTING
     if (scheme_mask == ADC_CALI_SCHEME_VER_LINE_FITTING)
     {
+
         adc_cali_line_fitting_config_t line_fitting_config = {
             .unit_id = _adc_unit,
             .atten = ADC_ATTEN_DB_11,
@@ -54,26 +56,26 @@ rob_ret_val_t adc_calibration_init(adc_unit_t _adc_unit, adc_channel_t _adc_chan
             ROB_LOGE(input_log_prefix, "adc_cali_create_scheme_line_fitting failed with the %i error code.", lf_res);
             return ROB_FAIL;
         }
+
     }
-    else if (scheme_mask == ADC_CALI_SCHEME_VER_CURVE_FITTING)
+    else
+#elif ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+
+    if (scheme_mask == ADC_CALI_SCHEME_VER_CURVE_FITTING)
     {
-#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
         adc_cali_curve_fitting_config_t curve_fitting_config = {
-            .unit_id = adc_unit,
-            .chan = adc_channel,
+            .unit_id = _adc_unit,
+            .chan = _adc_channel,
             .atten = ADC_ATTEN_DB_11,
             .bitwidth = ADC_BITWIDTH_DEFAULT};
-        esp_err_t cf_res = adc_cali_create_scheme_curve_fitting(&curve_fitting_config, cali_handle);
+        esp_err_t cf_res = adc_cali_create_scheme_curve_fitting(&curve_fitting_config, _cali_handle);
         if (cf_res != ESP_OK)
         {
             ROB_LOGE(input_log_prefix, "adc_cali_create_scheme_curve_fitting failed with the %i error code.", cf_res);
         }
-#else
-        ROB_LOGE(input_log_prefix, "Error, unsupported calibration scheme returned by adc_cali_check_scheme: %s",
-                 scheme_mask == 0 ? "Line" : "Curve");
-#endif
     }
     else
+#endif
     {
         ROB_LOGE(input_log_prefix, "Error, unsupported calibration scheme returned by adc_cali_check_scheme: %u", scheme_mask);
         return ROB_FAIL;

components/robusto/network/src/media/mock/mock_control.c

@@ -64,7 +64,7 @@ void ROBUSTO_NETWORK_MOCK_TESTING_init(char * _log_prefix) {
     mock_messaging_init(mock_log_prefix);
 
     ROB_LOGI(mock_log_prefix, "Starting the mock worker.");
-    if (mock_init_worker(&mock_do_on_work_cb, &mock_do_on_poll_cb, mock_log_prefix) != ROB_OK)
+    if (mock_init_worker((work_callback *)&mock_do_on_work_cb, (poll_callback *)&mock_do_on_poll_cb, mock_log_prefix) != ROB_OK)
     {
        ROB_LOGE(mock_log_prefix, "Failed initializing mock worker!"); 
        return;

components/robusto/network/src/media/mock/mock_messaging.c

@@ -48,8 +48,8 @@
 
 char mock_strings[8] = MOCK_STRINGS;
 char mock_binary[4] = MOCK_BINARY;
-#define MOCK_PEERNAME_0 "PEER0\x00"
-#define MOCK_PEERNAME_1 "PEER1\x00"
+#define MOCK_PEERNAME_0 "TEST_MOCK_1\x00"
+#define MOCK_PEERNAME_1 "TEST_MOCK_2\x00"
 char mock_peername_0[6] = MOCK_PEERNAME_0;
 char mock_peername_1[6] = MOCK_PEERNAME_1;
 
@@ -65,6 +65,25 @@ rob_ret_val_t mock_after_comms(bool is_sending, bool first_call)
     return ROB_OK;
 }
 
+rob_ret_val_t mock_send_message(robusto_peer_t *peer,uint8_t *data, uint32_t data_length, bool receipt)
+{
+
+    if (strcmp(peer->name, MOCK_PEERNAME_0) != 0)
+    {
+        ROB_LOGE("MOCK", "mock_send_message: The peer name it not '%s', but '%s'", MOCK_PEERNAME_0, peer->name);
+    }
+    rob_ret_val_t ret = ROB_OK;
+    peer->mock_info.last_send = r_millis();
+    if (receipt)
+    {
+        peer->mock_info.last_sent_heartbeat = r_millis();
+    }
+    ROB_LOGI("MOCK", "mock_send_message: Mock sending %lu bytes to peer %s", data_length, peer->name);
+    rob_log_bit_mesh(ROB_LOG_INFO, "MOCK", data, data_length);
+    return ret;
+}
+
+
 
 rob_ret_val_t mock_read_receipt(robusto_peer_t *peer, uint8_t **dest_data)
 {
@@ -90,26 +109,26 @@ int mock_read_data(uint8_t **rcv_data, robusto_peer_t **peer)
     int length = 0;
     if ((message_expectation == MMI_STRINGS) || (message_expectation == MMI_STRINGS_ASYNC))
     {   
-        length = robusto_make_strings_message(MSG_MESSAGE, 0, 0, (uint8_t *)&mock_strings, 8, rcv_data);
-        *peer = robusto_peers_find_peer_by_name("TEST_MOCK");
+        length = robusto_make_multi_message_internal(MSG_MESSAGE, 0, 0, (uint8_t *)&mock_strings, 8, NULL, 0, rcv_data);
+        *peer = robusto_peers_find_peer_by_name("TEST_MOCK_1");
         if ((*peer) != NULL) {
             (*peer)->mock_info.last_receive = r_millis();
         } else {
-            ROB_LOGE("MOCK", "TEST_MOCK not found!");
+            ROB_LOGE("MOCK", "TEST_MOCK_1 not found!");
         }
 
     }
     else if (message_expectation == MMI_BINARY)
     {
-        length = robusto_make_binary_message(MSG_MESSAGE, 0, 0, (uint8_t *)&mock_binary, 4, rcv_data);
+        length = robusto_make_multi_message_internal(MSG_MESSAGE, 0, 0, NULL, 0, (uint8_t *)&mock_binary, 4, rcv_data);
     }
     else if (message_expectation == MMI_SERVICE)
     {
-        length = robusto_make_binary_message(MSG_MESSAGE, 1959, 0, (uint8_t *)&mock_binary, 4, rcv_data);
+        length = robusto_make_multi_message_internal(MSG_MESSAGE, 1959, 0, NULL, 0, (uint8_t *)&mock_binary, 4, rcv_data);
     }
     else if (message_expectation == MMI_MULTI)
     {
-        length = robusto_make_multi_message(MSG_MESSAGE, 0, 0, (uint8_t *)&mock_strings, 8, (uint8_t *)&mock_binary, 4, rcv_data);
+        length = robusto_make_multi_message_internal(MSG_MESSAGE, 0, 0, (uint8_t *)&mock_strings, 8, (uint8_t *)&mock_binary, 4, rcv_data);
     }
     else if (message_expectation == MMI_BINARY_RESTRICTED)
     {