MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the initialization of the wifi default hostname. (#3303) 

* It appears that the rf_pre_init is not called any more. Also cleaned up the code in
wifi_common.
* Log a message (at the right baud rate) if the hostname is invalid
* Updated the comment in the user_config.h file
This commit is contained in:
Philip Gladstone 2020-10-18 14:48:10 -04:00 committed by Marcel Stör
parent a01aada0ff
commit 335cf62a4d
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/include/user_config.h
View File

@ -165,7 +165,9 @@
// alphanumeric characters. If you are imaging multiple modules with this
// firmware then you must also define WIFI_STA_HOSTNAME_APPEND_MAC to
// append the last 3 octets of the MAC address. Note that the total
// Hostname MUST be 32 chars or less.
// Hostname MUST be 32 chars or less. If the resulting hostname is
// invalid, then it will not be used, and a message will be printed
// during boot.
//#define WIFI_STA_HOSTNAME "NodeMCU"
//#define WIFI_STA_HOSTNAME_APPEND_MAC

39
app/modules/wifi.c
View File

@ -1969,28 +1969,33 @@ void wifi_change_default_host_name(void)
uint8 opmode_temp=wifi_get_opmode();
wifi_set_opmode_current(STATION_MODE);
char temp[33] = {0};//32 chars + NULL
#if defined(WIFI_STA_HOSTNAME)
const char *hostname = WIFI_STA_HOSTNAME;
#else
const char *hostname = "NODE";
#endif
#if defined(WIFI_STA_HOSTNAME_APPEND_MAC) || !defined(WIFI_STA_HOSTNAME)
uint8_t mac[6];
wifi_get_macaddr(STATION_IF, mac);
#ifndef WIFI_STA_HOSTNAME
sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
#elif defined(WIFI_STA_HOSTNAME) && !defined(WIFI_STA_HOSTNAME_APPEND_MAC)
if(wifi_sta_checkhostname(WIFI_STA_HOSTNAME, strlen(WIFI_STA_HOSTNAME))){
sprintf(temp, "%s", WIFI_STA_HOSTNAME);
}
else{
sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
}
#elif defined(WIFI_STA_HOSTNAME) && defined(WIFI_STA_HOSTNAME_APPEND_MAC)
if(strlen(WIFI_STA_HOSTNAME) <= 26 && wifi_sta_checkhostname(WIFI_STA_HOSTNAME, strlen(WIFI_STA_HOSTNAME))){
sprintf(temp, "%s%X%X%X", WIFI_STA_HOSTNAME, (mac)[3], (mac)[4], (mac)[5]);
}
else{
sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
}
int len = snprintf(temp, sizeof(temp), "%s-%02X%02X%02X", hostname, (mac)[3], (mac)[4], (mac)[5]);
#else
int len = snprintf(temp, sizeof(temp), "%s", hostname);
#endif
wifi_station_set_hostname((char*)temp);
#if defined(WIFI_STA_HOSTNAME)
if (wifi_sta_checkhostname(temp, len)) {
#endif
wifi_station_set_hostname(temp);
#if defined(WIFI_STA_HOSTNAME)
} else {
dbg_printf("\nInvalid hostname: %s\n", temp);
}
#endif
if(opmode_temp != wifi_get_opmode()){
wifi_set_opmode_current(opmode_temp);

15
app/user/user_main.c
View File

@ -25,6 +25,7 @@
#include "mem.h"
#include "espconn.h"
#include "sections.h"
#include "../modules/wifi_common.h"
#ifdef LUA_USE_MODULES_RTCTIME
#include "rtc/rtctime.h"
@ -316,17 +317,6 @@ void nodemcu_init(void) {
lua_main(); // If it returns true then LFS restart is needed
}
#ifdef LUA_USE_MODULES_WIFI
#include "../modules/wifi_common.h"
void user_rf_pre_init(void)
{
//set WiFi hostname before RF initialization (adds ~479 us to boot time)
wifi_change_default_host_name();
}
#endif
/******************************************************************************
* FunctionName : user_init
* Description : entry of user application, init user function here
@ -344,6 +334,9 @@ void user_init(void) {
}
UartBautRate br = BIT_RATE_DEFAULT;
uart_init (br, br);
#ifdef LUA_USE_MODULES_WIFI
wifi_change_default_host_name();
#endif
#ifndef NODE_DEBUG
system_set_os_print(0);
#endif