scripts: update core -> minimal

amend 5bc55cd1a5

code/espurna/config/arduino.h

@@ -41,8 +41,8 @@
 //#define EHOMEDIY_WT02
 //#define EHOMEDIY_WT03
 //#define ELECTRODRAGON_WIFI_IOT
-//#define ESPURNA_CORE
-//#define ESPURNA_CORE_WEBUI
+//#define ESPURNA_MINIMAL_ARDUINO_OTA
+//#define ESPURNA_MINIMAL_WEBUI
 //#define ETEKCITY_ESW01_USA
 //#define EUROMATE_WIFI_STECKER_SCHUKO
 //#define EUROMATE_WIFI_STECKER_SCHUKO_V2

code/ota.py

@@ -22,7 +22,7 @@ import zeroconf
 
 # -------------------------------------------------------------------------------
 
-__version__ = (0, 4, 2)
+__version__ = (0, 4, 3)
 
 DESCRIPTION = "ESPurna OTA Manager v{}".format(".".join(str(x) for x in __version__))
 DISCOVERY_TIMEOUT = 10
@@ -314,34 +314,31 @@ def run(device, env):
 def parse_commandline_args():
     parser = argparse.ArgumentParser(description=DESCRIPTION)
     parser.add_argument(
-        "-c",
-        "--core",
-        help="Use ESPurna core configuration",
-        action="store_true",
-        default=False,
+        "--minimal",
+        help="Use ESPurna minimal configuration",
+        action="choice",
+        choices=["arduino-ota", "webui"],
+        default="arduino-ota",
     )
     parser.add_argument(
-        "-f", "--flash", help="Flash device", action="store_true", default=False
+        "--flash", help="Flash device", action="store_true", default=False
     )
     parser.add_argument(
-        "-a",
         "--arduino-core",
         help="Arduino ESP8266 Core version",
         default="current",
         choices=["current", "latest", "git"],
     )
-    parser.add_argument("-o", "--flags", help="extra flags", default="")
-    parser.add_argument("-p", "--password", help="auth password", default="")
-    parser.add_argument("-s", "--sort", help="sort devices list by field", default="")
+    parser.add_argument("--flags", help="extra flags", default="")
+    parser.add_argument("--password", help="auth password", default="")
+    parser.add_argument("--sort", help="sort devices list by field", default="")
     parser.add_argument(
-        "-y",
         "--yes",
         help="do not ask for confirmation",
         action="store_true",
         default=False,
     )
     parser.add_argument(
-        "-t",
         "--timeout",
         type=int,
         help="how long to wait for mDNS discovery",
@@ -452,10 +449,10 @@ def main(args):
 
         # Flash each board
         for board in queue:
-
-            # Flash core version?
-            if args.core:
-                board["flags"] = "-DESPURNA_CORE " + board["flags"]
+            if args.minimal:
+                flag = args.minimal.replace("-", "_").upper()
+                flag = f"ESPURNA_MINIMAL_{flag}"
+                board["flags"] = "-D${flag} " + board["flags"]
 
             env = get_platformio_env(args.arduino_core, board["size"])
 

code/scripts/generate_release_sh.py

@@ -82,7 +82,7 @@ def find_any(string, values):
 
 
 def generate_lines(builds, ignore):
-    cores = []
+    minimal = []
     generic = []
 
     for build in builds:
@@ -102,14 +102,14 @@ def generate_lines(builds, ignore):
 
         line = " ".join(cmd)
 
-        # push core variants to the front as they definetly include global build_flags
+        # push minimal variants to the front as they definetly include global build_flags
         output = generic
-        if "ESPURNA_CORE" in build.build_src_flags:
-            output = cores
+        if "ESPURNA_MINIMAL" in build.build_src_flags:
+            output = minimal
 
         output.append(line)
 
-    return cores + generic
+    return minimal + generic
 
 
 def every(seq, nth, total):