Version 3.5.0

alf45tar · Oct 25, 2024 · 2b44eb3 · 2b44eb3
1 parent ab4937d
commit 2b44eb3
Show file tree

Hide file tree

Showing 16 changed files with 660 additions and 285 deletions.
diff --git a/data/blueboard4.cfg b/data/blueboard4.cfg
@@ -0,0 +1 @@
+{"Pedals":[{"Pedal":1,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"1","LatchEmulation":true,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false},{"Pedal":2,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"1","LatchEmulation":true,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false},{"Pedal":3,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"1","LatchEmulation":true,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false},{"Pedal":4,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"1","LatchEmulation":true,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false},{"Pedal":5,"Mode":"None","InvertPolarity":false,"PressMode":"None","LatchEmulation":false,"AnalogResponse":"Linear","Min":0,"Max":1023,"Easing":0.001,"ActivityThreshold":2,"AutoSensing":false},{"Pedal":6,"Mode":"None","InvertPolarity":false,"PressMode":"None","LatchEmulation":false,"AnalogResponse":"Linear","Min":1023,"Max":0,"Easing":0.01,"ActivityThreshold":8,"AutoSensing":true},{"Pedal":7,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"1","LatchEmulation":false,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false},{"Pedal":8,"Mode":"Momentary 1","InvertPolarity":false,"PressMode":"12L","LatchEmulation":false,"AnalogResponse":"Linear","Min":0,"Max":127,"Easing":0.001,"ActivityThreshold":32,"AutoSensing":false}],"Controls":[{"Control":1,"Pedal1":1,"Button1":1,"Pedal2":0,"Button2":0,"Led":7},{"Control":2,"Pedal1":2,"Button1":1,"Pedal2":0,"Button2":0,"Led":5},{"Control":3,"Pedal1":3,"Button1":1,"Pedal2":0,"Button2":0,"Led":3},{"Control":4,"Pedal1":4,"Button1":1,"Pedal2":0,"Button2":0,"Led":1},{"Control":5,"Pedal1":5,"Button1":1,"Pedal2":0,"Button2":0,"Led":7},{"Control":6,"Pedal1":6,"Button1":1,"Pedal2":0,"Button2":0,"Led":8},{"Control":37,"Pedal1":7,"Button1":1,"Pedal2":0,"Button2":0,"Led":0},{"Control":38,"Pedal1":8,"Button1":1,"Pedal2":0,"Button2":0,"Led":0}],"BankNames":[{"Bank":0,"Name":"Global"},{"Bank":1,"Name":":Mode 1"},{"Bank":2,"Name":":Mode 2"},{"Bank":3,"Name":""},{"Bank":4,"Name":""},{"Bank":5,"Name":""},{"Bank":6,"Name":""},{"Bank":7,"Name":""},{"Bank":8,"Name":""},{"Bank":9,"Name":""},{"Bank":10,"Name":""},{"Bank":11,"Name":""},{"Bank":12,"Name":""},{"Bank":13,"Name":""},{"Bank":14,"Name":""},{"Bank":15,"Name":""},{"Bank":16,"Name":""},{"Bank":17,"Name":""},{"Bank":18,"Name":""},{"Bank":19,"Name":""},{"Bank":20,"Name":""}],"Actions":[{"Bank":0,"Control":37,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":"","NameOn":"","Slot":0,"Event":"Press","Message":"Bank+","Channel":1,"Code":0,"Value1":1,"Value2":2,"OSCAddress":""},{"Bank":0,"Control":38,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":"","NameOn":"","Slot":0,"Event":"Click","Message":"Profile+","Channel":1,"Code":0,"Value1":1,"Value2":3,"OSCAddress":""},{"Bank":0,"Control":38,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":"","NameOn":"","Slot":0,"Event":"Double Click","Message":"Power On/Off","Channel":1,"Code":0,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":0,"Control":38,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":"","NameOn":"","Slot":0,"Event":"Long Press","Message":"Device Info","Channel":1,"Code":0,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":1,"Control":1,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   A   ]","Slot":0,"Event":"Press","Message":"Note On","Channel":1,"Code":60,"Value1":0,"Value2":100,"OSCAddress":""},{"Bank":1,"Control":1,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   A   <","NameOn":"","Slot":0,"Event":"Release","Message":"Note Off","Channel":1,"Code":60,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":1,"Control":2,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   B   ]","Slot":2,"Event":"Press","Message":"Note On","Channel":1,"Code":62,"Value1":0,"Value2":100,"OSCAddress":""},{"Bank":1,"Control":2,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   B   <","NameOn":"","Slot":2,"Event":"Release","Message":"Note Off","Channel":1,"Code":62,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":1,"Control":3,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   C   ]","Slot":3,"Event":"Press","Message":"Note On","Channel":1,"Code":64,"Value1":0,"Value2":100,"OSCAddress":""},{"Bank":1,"Control":3,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   C   <","NameOn":"","Slot":3,"Event":"Release","Message":"Note Off","Channel":1,"Code":64,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":1,"Control":4,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   D   ]","Slot":5,"Event":"Press","Message":"Note On","Channel":1,"Code":65,"Value1":0,"Value2":100,"OSCAddress":""},{"Bank":1,"Control":4,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   D   <","NameOn":"","Slot":5,"Event":"Release","Message":"Note Off","Channel":1,"Code":65,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":1,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   A   ]","Slot":0,"Event":"Press","Message":"Control Change","Channel":1,"Code":20,"Value1":0,"Value2":127,"OSCAddress":""},{"Bank":2,"Control":1,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   A   <","NameOn":"","Slot":0,"Event":"Release","Message":"Control Change","Channel":1,"Code":20,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":2,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   B   ]","Slot":2,"Event":"Press","Message":"Control Change","Channel":1,"Code":21,"Value1":0,"Value2":127,"OSCAddress":""},{"Bank":2,"Control":2,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   B   <","NameOn":"","Slot":2,"Event":"Release","Message":"Control Change","Channel":1,"Code":21,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":3,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   C   ]","Slot":3,"Event":"Press","Message":"Control Change","Channel":1,"Code":22,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":3,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   C   <","NameOn":"","Slot":3,"Event":"Release","Message":"Control Change","Channel":1,"Code":22,"Value1":127,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":4,"Led":255,"Color0":"#000000","Color1":"#0433ff","NameOff":"","NameOn":"[   D   ]","Slot":5,"Event":"Press","Message":"Control Change","Channel":1,"Code":23,"Value1":0,"Value2":0,"OSCAddress":""},{"Bank":2,"Control":4,"Led":255,"Color0":"#000000","Color1":"#000000","NameOff":">   D   <","NameOn":"","Slot":5,"Event":"Release","Message":"Control Change","Channel":1,"Code":23,"Value1":127,"Value2":0,"OSCAddress":""}]}
diff --git a/data/css/bootstrap.min.css.gz b/data/css/bootstrap.min.css.gz
diff --git a/data/js/Sortable.min.js.gz b/data/js/Sortable.min.js.gz
diff --git a/data/js/bootstrap.bundle.min.js.gz b/data/js/bootstrap.bundle.min.js.gz
diff --git a/data/schema.json b/data/schema.json
@@ -274,7 +274,7 @@
                     },
                     "Channel": {
                         "type": "integer",
-                        "enum": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
+                        "enum": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
                     },
                     "Code": {
                         "type": "integer",
@@ -412,7 +412,7 @@
                     },
                     "Mode": {
                         "type": "string",
-                        "enum": ["None", "Momentary 1", "Latch", "Analog", "Jog Wheel", "Momentary 2","Momentary 3", "Latch 2", "Ladder", "Ultrasonic", "Analog+Momentary", "Analog+Latch", "Analog Pad", "Analog Pad+Momentary"]
+                        "enum": ["None", "Momentary 1", "Latch", "Analog", "Jog Wheel", "Momentary 2","Momentary 3", "Latch 2", "Ladder", "Ultrasonic", "Analog+Momentary", "Analog+Latch", "Analog Pad", "Analog Pad+Momentary", "Analog 4"]
                     },
                     "InvertPolarity": {
                         "type": "boolean"

diff --git a/esp32_platform_version.py b/esp32_platform_version.py
@@ -0,0 +1,16 @@
+import subprocess
+
+def get_platform_version():
+    result = subprocess.run(['pio', 'pkg', 'show', 'espressif32'], stdout=subprocess.PIPE)
+    output = result.stdout.decode()
+    for line in output.splitlines():
+        if "Platform" in line:
+            return line.split()[2]
+
+Import("env")
+
+platform_version = get_platform_version()
+print(f"ESP32 Platform Version: {platform_version}")
+
+# Pass the version to the compiler
+env.Append(CPPDEFINES=[("ESP32_PLATFORM_VERSION", f'"{platform_version}"')])