Merge pull request #101 from arduino/esp-idf-4.4

pennam · web-flow · commit 4aa471911d33 · 2025-03-24T10:07:29.000+01:00
Build nina firmware using esp idf v4.4.8
diff --git a/README.md b/README.md
@@ -16,6 +16,21 @@ This firmware uses [Espressif's IDF](https://github.com/espressif/esp-idf)
 1. Load the `Tools -> SerialNINAPassthrough` example sketch on to the board
 1. Use `esptool` to flash the compiled firmware
 
+### Building with docker
+
+As an alternative for building we can use the docker image from espressif idf, we can do that as follows:
+
+```
+docker run -v $PWD:/data espressif/idf:v4.4.8 -- sh -c 'cd /data && make'
+```
+
+You can also flash the firmware with the following snippet:
+
+```
+DEVICE=/dev/ttyACM0
+docker run --device=$DEVICE -v $PWD:/data espressif/idf:v4.4.8 -- sh -c 'cd /data && make flash ESPPORT=$DEVICE'
+```
+
 ## Notes
 If updating the NINA firmware for an **Arduino UNO WiFi Rev. 2** or **Arduino Nano RP2040** board via [SerialNINAPassthrough](https://github.com/arduino-libraries/WiFiNINA/blob/master/examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino) sketch, then the `esptool` invocation needs to be changed slightly:
 ```diff
diff --git a/arduino/cores/esp32/WString.cpp b/arduino/cores/esp32/WString.cpp
@@ -638,7 +638,7 @@ void String::remove(unsigned int index, unsigned int count){
 	if (count > len - index) { count = len - index; }
 	char *writeTo = buffer + index;
 	len = len - count;
-	strncpy(writeTo, buffer + index + count,len - index);
+	memmove(writeTo, buffer + index + count, len - index);
 	buffer[len] = 0;
 }
 
diff --git a/arduino/cores/esp32/itoa.c b/arduino/cores/esp32/itoa.c
@@ -23,11 +23,6 @@
 extern "C" {
 #endif
 
-extern char* utoa( unsigned long value, char *string, int radix )
-{
-  return ultoa( value, string, radix ) ;
-}
-
 extern char* ultoa( unsigned long value, char *string, int radix )
 {
   char tmp[33];
diff --git a/arduino/cores/esp32/wiring_digital.c b/arduino/cores/esp32/wiring_digital.c
@@ -20,6 +20,7 @@
 #include <driver/gpio.h>
 
 #include "wiring_digital.h"
+#include "soc/gpio_periph.h"
 
 void pinMode(uint32_t pin, uint32_t mode)
 {
diff --git a/arduino/libraries/ArduinoBearSSL/src/SHA1.h b/arduino/libraries/ArduinoBearSSL/src/SHA1.h
@@ -47,6 +47,4 @@ class SHA1Class: public SHAClass {
   br_sha1_context _ctx;
 };
 
-extern SHA1Class SHA1;
-
 #endif
diff --git a/arduino/libraries/WiFi/src/WiFi.cpp b/arduino/libraries/WiFi/src/WiFi.cpp
@@ -21,7 +21,7 @@
 
 #include <esp_wifi.h>
 #include <esp_wpa2.h>
-#include <tcpip_adapter.h>
+#include <esp_netif.h>
 
 #include <lwip/apps/sntp.h>
 #include <lwip/dns.h>
@@ -38,7 +38,7 @@ WiFiClass::WiFiClass() :
   _initialized(false),
   _status(WL_NO_SHIELD),
   _reasonCode(0),
-  _interface(ESP_IF_WIFI_STA),
+  _interface(WIFI_IF_STA),
   _onReceiveCallback(NULL),
   _onDisconnectCallback(NULL),
   _wpa2Cert(NULL),
@@ -195,15 +195,15 @@ uint8_t WiFiClass::begin(const char* ssid, const char* key)
   wifiConfig.sta.scan_method = WIFI_FAST_SCAN;
   _status = WL_NO_SSID_AVAIL;
 
-  _interface = ESP_IF_WIFI_STA;
+  _interface = WIFI_IF_STA;
 
   xEventGroupClearBits(_eventGroup, BIT0);
   esp_wifi_stop();
   esp_wifi_set_mode(WIFI_MODE_STA);
   esp_wifi_start();
   xEventGroupWaitBits(_eventGroup, BIT0, false, true, portMAX_DELAY);
 
-  if (esp_wifi_set_config(ESP_IF_WIFI_STA, &wifiConfig) != ESP_OK) {
+  if (esp_wifi_set_config(WIFI_IF_STA, &wifiConfig) != ESP_OK) {
     _status = WL_CONNECT_FAILED;
   }
 
@@ -229,13 +229,13 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t channel)
 
   _status = WL_NO_SSID_AVAIL;
 
-  _interface = ESP_IF_WIFI_AP;
+  _interface = WIFI_IF_AP;
 
   xEventGroupClearBits(_eventGroup, BIT1);
   esp_wifi_stop();
   esp_wifi_set_mode(WIFI_MODE_AP);
 
-  if (esp_wifi_set_config(ESP_IF_WIFI_AP, &wifiConfig) != ESP_OK) {
+  if (esp_wifi_set_config(WIFI_IF_AP, &wifiConfig) != ESP_OK) {
     _status = WL_AP_FAILED;
   } else {
     esp_wifi_start();
@@ -258,13 +258,13 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t key_idx, const char* key, u
 
   _status = WL_NO_SSID_AVAIL;
 
-  _interface = ESP_IF_WIFI_AP;
+  _interface = WIFI_IF_AP;
 
   xEventGroupClearBits(_eventGroup, BIT1);
   esp_wifi_stop();
   esp_wifi_set_mode(WIFI_MODE_AP);
 
-  if (esp_wifi_set_config(ESP_IF_WIFI_AP, &wifiConfig) != ESP_OK) {
+  if (esp_wifi_set_config(WIFI_IF_AP, &wifiConfig) != ESP_OK) {
     _status = WL_AP_FAILED;
   } else {
     esp_wifi_start();
@@ -287,13 +287,13 @@ uint8_t WiFiClass::beginAP(const char *ssid, const char* key, uint8_t channel)
 
   _status = WL_NO_SSID_AVAIL;
 
-  _interface = ESP_IF_WIFI_AP;
+  _interface = WIFI_IF_AP;
 
   xEventGroupClearBits(_eventGroup, BIT1);
   esp_wifi_stop();
   esp_wifi_set_mode(WIFI_MODE_AP);
 
-  if (esp_wifi_set_config(ESP_IF_WIFI_AP, &wifiConfig) != ESP_OK) {
+  if (esp_wifi_set_config(WIFI_IF_AP, &wifiConfig) != ESP_OK) {
     _status = WL_AP_FAILED;
   } else {
     esp_wifi_start();
@@ -311,9 +311,7 @@ uint8_t WiFiClass::beginEnterprise(const char* ssid, const char* username, const
   esp_wifi_sta_wpa2_ent_clear_ca_cert();
   esp_wifi_sta_wpa2_ent_clear_cert_key();
 
-  esp_wpa2_config_t config = WPA2_CONFIG_INIT_DEFAULT();
-
-  esp_wifi_sta_wpa2_ent_enable(&config);
+  esp_wifi_sta_wpa2_ent_enable();
 
   int usernameLen = strlen(username);
   if (usernameLen) {
@@ -349,9 +347,7 @@ uint8_t WiFiClass::beginEnterpriseTLS(const char* ssid, const char* cert, const
   esp_wifi_sta_wpa2_ent_clear_ca_cert();
   esp_wifi_sta_wpa2_ent_clear_cert_key();
 
-  esp_wpa2_config_t config = WPA2_CONFIG_INIT_DEFAULT();
-
-  esp_wifi_sta_wpa2_ent_enable(&config);
+  esp_wifi_sta_wpa2_ent_enable();
 
   int certLen = strlen(cert);
   int keyLen = strlen(key);
@@ -388,7 +384,7 @@ void WiFiClass::config(/*IPAddress*/uint32_t local_ip, /*IPAddress*/uint32_t gat
   _ipInfo.gw.addr = gateway;
   _ipInfo.netmask.addr = subnet;
 
-  if (_interface == ESP_IF_WIFI_AP) {
+  if (_interface == WIFI_IF_AP) {
     tcpip_adapter_dhcps_stop(TCPIP_ADAPTER_IF_AP);
     tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_AP, &_ipInfo);
     tcpip_adapter_dhcps_start(TCPIP_ADAPTER_IF_AP);
@@ -466,7 +462,7 @@ uint32_t WiFiClass::gatewayIP()
 
 uint32_t WiFiClass::dnsIP(int n)
 {
-  return dns_getserver(n).u_addr.ip4.addr;
+  return dns_getserver(n)->u_addr.ip4.addr;
 }
 
 char* WiFiClass::SSID()
@@ -626,7 +622,7 @@ unsigned long WiFiClass::getTime()
 
 void WiFiClass::lowPowerMode()
 {
-  esp_wifi_set_ps(WIFI_PS_MODEM);
+  esp_wifi_set_ps(WIFI_PS_MIN_MODEM);
 }
 
 void WiFiClass::noLowPowerMode()
@@ -711,7 +707,7 @@ void WiFiClass::handleSystemEvent(system_event_t* event)
       struct netif* staNetif;
       if (strlen(_hostname) == 0) {
         uint8_t mac[6];
-        esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+        esp_wifi_get_mac(WIFI_IF_STA, mac);
         sprintf(_hostname, "arduino-%.2x%.2x", mac[4], mac[5]);
       }
       tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, _hostname);
@@ -792,7 +788,7 @@ void WiFiClass::handleSystemEvent(system_event_t* event)
 
       wifi_config_t config;
 
-      esp_wifi_get_config(ESP_IF_WIFI_AP, &config);
+      esp_wifi_get_config(WIFI_IF_AP, &config);
       memcpy(_apRecord.ssid, config.ap.ssid, sizeof(config.ap.ssid));
       _apRecord.authmode = config.ap.authmode;
 
diff --git a/arduino/libraries/WiFi/src/WiFi.h b/arduino/libraries/WiFi/src/WiFi.h
@@ -20,7 +20,7 @@
 #ifndef WIFI_H
 #define WIFI_H
 
-#include <esp_event_loop.h>
+#include <esp_event.h>
 
 #include <freertos/FreeRTOS.h>
 #include <freertos/event_groups.h>
@@ -119,7 +119,7 @@ class WiFiClass
   volatile uint8_t _status;
   volatile uint8_t _reasonCode;
   EventGroupHandle_t _eventGroup;
-  esp_interface_t _interface;
+  wifi_interface_t _interface;
 
   wifi_ap_record_t _scanResults[MAX_SCAN_RESULTS];
   wifi_ap_record_t _apRecord;
diff --git a/arduino/libraries/WiFi/src/WiFiClient.cpp b/arduino/libraries/WiFi/src/WiFiClient.cpp
@@ -64,14 +64,14 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
   addr.sin_addr.s_addr = (uint32_t)ip;
   addr.sin_port = htons(port);
 
-  if (lwip_connect_r(_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-    lwip_close_r(_socket);
+  if (lwip_connect(_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
 
   int nonBlocking = 1;
-  lwip_ioctl_r(_socket, FIONBIO, &nonBlocking);
+  lwip_ioctl(_socket, FIONBIO, &nonBlocking);
 
   return 1;
 }
@@ -87,7 +87,7 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size)
     return 0;
   }
 
-  int result = lwip_send_r(_socket, (void*)buf, size, MSG_PEEK);
+  int result = lwip_send(_socket, (void*)buf, size, MSG_PEEK);
 
   if (result < 0) {
     return 0;
@@ -106,8 +106,8 @@ int WiFiClient::available()
   int result = 0;
 
   //This function returns the number of bytes of pending data already received in the socket’s network.
-  if (lwip_ioctl_r(_socket, FIONREAD, &result) < 0) {
-    lwip_close_r(_socket);
+  if (lwip_ioctl(_socket, FIONREAD, &result) < 0) {
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
@@ -132,10 +132,10 @@ int WiFiClient::read(uint8_t* buf, size_t size)
     return -1;
   }
 
-  int result = lwip_recv_r(_socket, buf, size, MSG_DONTWAIT);
+  int result = lwip_recv(_socket, buf, size, MSG_DONTWAIT);
 
   if (result <= 0 && errno != EWOULDBLOCK) {
-    lwip_close_r(_socket);
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
@@ -152,9 +152,9 @@ int WiFiClient::peek()
   uint8_t b;
 
   //This function tries to receive data from the network and can return an error if the connection when down.
-  if (lwip_recv_r(_socket, &b, sizeof(b), MSG_PEEK | MSG_DONTWAIT) <= 0) {
+  if (lwip_recv(_socket, &b, sizeof(b), MSG_PEEK | MSG_DONTWAIT) <= 0) {
     if (errno != EWOULDBLOCK) {
-      lwip_close_r(_socket);
+      lwip_close(_socket);
       _socket = -1;
     }
 
@@ -171,7 +171,7 @@ void WiFiClient::flush()
 void WiFiClient::stop()
 {
   if (_socket != -1) {
-    lwip_close_r(_socket);
+    lwip_close(_socket);
     _socket = -1;
   }
 }
diff --git a/arduino/libraries/WiFi/src/WiFiServer.cpp b/arduino/libraries/WiFi/src/WiFiServer.cpp
@@ -50,19 +50,19 @@ uint8_t WiFiServer::begin(uint16_t port)
   addr.sin_port = htons(port);
 
   if (lwip_bind(_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-    lwip_close_r(_socket);
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
 
   if (lwip_listen(_socket, 1) < 0) {
-    lwip_close_r(_socket);
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
 
   int nonBlocking = 1;
-  lwip_ioctl_r(_socket, FIONBIO, &nonBlocking);
+  lwip_ioctl(_socket, FIONBIO, &nonBlocking);
 
   // Set port.
   _port = port;
diff --git a/arduino/libraries/WiFi/src/WiFiUdp.cpp b/arduino/libraries/WiFi/src/WiFiUdp.cpp
@@ -52,13 +52,13 @@ uint8_t WiFiUDP::begin(uint16_t port)
   addr.sin_port = htons(port);
 
   if (lwip_bind(_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-    lwip_close_r(_socket);
+    lwip_close(_socket);
     _socket = -1;
     return 0;
   }
 
   int nonBlocking = 1;
-  lwip_ioctl_r(_socket, FIONBIO, &nonBlocking);
+  lwip_ioctl(_socket, FIONBIO, &nonBlocking);
 
   return 1;
 }
@@ -74,7 +74,7 @@ uint8_t WiFiUDP::beginMulticast(/*IPAddress*/uint32_t ip, uint16_t port)
   multi.imr_multiaddr.s_addr = (uint32_t)ip;
   multi.imr_interface.s_addr = (uint32_t)0;
 
-  lwip_setsockopt_r(_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &multi, sizeof(multi));
+  lwip_setsockopt(_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &multi, sizeof(multi));
 
   return 1;
 }
@@ -89,7 +89,7 @@ int WiFiUDP::available()
 /* Release any resources being used by this WiFiUDP instance */
 void WiFiUDP::stop()
 {
-  lwip_close_r(_socket);
+  lwip_close(_socket);
   _socket = -1;
 }
 
@@ -158,7 +158,7 @@ int WiFiUDP::parsePacket()
   _rcvIndex = 0;
   _rcvSize = 0;
 
-  int result = lwip_recvfrom_r(_socket, _rcvBuffer, sizeof(_rcvBuffer), MSG_DONTWAIT, (struct sockaddr*)&addr, &addrLen);
+  int result = lwip_recvfrom(_socket, _rcvBuffer, sizeof(_rcvBuffer), MSG_DONTWAIT, (struct sockaddr*)&addr, &addrLen);
 
   if (result <= 0) {
     return 0;
diff --git a/arduino/libraries/Wire/src/Wire.cpp b/arduino/libraries/Wire/src/Wire.cpp
@@ -21,9 +21,10 @@ extern "C" {
 #include <string.h>
 
 #include <driver/gpio.h>
-#include <esp_intr.h>
-#include <rom/ets_sys.h>
+#include <esp_intr_alloc.h>
+#include <esp32/rom/ets_sys.h>
 #include <soc/gpio_sig_map.h>
+#include <freertos/xtensa_api.h>
 }
 
 #include <Arduino.h>
diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp
diff --git a/main/sketch.ino.cpp b/main/sketch.ino.cpp
diff --git a/sdkconfig b/sdkconfig

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ void String::remove(unsigned int index, unsigned int count){`
`638`	`638`	`if (count > len - index) { count = len - index; }`
`639`	`639`	`char *writeTo = buffer + index;`
`640`	`640`	`len = len - count;`
`641`		`- strncpy(writeTo, buffer + index + count,len - index);`
	`641`	`+ memmove(writeTo, buffer + index + count, len - index);`
`642`	`642`	`buffer[len] = 0;`
`643`	`643`	`}`
`644`	`644`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include <driver/gpio.h>`
`21`	`21`
`22`	`22`	`#include "wiring_digital.h"`
	`23`	`+#include "soc/gpio_periph.h"`
`23`	`24`
`24`	`25`	`void pinMode(uint32_t pin, uint32_t mode)`
`25`	`26`	`{`