Move mcu/display driver code into esp32_lcd_controllers and use that lib

Author: thingsapart

.gitmodules

@@ -5,3 +5,6 @@
 	path = firmware/cnc_interface/lvgl_ui
 	url = git@github.com:thingsapart/lvgl_ui.git
     branch = jules-rewrites
+[submodule "firmware/cnc_interface/lib/esp32_lcd_controllers"]
+	path = firmware/cnc_interface/lib/esp32_lcd_controllers
+	url = https://github.com/thingsapart/esp32_lcd_controllers

firmware/cnc_interface/config/disable_esp_hosted.sdkconfig

@@ -0,0 +1,3 @@
+#CONFIG_ESP_WIFI_REMOTE_ENABLED is not set
+#CONFIG_ESP_HOSTED_ENABLED is not set
+#CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE is not set

firmware/cnc_interface/lib/esp32_lcd_controllers

@@ -1 +1 @@
-07b6ca85dc0c1edbcd76f650005c74067001db138db6bfa106bf05567adca4af
+f4fa6dab2496af2673a68881132bb7ce0f05bf62e30e5bd0d45b607066378a28

firmware/cnc_interface/managed_components/espressif__esp_modem/.component_hash

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(modem): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py esp_modem
   tag_format: modem-v$version
-  version: 2.0.0
+  version: 2.0.1
   version_files:
   - idf_component.yml

firmware/cnc_interface/managed_components/espressif__esp_modem/.cz.yaml

