Browse Source

Merge branch 'dev' into rfm69

rfm69
Xose Pérez 6 years ago
parent
commit
a39c4689ec
18 changed files with 16686 additions and 16626 deletions
  1. +16
    -1
      code/espurna/config/hardware.h
  2. BIN
      code/espurna/data/index.all.html.gz
  3. BIN
      code/espurna/data/index.light.html.gz
  4. BIN
      code/espurna/data/index.rfbridge.html.gz
  5. BIN
      code/espurna/data/index.rfm69.html.gz
  6. BIN
      code/espurna/data/index.sensor.html.gz
  7. BIN
      code/espurna/data/index.small.html.gz
  8. +2722
    -2717
      code/espurna/static/index.all.html.gz.h
  9. +2637
    -2633
      code/espurna/static/index.light.html.gz.h
  10. +2268
    -2265
      code/espurna/static/index.rfbridge.html.gz.h
  11. +3631
    -3627
      code/espurna/static/index.rfm69.html.gz.h
  12. +2308
    -2304
      code/espurna/static/index.sensor.html.gz.h
  13. +2224
    -2221
      code/espurna/static/index.small.html.gz.h
  14. +0
    -4
      code/html/custom.css
  15. +8
    -2
      code/html/custom.js
  16. +3
    -7
      code/ota.py
  17. +867
    -845
      code/platformio.ini
  18. +2
    -0
      pre-commit

+ 16
- 1
code/espurna/config/hardware.h View File

@ -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
// -----------------------------------------------------------------------------


BIN
code/espurna/data/index.all.html.gz View File


BIN
code/espurna/data/index.light.html.gz View File


BIN
code/espurna/data/index.rfbridge.html.gz View File


BIN
code/espurna/data/index.rfm69.html.gz View File


BIN
code/espurna/data/index.sensor.html.gz View File


BIN
code/espurna/data/index.small.html.gz View File


+ 2722
- 2717
code/espurna/static/index.all.html.gz.h
File diff suppressed because it is too large
View File


+ 2637
- 2633
code/espurna/static/index.light.html.gz.h
File diff suppressed because it is too large
View File


+ 2268
- 2265
code/espurna/static/index.rfbridge.html.gz.h
File diff suppressed because it is too large
View File


+ 3631
- 3627
code/espurna/static/index.rfm69.html.gz.h
File diff suppressed because it is too large
View File


+ 2308
- 2304
code/espurna/static/index.sensor.html.gz.h
File diff suppressed because it is too large
View File


+ 2224
- 2221
code/espurna/static/index.small.html.gz.h
File diff suppressed because it is too large
View File


+ 0
- 4
code/html/custom.css View File

@ -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;
}


+ 8
- 2
code/html/custom.js View File

@ -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);
}


+ 3
- 7
code/ota.py View File

@ -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


+ 867
- 845
code/platformio.ini
File diff suppressed because it is too large
View File


+ 2
- 0
pre-commit View File

@ -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);

Loading…
Cancel
Save