mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11694 from barbudor/devicename_override 

Simple change to allow DEVICE_NAME in user_config_override
This commit is contained in:
Theo Arends 2021-04-12 21:40:54 +02:00 committed by GitHub
parent 3c4ebbf1d3 63a672e9dd
commit 91c0b9370b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/settings.ino
View File

@ -750,7 +750,11 @@ void SettingsDefaultSet2(void) {
SettingsUpdateText(SET_FRIENDLYNAME2, PSTR(FRIENDLY_NAME"2"));
SettingsUpdateText(SET_FRIENDLYNAME3, PSTR(FRIENDLY_NAME"3"));
SettingsUpdateText(SET_FRIENDLYNAME4, PSTR(FRIENDLY_NAME"4"));
#ifdef DEVICE_NAME
SettingsUpdateText(SET_DEVICENAME, PSTR(DEVICE_NAME));
#else
SettingsUpdateText(SET_DEVICENAME, SettingsText(SET_FRIENDLYNAME1));
#endif
SettingsUpdateText(SET_OTAURL, PSTR(OTA_URL));
// Power