@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.0.1](https://github.com/espressif/esp-protocols/commits/modem-v2.0.1)
+
+### Bug Fixes
+
+- Fix inconsistent error checks in C-API wrappers ([de02d8a3](https://github.com/espressif/esp-protocols/commit/de02d8a3))
+- null terminate output buffers when modem sends empty response & check output buffers are not null ([6124b7ee](https://github.com/espressif/esp-protocols/commit/6124b7ee))
+- null terminate output buffer if no response in esp_modem_at functions ([17d82dea](https://github.com/espressif/esp-protocols/commit/17d82dea))
+- Fix catch based target tests with v6.0 ([7f4e3690](https://github.com/espressif/esp-protocols/commit/7f4e3690))
+- Fix deinit function in ap2ppp example ([853e8e28](https://github.com/espressif/esp-protocols/commit/853e8e28))
+
 ## [2.0.0](https://github.com/espressif/esp-protocols/commits/modem-v2.0.0)
 
 ### Breaking changes

firmware/cnc_interface/managed_components/espressif__esp_modem/CHANGELOG.md

@@ -198,7 +198,7 @@ extern "C" bool modem_stop_network()
 
 extern "C" void modem_deinit_network()
 {
-    free(dce);
+    delete dce;
     dce = nullptr;
 }
 

firmware/cnc_interface/managed_components/espressif__esp_modem/examples/ap_to_pppos/main/network_dce.cpp

@@ -6,7 +6,7 @@ documentation: https://docs.espressif.com/projects/esp-protocols/esp_modem/docs/
 issues: https://github.com/espressif/esp-protocols/issues
 repository: git://github.com/espressif/esp-protocols.git
 repository_info:
-  commit_sha: 245b5a2ffbc359b6f2fa724205d0998bea3c4451
+  commit_sha: ca6e2835fe53bbe0996d8f5fcbcd539a86f4bb47
   path: components/esp_modem
 url: https://github.com/espressif/esp-protocols/tree/master/components/esp_modem
-version: 2.0.0
+version: 2.0.1

firmware/cnc_interface/managed_components/espressif__esp_modem/idf_component.yml

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -156,7 +156,7 @@ extern "C" esp_err_t esp_modem_set_mode(esp_modem_dce_t *dce_wrap, esp_modem_dce
 
 extern "C" esp_err_t esp_modem_read_pin(esp_modem_dce_t *dce_wrap, bool *pin)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || pin == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
 
@@ -183,7 +183,7 @@ extern "C" esp_err_t esp_modem_sms_txt_mode(esp_modem_dce_t *dce_wrap, bool txt)
 
 extern "C" esp_err_t esp_modem_send_sms(esp_modem_dce_t *dce_wrap, const char *number, const char *message)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || number == nullptr || message == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string number_str(number);
@@ -202,7 +202,7 @@ extern "C" esp_err_t esp_modem_sms_character_set(esp_modem_dce_t *dce_wrap)
 
 extern "C" esp_err_t esp_modem_set_pin(esp_modem_dce_t *dce_wrap, const char *pin)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || pin == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string pin_str(pin);
@@ -211,47 +211,57 @@ extern "C" esp_err_t esp_modem_set_pin(esp_modem_dce_t *dce_wrap, const char *pi
 
 extern "C" esp_err_t esp_modem_at(esp_modem_dce_t *dce_wrap, const char *at, char *p_out, int timeout)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || at == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string out;
     std::string at_str(at);
     auto ret = command_response_to_esp_err(dce_wrap->dce->at(at_str, out, timeout));
-    if ((p_out != NULL) && (!out.empty())) {
+    if ((p_out != NULL)) {
         strlcpy(p_out, out.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
 
 extern "C" esp_err_t esp_modem_get_signal_quality(esp_modem_dce_t *dce_wrap, int *rssi, int *ber)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || (rssi == nullptr && ber == nullptr)) {
         return ESP_ERR_INVALID_ARG;
     }
-    return command_response_to_esp_err(dce_wrap->dce->get_signal_quality(*rssi, *ber));
+    int rssi_val, ber_val;
+    auto ret = command_response_to_esp_err(dce_wrap->dce->get_signal_quality(rssi_val, ber_val));
+    if (ret == ESP_OK) {
+        if (rssi != nullptr) {
+            *rssi = rssi_val;
+        }
+        if (ber != nullptr) {
+            *ber = ber_val;
+        }
+    }
+    return ret;
 }
 
 extern "C" esp_err_t esp_modem_get_imsi(esp_modem_dce_t *dce_wrap, char *p_imsi)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_imsi == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string imsi;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_imsi(imsi));
-    if (ret == ESP_OK && !imsi.empty()) {
+    if (ret == ESP_OK) {
         strlcpy(p_imsi, imsi.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
 
 extern "C" esp_err_t esp_modem_at_raw(esp_modem_dce_t *dce_wrap, const char *cmd, char *p_out, const char *pass, const char *fail, int timeout)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || cmd == nullptr || pass == nullptr || fail == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string out;
     auto ret = command_response_to_esp_err(dce_wrap->dce->at_raw(cmd, out, pass, fail, timeout));
-    if ((p_out != NULL) && (!out.empty())) {
+    if ((p_out != NULL)) {
         strlcpy(p_out, out.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
@@ -276,56 +286,67 @@ extern "C" esp_err_t esp_modem_store_profile(esp_modem_dce_t *dce_wrap)
 
 extern "C" esp_err_t esp_modem_get_imei(esp_modem_dce_t *dce_wrap, char *p_imei)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_imei == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string imei;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_imei(imei));
-    if (ret == ESP_OK && !imei.empty()) {
+    if (ret == ESP_OK) {
         strlcpy(p_imei, imei.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
 
 extern "C" esp_err_t esp_modem_get_operator_name(esp_modem_dce_t *dce_wrap, char *p_name, int *p_act)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_name == nullptr || p_act == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || (p_name == nullptr && p_act == nullptr)) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string name;
     int act;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_operator_name(name, act));
-    if (ret == ESP_OK && !name.empty()) {
-        strlcpy(p_name, name.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
-        *p_act = act;
+    if (ret == ESP_OK) {
+        if (p_name != nullptr) {
+            strlcpy(p_name, name.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        }
+        if (p_act != nullptr) {
+            *p_act = act;
+        }
     }
     return ret;
 }
 
 extern "C" esp_err_t esp_modem_get_module_name(esp_modem_dce_t *dce_wrap, char *p_name)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_name == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string name;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_module_name(name));
-    if (ret == ESP_OK && !name.empty()) {
+    if (ret == ESP_OK) {
         strlcpy(p_name, name.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
 
 extern "C" esp_err_t esp_modem_get_battery_status(esp_modem_dce_t *dce_wrap, int *p_volt, int *p_bcs, int *p_bcl)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_bcs == nullptr || p_bcl == nullptr || p_volt == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr ||
+            (p_volt == nullptr && p_bcs == nullptr && p_bcl == nullptr)) {
         return ESP_ERR_INVALID_ARG;
     }
-    int bcs, bcl, volt;
+    int volt, bcs, bcl;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_battery_status(volt, bcs, bcl));
     if (ret == ESP_OK) {
-        *p_volt = volt;
-        *p_bcs = bcs;
-        *p_bcl = bcl;
+        if (p_volt != nullptr) {
+            *p_volt = volt;
+        }
+        if (p_bcs != nullptr) {
+            *p_bcs = bcs;
+        }
+        if (p_bcl != nullptr) {
+            *p_bcl = bcl;
+        }
     }
     return ret;
 }
@@ -340,7 +361,7 @@ extern "C" esp_err_t esp_modem_power_down(esp_modem_dce_t *dce_wrap)
 
 extern "C" esp_err_t esp_modem_set_operator(esp_modem_dce_t *dce_wrap, int mode, int format, const char *oper)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || oper == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string operator_str(oper);
@@ -357,7 +378,7 @@ extern "C" esp_err_t esp_modem_set_network_attachment_state(esp_modem_dce_t *dce
 
 extern "C" esp_err_t esp_modem_get_network_attachment_state(esp_modem_dce_t *dce_wrap, int *p_state)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_state == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     int state;
@@ -378,7 +399,7 @@ extern "C" esp_err_t esp_modem_set_radio_state(esp_modem_dce_t *dce_wrap, int st
 
 extern "C" esp_err_t esp_modem_get_radio_state(esp_modem_dce_t *dce_wrap, int *p_state)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_state == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     int state;
@@ -407,7 +428,7 @@ extern "C" esp_err_t esp_modem_set_preferred_mode(esp_modem_dce_t *dce_wrap, int
 
 extern "C" esp_err_t esp_modem_set_network_bands(esp_modem_dce_t *dce_wrap, const char *mode, const int *bands, int size)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || mode == nullptr || bands == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     std::string mode_str(mode);
@@ -416,7 +437,7 @@ extern "C" esp_err_t esp_modem_set_network_bands(esp_modem_dce_t *dce_wrap, cons
 
 extern "C" esp_err_t esp_modem_get_network_system_mode(esp_modem_dce_t *dce_wrap, int *p_mode)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_mode == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     int mode;
@@ -437,7 +458,7 @@ extern "C" esp_err_t esp_modem_set_gnss_power_mode(esp_modem_dce_t *dce_wrap, in
 
 extern "C" esp_err_t esp_modem_get_gnss_power_mode(esp_modem_dce_t *dce_wrap, int *p_mode)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || p_mode == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     int mode;
@@ -450,7 +471,7 @@ extern "C" esp_err_t esp_modem_get_gnss_power_mode(esp_modem_dce_t *dce_wrap, in
 
 extern "C" esp_err_t esp_modem_config_psm(esp_modem_dce_t *dce_wrap, int mode, const char *tau, const char *active_time)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || mode > 3) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || mode > 3 || tau == nullptr || active_time == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
 
@@ -496,7 +517,7 @@ extern "C" esp_err_t esp_modem_config_mobile_termination_error(esp_modem_dce_t *
 
 extern "C" esp_err_t esp_modem_config_edrx(esp_modem_dce_t *dce_wrap, int mode, int access_technology, const char *edrx_value)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || mode > 3 || access_technology > 5) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || mode > 3 || access_technology > 5 || edrx_value == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
 
@@ -509,7 +530,7 @@ extern "C" esp_err_t esp_modem_config_edrx(esp_modem_dce_t *dce_wrap, int mode,
 
 extern "C" esp_err_t esp_modem_sqn_gm02s_connect(esp_modem_dce_t *dce_wrap, const esp_modem_PdpContext_t *pdp_context)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || pdp_context == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
 
@@ -521,12 +542,15 @@ extern "C" esp_err_t esp_modem_sqn_gm02s_connect(esp_modem_dce_t *dce_wrap, cons
 
 extern "C" esp_err_t esp_modem_reset(esp_modem_dce_t *dce_wrap)
 {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+        return ESP_ERR_INVALID_ARG;
+    }
     return command_response_to_esp_err(dce_wrap->dce->reset());
 }
 
 extern "C" esp_err_t esp_modem_set_pdp_context(esp_modem_dce_t *dce_wrap, esp_modem_PdpContext_t *c_api_pdp)
 {
-    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || c_api_pdp == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
     esp_modem::PdpContext pdp{c_api_pdp->apn};
@@ -555,11 +579,17 @@ extern "C" esp_err_t esp_modem_command(esp_modem_dce_t *dce_wrap, const char *co
 
 extern "C" esp_err_t esp_modem_set_baud(esp_modem_dce_t *dce_wrap, int baud)
 {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
+        return ESP_ERR_INVALID_ARG;
+    }
     return command_response_to_esp_err(dce_wrap->dce->set_baud(baud));
 }
 
 extern "C" esp_err_t esp_modem_set_apn(esp_modem_dce_t *dce_wrap, const char *apn)
 {
+    if (dce_wrap == nullptr || dce_wrap->dce == nullptr || apn == nullptr) {
+        return ESP_ERR_INVALID_ARG;
+    }
     auto new_pdp = std::unique_ptr<PdpContext>(new PdpContext(apn));
     dce_wrap->dce->get_module()->configure_pdp_context(std::move(new_pdp));
     return ESP_OK;

firmware/cnc_interface/managed_components/espressif__esp_modem/src/esp_modem_c_api.cpp

@@ -1 +1 @@
-7c0fa01a1cd0e72a87ec1928c3b661c0a3a9034a6d3a69dcf4850db8c6f272db
+1ebe3bd675bb9d1c58f52bc0b609b32f74e572b01c328f9e61282040c775495c