mchapman/nina-fw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #36 from Gadgetoid/patch-set-hostname

Browse Source 
Fix setHostname API
This commit is contained in:
Brent Rubell
2021-06-04 15:17:24 -04:00
committed by GitHub
parent ec9e20f508 e1385807c8
commit 104c48cb48
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,3 +1,7 @@
Adafruit's Arduino NINA-W102 firmware 1.7.4 - 2021.06.03
* Fixed support for custom hostname in WiFi client mode
Adafruit's Arduino NINA-W102 firmware 1.7.3 - 2021.03.26 Adafruit's Arduino NINA-W102 firmware 1.7.3 - 2021.03.26
* Changed Analog Write to use full PWM range. * Changed Analog Write to use full PWM range.

2
Makefile
View File

@@ -28,7 +28,7 @@ load-passthrough:
cp passthrough.UF2 $(BOOT_VOLUME) cp passthrough.UF2 $(BOOT_VOLUME)
load-nina: load-nina:
esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.3.bin esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.4.bin
load-circuitpython: load-circuitpython:
cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME) cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

10
arduino/libraries/WiFi/src/WiFi.cpp
View File

@@ -44,6 +44,7 @@ WiFiClass::WiFiClass() :
memset(&_apRecord, 0x00, sizeof(_apRecord)); memset(&_apRecord, 0x00, sizeof(_apRecord));
memset(&_ipInfo, 0x00, sizeof(_ipInfo)); memset(&_ipInfo, 0x00, sizeof(_ipInfo));
memset(&_dnsServers, 0x00, sizeof(_dnsServers)); memset(&_dnsServers, 0x00, sizeof(_dnsServers));
memset(&_hostname, 0x00, sizeof(_hostname));
} }
uint8_t WiFiClass::status() uint8_t WiFiClass::status()
@@ -320,7 +321,7 @@ void WiFiClass::setDNS(/*IPAddress*/uint32_t dns_server1, /*IPAddress*/uint32_t
void WiFiClass::hostname(const char* name) void WiFiClass::hostname(const char* name)
{ {
tcpip_adapter_set_hostname(_interface == ESP_IF_WIFI_AP ? TCPIP_ADAPTER_IF_AP : TCPIP_ADAPTER_IF_STA, name); strncpy(_hostname, name, HOSTNAME_MAX_LENGTH);
} }
void WiFiClass::disconnect() void WiFiClass::disconnect()
@@ -604,7 +605,12 @@ void WiFiClass::handleSystemEvent(system_event_t* event)
esp_wifi_get_mac(ESP_IF_WIFI_STA, mac); esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
sprintf(defaultHostname, "arduino-%.2x%.2x", mac[4], mac[5]); sprintf(defaultHostname, "arduino-%.2x%.2x", mac[4], mac[5]);
tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, defaultHostname); //tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, defaultHostname);
if (strlen(_hostname) == 0) {
sprintf(_hostname, "%s", defaultHostname);
}
tcpip_adapter_set_hostname(_interface == ESP_IF_WIFI_AP ? TCPIP_ADAPTER_IF_AP : TCPIP_ADAPTER_IF_STA, _hostname);
if (tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_STA, (void**)&staNetif) == ESP_OK) { if (tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_STA, (void**)&staNetif) == ESP_OK) {
if (staNetif->input != WiFiClass::staNetifInputHandler) { if (staNetif->input != WiFiClass::staNetifInputHandler) {

2
arduino/libraries/WiFi/src/WiFi.h
View File

@@ -44,6 +44,7 @@ typedef enum {
} wl_status_t; } wl_status_t;
#define MAX_SCAN_RESULTS 10 #define MAX_SCAN_RESULTS 10
#define HOSTNAME_MAX_LENGTH 32
class WiFiClass class WiFiClass
{ {
@@ -119,6 +120,7 @@ private:
tcpip_adapter_ip_info_t _ipInfo; tcpip_adapter_ip_info_t _ipInfo;
uint32_t _dnsServers[2]; uint32_t _dnsServers[2];
char _hostname[HOSTNAME_MAX_LENGTH+1];
netif_input_fn _staNetifInput; netif_input_fn _staNetifInput;
netif_input_fn _apNetifInput; netif_input_fn _apNetifInput;

2
combine.py
View File

@@ -31,7 +31,7 @@ for i in range(0, len(certsData)):
# zero terminate the pem file # zero terminate the pem file
outputData[0x10000 + len(certsData)] = 0 outputData[0x10000 + len(certsData)] = 0
outputFilename = "NINA_W102-1.7.3.bin" outputFilename = "NINA_W102-1.7.4.bin"
if (len(sys.argv) > 1): if (len(sys.argv) > 1):
outputFilename = sys.argv[1] outputFilename = sys.argv[1]

2
main/CommandHandler.cpp
View File

@@ -28,7 +28,7 @@
#include "Arduino.h" #include "Arduino.h"
const char FIRMWARE_VERSION[6] = "1.7.3"; const char FIRMWARE_VERSION[6] = "1.7.4";
// Optional, user-defined X.509 certificate // Optional, user-defined X.509 certificate
char CERT_BUF[1300]; char CERT_BUF[1300];