build_files.py

@@ -63,22 +63,7 @@ def build_files(source, target, env):
             print("Copy " + source + " to " + target)
             transfer_file(source, target)
 
-def build_files_spiffs(source, target, env):
-    print("Build files, reason: pre spiffs.bin build")
-    build_files(source, target, env)
-
-def build_files_buildprog(source, target, env):
-    print("Build files, reason: buildprog target")
-    build_files(source, target, env)
-
-def build_files_buildfs(source, target, env):
-    print("Build files, reason: buildfs target")
-    build_files(source, target, env)
-
 # Custom upload command and program name
-env.AddPreAction("$BUILD_DIR/spiffs.bin", build_files_spiffs)
+#env.AddPreAction("$BUILD_DIR/spiffs.bin", build_files)
 #env.AddPreAction("$BUILD_DIR/firmware.bin", build_files)
-env.AddPreAction("buildprog", build_files_buildprog)
-#env.AddPreAction("uploadfs", build_files_uploadfs)
-#env.AlwaysBuild(env.Alias("buildfs", None, build_files_buildfs))
-env.AddPreAction("buildfs", build_files_buildfs)
+env.AddPreAction("buildprog", build_files)

platformio.ini

@@ -25,7 +25,6 @@ build_flags =
   '-DFS_UPDATE_BASE_URL="{$iotjunkie.baseurl}/{$iotjunkie.repository}"'
   '-DFS_UPDATE_AUTH_USER="{$iotjunkie.user}"'
   '-DFS_UPDATE_AUTH_PASSWORD="{$iotjunkie.password}"'
-  -Wl,-Teagle.flash.4m1m.ld
 
 [env:debug_usb]
 platform = ${common.platform}
@@ -51,10 +50,10 @@ lib_deps =
   ${common.lib_deps}
   MD_Parola
   MD_MAX72XX
-upload_port = /dev/cu.wchusbserial1420
-upload_speed = 921600
+;upload_port = /dev/cu.wchusbserial1420
+;upload_speed = 921600
 monitor_speed = 115200
-;upload_protocol = custom
+upload_protocol = custom
 ;upload_port = 192.168.89.72
 extra_scripts =
   build_files.py
@@ -64,7 +63,7 @@ extra_scripts =
 ;extra_scripts = pre:build_files.py
 
 [env:uploadfs]
-extra_scripts = build_files.py
+;extra_scripts = pre:publish_files.py
 
 [iotjunkie]
 user = fcclient

src/main.cpp

@@ -28,7 +28,7 @@
 //#define RELAY2_PIN D2
 #define DEBUG_RELAYS false
 #define DEBUG_DISPLAY false
-#define STARTUP1_ANIMATION_DURATION_ms 1000
+#define STARTUP1_ANIMATION_DURATION_ms 2000
 #define STARTUP2_ANIMATION_DURATION_ms 33000
 
 IOTAppStory IAS(COMPDATE, MODEBUTTON);