Merge branch 'master' of https://gitlab.fire-devils.org/ManuelW/espurna-sonoff-pow

.gitignore

@@ -2,3 +2,4 @@
 .piolibdeps
 .clang_complete
 .gcc-flags.json
+replacements.txt

espurna/config/general.h

@@ -4,11 +4,11 @@
 //------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------
-// GENERAL Information
+// GENERAL
 //------------------------------------------------------------------------------
 
 #define DEVICE_NAME             MANUFACTURER "_" DEVICE     // Concatenate both to get a unique device name
-#define ADMIN_PASS              "druffmann77" // Default password (WEB, OTA, WIFI)
+#define ADMIN_PASS              "**Password**" // Default password (WEB, OTA, WIFI)
 #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]
 
@@ -345,7 +345,7 @@ PROGMEM const char* const custom_reset_string[] = {
 #define WIFI1_SSID              "iApfel"
 #endif
 #ifndef WIFI1_PASS
-#define WIFI1_PASS              "druffmann77"
+#define WIFI1_PASS              "**Password**"
 #endif
 #ifndef WIFI1_IP
 #define WIFI1_IP                ""

platformio.ini

@@ -37,7 +37,7 @@ build_flags_1m = ${common.build_flags} -Wl,-Tesp8266.flash.1m0.ld
 # ------------------------------------------------------------------------------
 # IP address when using OTA
 upload_port = esp_az_dht-pir.local
-upload_flags = --auth=druffmann77 --port 8266
+upload_flags = --auth=***REMOVED*** --port 8266
 #upload_port = "${env.ESPURNA_IP}"
 #upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 

platformio.ini_short

@@ -9,7 +9,7 @@ data_dir = espurna/data
 ; framework = arduino
 ;
 ; upload_port = esp_wz_strom.local ;192.168.1.134
-; upload_flags = --auth=druffmann77
+; upload_flags = --auth=***REMOVED***
 
 [env:esp_ku]
 platform = espressif8266
@@ -17,7 +17,7 @@ board = esp12e
 framework = arduino
 
 upload_port = esp_ku_strom.local ;192.168.1.134
-upload_flags = --auth=druffmann77
+upload_flags = --auth=***REMOVED***
 
 [env:esp_bd]
 platform = espressif8266
@@ -25,7 +25,7 @@ board = esp12e
 framework = arduino
 
 upload_port = esp_bd_strom.local ;192.168.1.134
-upload_flags = --auth=druffmann77
+upload_flags = --auth=***REMOVED***
 
 [env:esp_az]
 platform = espressif8266
@@ -33,7 +33,7 @@ board = esp12e
 framework = arduino
 
 upload_port = esp_az_strom.local ;192.168.1.134
-upload_flags = --auth=druffmann77
+upload_flags = --auth=***REMOVED***
 
 # ------------------------------------------------------------------------------
 # LIBRARIES: required dependencies

replacements.txt

@@ -1,2 +0,0 @@
-druffmann77
-chico