Merge branch 'dev' into rfm69

code/espurna/config/hardware.h

@@ -2298,6 +2298,7 @@
 // * HomeCube (https://www.amazon.de/Steckdose-Homecube-intelligente-Verbrauchsanzeige-funktioniert/dp/B076Q2LKHG)
 // * Coosa (https://www.amazon.com/COOSA-Monitoring-Function-Campatible-Assiatant/dp/B0788W9TDR)
 // * Goosund (http://www.gosund.com/?m=content&c=index&a=show&catid=6&id=5)
+// * Ablue (https://www.amazon.de/Intelligente-Steckdose-Ablue-Funktioniert-Assistant/dp/B076DRFRZC)
 // -----------------------------------------------------------------------------
 
 #elif defined(BLITZWOLF_BWSHP2)
@@ -2425,6 +2426,8 @@
     #define EMON_ADS1X15_SUPPORT  1
     #define SHT3X_I2C_SUPPORT     1
     #define SI7021_SUPPORT        1
+    #define PMSX003_SUPPORT       1
+    #define SENSEAIR_SUPPORT      1
 
 
     // A bit of lights - pin 5
@@ -2505,7 +2508,7 @@
     #define MHZ19_TX_PIN        10
 
     // PZEM004T
-    #define PZEM004T_SUPPORT    0   // not working?
+    #define PZEM004T_SUPPORT    1
     #define PZEM004T_RX_PIN     11
     #define PZEM004T_TX_PIN     12
 
@@ -2517,6 +2520,13 @@
     #define GUVAS12SD_SUPPORT   1
     #define GUVAS12SD_PIN       14
 
+    // Test non-default modules
+    #define MDNS_CLIENT_SUPPORT 1
+    #define NOFUSS_SUPPORT      1
+    #define UART_MQTT_SUPPORT   1
+    #define INFLUXDB_SUPPORT    1
+    #define IR_SUPPORT          1
+
 #elif defined(TRAVIS03)
 
     // Relay provider light/my92XX
@@ -2540,6 +2550,11 @@
     #define EMON_ANALOG_SUPPORT 1
     #endif
 
+    // Test non-default modules
+    #define LLMNR_SUPPORT       1
+    #define NETBIOS_SUPPORT     1
+    #define SSDP_SUPPORT        1
+
 #endif
 
 // -----------------------------------------------------------------------------

code/html/custom.css

@@ -148,10 +148,6 @@ div.state {
     letter-spacing: 0;
     margin-bottom: 10px;
     text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-    text-transform: uppercase;
-    font-family: 'FreeSans','Arimo','Droid Sans','Helvetica','Arial','sans-serif';
-    font-size: .7em;
-    height: 37px;
     padding: 8px 8px;
 }
 

code/html/custom.js

@@ -315,11 +315,17 @@ function checkFirmware(file, callback) {
 
     reader.onloadend = function(evt) {
         if (FileReader.DONE === evt.target.readyState) {
-            callback(0xE9 === evt.target.result.charCodeAt(0));
+            if (0xE9 !== evt.target.result.charCodeAt(0)) callback(false);
+            if (0x03 !== evt.target.result.charCodeAt(2)) {
+                var response = window.confirm("Binary image is not using DOUT flash mode. This might cause resets in some devices. Press OK to continue.");
+                callback(response);
+            } else {
+                callback(true);
+            }
         }
     };
 
-    var blob = file.slice(0, 1);
+    var blob = file.slice(0, 3);
     reader.readAsBinaryString(blob);
 
 }

code/ota.py

@@ -121,7 +121,7 @@ def get_empty_board():
     """
     Returns the empty structure of a board to flash
     """
-    board = {'board': '', 'ip': '', 'size': 0, 'auth': '', 'flags': '', 'modules': ''}
+    board = {'board': '', 'ip': '', 'size': 0, 'auth': '', 'flags': ''}
     return board
 
 def get_board_by_index(index):
@@ -230,8 +230,8 @@ def store(device, env):
 
 def run(device, env):
     print("Building and flashing image over-the-air...")
-    command = "ESPURNA_IP=\"%s\" ESPURNA_BOARD=\"%s\" ESPURNA_AUTH=\"%s\" ESPURNA_FLAGS=\"%s\" WEBUI_MODULES=\"%s\" platformio run --silent --environment %s -t upload"
-    command = command % (device['ip'], device['board'], device['auth'], device['flags'], device['modules'], env)
+    command = "ESPURNA_IP=\"%s\" ESPURNA_BOARD=\"%s\" ESPURNA_AUTH=\"%s\" ESPURNA_FLAGS=\"%s\" platformio run --silent --environment %s -t upload"
+    command = command % (device['ip'], device['board'], device['auth'], device['flags'], env)
     subprocess.check_call(command, shell=True)
     store(device, env)
 
@@ -245,7 +245,6 @@ if __name__ == '__main__':
     parser.add_argument("-f", "--flash", help="flash device", default=0, action='count')
     parser.add_argument("-o", "--flags", help="extra flags", default='')
     parser.add_argument("-p", "--password", help="auth password", default='')
-    parser.add_argument("-m", "--modules", help="webui modules", default='')
     parser.add_argument("-s", "--sort", help="sort devices list by field", default='hostname')
     parser.add_argument("-y", "--yes", help="do not ask for confirmation", default=0, action='count')
     parser.add_argument("hostnames", nargs='*', help="Hostnames to update")
@@ -289,7 +288,6 @@ if __name__ == '__main__':
             if board:
                 board['auth'] = args.password
                 board['flags'] = args.flags
-                board['modules'] = args.modules
                 queue.append(board)
 
         # If no boards ask the user
@@ -298,7 +296,6 @@ if __name__ == '__main__':
             if board:
                 board['auth'] = args.password or input("Authorization key of the device to flash: ")
                 board['flags'] = args.flags or input("Extra flags for the build: ")
-                board['modules'] = args.modules or input("WebUI modules to build: ")
                 queue.append(board)
 
         # If still no boards quit
@@ -321,7 +318,6 @@ if __name__ == '__main__':
             print("BOARD   = %s" % board['board'])
             print("AUTH    = %s" % board['auth'])
             print("FLAGS   = %s" % board['flags'])
-            print("MODULES = %s" % board['modules'])
             print("ENV     = %s" % env)
 
             response = True

pre-commit

@@ -126,5 +126,7 @@ if __name__ == "__main__":
     os.chdir("code")
     if call(["node", "node_modules/gulp/bin/gulp.js", "--silent"]):
         sys.exit(2)
+    call(["git", "add", "espurna/data/index*"])
+    call(["git", "add", "espurna/static/index*"])
 
     sys.exit(0);