test
This commit is contained in:
parent
0b7db96c86
commit
90c39b1fc2
@ -8,11 +8,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#define DEVICE_NAME MANUFACTURER "_" DEVICE // Concatenate both to get a unique device name
|
||||
<<<<<<< HEAD
|
||||
#define ADMIN_PASS "***REMOVED***" // Default password (WEB, OTA, WIFI)
|
||||
=======
|
||||
#define ADMIN_PASS "XXX" // Default password (WEB, OTA, WIFI)
|
||||
>>>>>>> f6687517e0f23129dc680549abf9358c0d4391a3
|
||||
#define USE_PASSWORD 1 // Insecurity caution! Disabling this will disable password querying completely.
|
||||
#define LOOP_DELAY_TIME 10 // Delay for this millis in the main loop [0-250]
|
||||
|
||||
@ -349,11 +345,7 @@ PROGMEM const char* const custom_reset_string[] = {
|
||||
#define WIFI1_SSID "iApfel"
|
||||
#endif
|
||||
#ifndef WIFI1_PASS
|
||||
<<<<<<< HEAD
|
||||
#define WIFI1_PASS "***REMOVED***"
|
||||
=======
|
||||
#define WIFI1_PASS "XXX"
|
||||
>>>>>>> f6687517e0f23129dc680549abf9358c0d4391a3
|
||||
#endif
|
||||
#ifndef WIFI1_IP
|
||||
#define WIFI1_IP ""
|
||||
|
Loading…
Reference in New Issue
Block a user