rjwats · FernandoGarcia · Mar 15, 2022
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 .gcc-flags.json
 *Thumbs.db
 /data/www
-/lib/framework/WWWData.h
+src/WWWData.h
 /interface/build
 /interface/node_modules
 /interface/.eslintcache

diff --git a/src/LightMqttSettingsService.cpp → ...s/LightState/LightMqttSettingsService.cpp b/src/LightMqttSettingsService.cpp → ...s/LightState/LightMqttSettingsService.cpp
diff --git a/src/LightMqttSettingsService.h → ...les/LightState/LightMqttSettingsService.h b/src/LightMqttSettingsService.h → ...les/LightState/LightMqttSettingsService.h
diff --git a/src/LightStateService.cpp → examples/LightState/LightStateService.cpp b/src/LightStateService.cpp → examples/LightState/LightStateService.cpp
diff --git a/src/LightStateService.h → examples/LightState/LightStateService.h b/src/LightStateService.h → examples/LightState/LightStateService.h
diff --git a/src/main.cpp → examples/LightState/main.cpp b/src/main.cpp → examples/LightState/main.cpp
diff --git a/interface/config-overrides.js b/interface/config-overrides.js
@@ -22,7 +22,7 @@ module.exports = function override(config, env) {
     terserPlugin.options.extractComments = false;
 
     // build progmem data files
-    config.plugins.push(new ProgmemGenerator({ outputPath: "../lib/framework/WWWData.h", bytesPerLine: 20 }));
+    config.plugins.push(new ProgmemGenerator({ outputPath: "../src/WWWData.h", bytesPerLine: 20 }));
   }
   return config;
 };
diff --git a/lib/readme.txt b/lib/readme.txt
diff --git a/platformio.ini b/platformio.ini
@@ -30,7 +30,7 @@ framework = arduino
 monitor_speed = 115200
 
 extra_scripts = 
- pre:scripts/build_interface.py
+ pre:lib/esp8266-react/scripts/build_interface.py
 
 lib_deps =
   ArduinoJson@>=6.0.0,<7.0.0
@@ -43,8 +43,14 @@ board = esp12e
 board_build.f_cpu = 160000000L
 board_build.filesystem = littlefs
 
-[env:node32s]
 ; Comment out min_spiffs.csv setting if disabling PROGMEM_WWW with ESP32
+
+[env:node32s]
 board_build.partitions = min_spiffs.csv
 platform = espressif32
 board = node32s
+
+[env:esp32dev]
+board_build.partitions = min_spiffs.csv
+platform = espressif32
+board = esp32dev
diff --git a/scripts/build_interface.py b/scripts/build_interface.py
@@ -3,9 +3,13 @@
 from subprocess import check_output, Popen, PIPE, STDOUT, CalledProcessError
 import os
 import gzip
+import inspect
 
 Import("env")
 
+filename = inspect.getframeinfo(inspect.currentframe()).filename
+dir_path = os.path.dirname(os.path.abspath(filename))
+
 def gzipFile(file):
     with open(file, 'rb') as f_in:
         with gzip.open(file + '.gz', 'wb') as f_out:
@@ -19,7 +23,7 @@ def flagExists(flag):
             return True
 
 def buildWeb():
-    os.chdir("interface")
+    os.chdir(dir_path + '/../interface')
     print("Building interface with npm")
     try:
         env.Execute("npm install")

