Merge pull request #13031 from ascillato/Add_Key_to_set_SO128

Add Key to set the default of `SO128` at compile time
This commit is contained in:
Theo Arends 2021-09-01 08:14:53 +02:00 committed by GitHub
commit 176f5e2777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View File

@ -457,6 +457,7 @@
#define USE_WEBSERVER // Enable web server and Wi-Fi Manager (+66k code, +8k mem) #define USE_WEBSERVER // Enable web server and Wi-Fi Manager (+66k code, +8k mem)
#define WEB_PORT 80 // Web server Port for User and Admin mode #define WEB_PORT 80 // Web server Port for User and Admin mode
#define WEB_USERNAME "admin" // Web server Admin mode user name #define WEB_USERNAME "admin" // Web server Admin mode user name
// #define DISABLE_REFERER_CHK // [SetOption128] Disable HTTP API
// #define USE_JAVASCRIPT_ES6 // Enable ECMAScript6 syntax using less JavaScript code bytes (fails on IE11) // #define USE_JAVASCRIPT_ES6 // Enable ECMAScript6 syntax using less JavaScript code bytes (fails on IE11)
#define USE_ENHANCED_GUI_WIFI_SCAN // Enable Wi-Fi scan output with BSSID (+0k5 code) #define USE_ENHANCED_GUI_WIFI_SCAN // Enable Wi-Fi scan output with BSSID (+0k5 code)
// #define USE_WEBSEND_RESPONSE // Enable command WebSend response message (+1k code) // #define USE_WEBSEND_RESPONSE // Enable command WebSend response message (+1k code)

View File

@ -888,8 +888,11 @@ void SettingsDefaultSet2(void) {
Settings->weblog_level = WEB_LOG_LEVEL; Settings->weblog_level = WEB_LOG_LEVEL;
SettingsUpdateText(SET_WEBPWD, PSTR(WEB_PASSWORD)); SettingsUpdateText(SET_WEBPWD, PSTR(WEB_PASSWORD));
SettingsUpdateText(SET_CORS, PSTR(CORS_DOMAIN)); SettingsUpdateText(SET_CORS, PSTR(CORS_DOMAIN));
Settings->flag5.disable_referer_chk |= true; #ifdef DISABLE_REFERER_CHK
flag5.disable_referer_chk |= false;
#else
flag5.disable_referer_chk |= true;
#endif
// Button // Button
flag.button_restrict |= KEY_DISABLE_MULTIPRESS; flag.button_restrict |= KEY_DISABLE_MULTIPRESS;
flag.button_swap |= KEY_SWAP_DOUBLE_PRESS; flag.button_swap |= KEY_SWAP_DOUBLE_PRESS;
@ -1397,7 +1400,11 @@ void SettingsDelta(void) {
SettingsUpdateText(SET_RGX_PASSWORD, PSTR(WIFI_RGX_PASSWORD)); SettingsUpdateText(SET_RGX_PASSWORD, PSTR(WIFI_RGX_PASSWORD));
} }
if (Settings->version < 0x09050007) { if (Settings->version < 0x09050007) {
Settings->flag5.disable_referer_chk = true; #ifdef DISABLE_REFERER_CHK
Settings->flag5.disable_referer_chk |= false;
#else
Settings->flag5.disable_referer_chk |= true;
#endif
} }
Settings->version = VERSION; Settings->version = VERSION;