diff --git a/lib/framework/APSettingsService.cpp → src/APSettingsService.cpp b/lib/framework/APSettingsService.cpp → src/APSettingsService.cpp
diff --git a/lib/framework/APSettingsService.h → src/APSettingsService.h b/lib/framework/APSettingsService.h → src/APSettingsService.h
diff --git a/lib/framework/APStatus.cpp → src/APStatus.cpp b/lib/framework/APStatus.cpp → src/APStatus.cpp
diff --git a/lib/framework/APStatus.h → src/APStatus.h b/lib/framework/APStatus.h → src/APStatus.h
diff --git a/lib/framework/ArduinoJsonJWT.cpp → src/ArduinoJsonJWT.cpp b/lib/framework/ArduinoJsonJWT.cpp → src/ArduinoJsonJWT.cpp
diff --git a/lib/framework/ArduinoJsonJWT.h → src/ArduinoJsonJWT.h b/lib/framework/ArduinoJsonJWT.h → src/ArduinoJsonJWT.h
diff --git a/lib/framework/AuthenticationService.cpp → src/AuthenticationService.cpp b/lib/framework/AuthenticationService.cpp → src/AuthenticationService.cpp
diff --git a/lib/framework/AuthenticationService.h → src/AuthenticationService.h b/lib/framework/AuthenticationService.h → src/AuthenticationService.h
diff --git a/lib/framework/ESP8266React.cpp → src/ESP8266React.cpp b/lib/framework/ESP8266React.cpp → src/ESP8266React.cpp
diff --git a/lib/framework/ESP8266React.h → src/ESP8266React.h b/lib/framework/ESP8266React.h → src/ESP8266React.h
diff --git a/lib/framework/ESPFS.h → src/ESPFS.h b/lib/framework/ESPFS.h → src/ESPFS.h
diff --git a/lib/framework/FSPersistence.h → src/FSPersistence.h b/lib/framework/FSPersistence.h → src/FSPersistence.h
diff --git a/lib/framework/FactoryResetService.cpp → src/FactoryResetService.cpp b/lib/framework/FactoryResetService.cpp → src/FactoryResetService.cpp
diff --git a/lib/framework/FactoryResetService.h → src/FactoryResetService.h b/lib/framework/FactoryResetService.h → src/FactoryResetService.h
diff --git a/lib/framework/Features.h → src/Features.h b/lib/framework/Features.h → src/Features.h
diff --git a/lib/framework/FeaturesService.cpp → src/FeaturesService.cpp b/lib/framework/FeaturesService.cpp → src/FeaturesService.cpp
diff --git a/lib/framework/FeaturesService.h → src/FeaturesService.h b/lib/framework/FeaturesService.h → src/FeaturesService.h
diff --git a/lib/framework/HttpEndpoint.h → src/HttpEndpoint.h b/lib/framework/HttpEndpoint.h → src/HttpEndpoint.h
diff --git a/lib/framework/IPUtils.h → src/IPUtils.h b/lib/framework/IPUtils.h → src/IPUtils.h
diff --git a/lib/framework/JsonUtils.h → src/JsonUtils.h b/lib/framework/JsonUtils.h → src/JsonUtils.h
diff --git a/lib/framework/MqttPubSub.h → src/MqttPubSub.h b/lib/framework/MqttPubSub.h → src/MqttPubSub.h
diff --git a/lib/framework/MqttSettingsService.cpp → src/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp → src/MqttSettingsService.cpp
diff --git a/lib/framework/MqttSettingsService.h → src/MqttSettingsService.h b/lib/framework/MqttSettingsService.h → src/MqttSettingsService.h
diff --git a/lib/framework/MqttStatus.cpp → src/MqttStatus.cpp b/lib/framework/MqttStatus.cpp → src/MqttStatus.cpp
diff --git a/lib/framework/MqttStatus.h → src/MqttStatus.h b/lib/framework/MqttStatus.h → src/MqttStatus.h
diff --git a/lib/framework/NTPSettingsService.cpp → src/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp → src/NTPSettingsService.cpp
diff --git a/lib/framework/NTPSettingsService.h → src/NTPSettingsService.h b/lib/framework/NTPSettingsService.h → src/NTPSettingsService.h
diff --git a/lib/framework/NTPStatus.cpp → src/NTPStatus.cpp b/lib/framework/NTPStatus.cpp → src/NTPStatus.cpp
diff --git a/lib/framework/NTPStatus.h → src/NTPStatus.h b/lib/framework/NTPStatus.h → src/NTPStatus.h
diff --git a/lib/framework/OTASettingsService.cpp → src/OTASettingsService.cpp b/lib/framework/OTASettingsService.cpp → src/OTASettingsService.cpp
diff --git a/lib/framework/OTASettingsService.h → src/OTASettingsService.h b/lib/framework/OTASettingsService.h → src/OTASettingsService.h
diff --git a/lib/framework/RestartService.cpp → src/RestartService.cpp b/lib/framework/RestartService.cpp → src/RestartService.cpp
diff --git a/lib/framework/RestartService.h → src/RestartService.h b/lib/framework/RestartService.h → src/RestartService.h
diff --git a/lib/framework/SecurityManager.h → src/SecurityManager.h b/lib/framework/SecurityManager.h → src/SecurityManager.h
diff --git a/lib/framework/SecuritySettingsService.cpp → src/SecuritySettingsService.cpp b/lib/framework/SecuritySettingsService.cpp → src/SecuritySettingsService.cpp
diff --git a/lib/framework/SecuritySettingsService.h → src/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h → src/SecuritySettingsService.h
diff --git a/lib/framework/SettingValue.cpp → src/SettingValue.cpp b/lib/framework/SettingValue.cpp → src/SettingValue.cpp
diff --git a/lib/framework/SettingValue.h → src/SettingValue.h b/lib/framework/SettingValue.h → src/SettingValue.h
diff --git a/lib/framework/StatefulService.cpp → src/StatefulService.cpp b/lib/framework/StatefulService.cpp → src/StatefulService.cpp
diff --git a/lib/framework/StatefulService.h → src/StatefulService.h b/lib/framework/StatefulService.h → src/StatefulService.h
diff --git a/lib/framework/SystemStatus.cpp → src/SystemStatus.cpp b/lib/framework/SystemStatus.cpp → src/SystemStatus.cpp
diff --git a/lib/framework/SystemStatus.h → src/SystemStatus.h b/lib/framework/SystemStatus.h → src/SystemStatus.h
diff --git a/lib/framework/UploadFirmwareService.cpp → src/UploadFirmwareService.cpp b/lib/framework/UploadFirmwareService.cpp → src/UploadFirmwareService.cpp
diff --git a/lib/framework/UploadFirmwareService.h → src/UploadFirmwareService.h b/lib/framework/UploadFirmwareService.h → src/UploadFirmwareService.h
diff --git a/lib/framework/WebSocketTxRx.h → src/WebSocketTxRx.h b/lib/framework/WebSocketTxRx.h → src/WebSocketTxRx.h
diff --git a/lib/framework/WiFiScanner.cpp → src/WiFiScanner.cpp b/lib/framework/WiFiScanner.cpp → src/WiFiScanner.cpp
diff --git a/lib/framework/WiFiScanner.h → src/WiFiScanner.h b/lib/framework/WiFiScanner.h → src/WiFiScanner.h
diff --git a/lib/framework/WiFiSettingsService.cpp → src/WiFiSettingsService.cpp b/lib/framework/WiFiSettingsService.cpp → src/WiFiSettingsService.cpp
diff --git a/lib/framework/WiFiSettingsService.h → src/WiFiSettingsService.h b/lib/framework/WiFiSettingsService.h → src/WiFiSettingsService.h
diff --git a/lib/framework/WiFiStatus.cpp → src/WiFiStatus.cpp b/lib/framework/WiFiStatus.cpp → src/WiFiStatus.cpp
diff --git a/lib/framework/WiFiStatus.h → src/WiFiStatus.h b/lib/framework/WiFiStatus.h → src/WiFiStatus.h