- upgrade macOS Python

- update Carmomaq setups (PR #1233) - fixes Japanese translation error (Issue #1256)
artisan-roaster-scope · Aug 28, 2023 · 23071af · 23071af
1 parent 5118d46
commit 23071af
Show file tree

Hide file tree

Showing 10 changed files with 26,541 additions and 26,882 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -20,7 +20,7 @@ environment:
   # Set the Appveyor Python version for windows, macos and linux here. Does not affect windows_legacy.
   PYTHON_V: 3.11
   # Upgrade to specific version (for platforms supporting upgrade). Upgrade skipped if env var is missing or blank.
-  PYUPGRADE_V: 3.11.4
+  PYUPGRADE_V: 3.11.5
 
   matrix:
   - job_name: windows_legacy

diff --git a/src/includes/Machines/Carmomaq/Caloratto_2.0.aset b/src/includes/Machines/Carmomaq/Caloratto_2.0.aset
@@ -4,13 +4,13 @@ Oversampling=true
 roastertype_setup=Carmomaq Caloratto
 
 [DefaultButtons]
-buttonactions=0, 0, 0, 0, 0, 0, 0, 0
-buttonactionstrings=, , , , , , , 
+buttonactions=3, 0, 0, 0, 0, 0, 3, 0
+buttonactionstrings="write(1,50,1)", , , , , , "write(1,50,2)", 
 buttonvisibility=true, true, true, true, true, false, true, true
-extrabuttonactions=0, 3, 0
-extrabuttonactionstrings=, "write(1,50,2)", 
-xextrabuttonactions=0, 3
-xextrabuttonactionstrings=, "write(1,50,1)"
+extrabuttonactions=0, 0, 0
+extrabuttonactionstrings=, , 
+xextrabuttonactions=0, 0
+xextrabuttonactionstrings=, 
 
 [Device]
 id=29
@@ -136,8 +136,8 @@ input6code=3
 input6div=0
 input6float=false
 input6mode=
-input6register=59
-input6slave=1
+input6register=49
+input6slave=0
 input7BCDsAsInt=false
 input7FloatsAsInt=false
 input7Signed=false

diff --git a/src/includes/Machines/Carmomaq/Masteratto_2.0.aset b/src/includes/Machines/Carmomaq/Masteratto_2.0.aset
@@ -4,13 +4,13 @@ Oversampling=true
 roastertype_setup=Carmomaq Masteratto
 
 [DefaultButtons]
-buttonactions=0, 0, 0, 0, 0, 0, 0, 0
-buttonactionstrings=, , , , , , , 
+buttonactions=3, 0, 0, 0, 0, 0, 3, 0
+buttonactionstrings="write(1,50,1)", , , , , , "write(1,50,2)", 
 buttonvisibility=true, true, true, true, true, false, true, true
-extrabuttonactions=0, 3, 0
-extrabuttonactionstrings=, "write(1,50,2)", 
-xextrabuttonactions=0, 3
-xextrabuttonactionstrings=, "write(1,50,1)"
+extrabuttonactions=0, 0, 0
+extrabuttonactionstrings=, , 
+xextrabuttonactions=0, 0
+xextrabuttonactionstrings=, 
 
 [Device]
 id=29
@@ -40,6 +40,8 @@ extramathexpression2=,
 extraname1={3}, {1}
 extraname2={0}, {2}
 
+[events]
+etypes=Air, Drum, V.Press, Burner, --
 
 [ExtraEventButtons]
 buttonlistmaxlen=8
@@ -137,7 +139,7 @@ input6code=3
 input6div=0
 input6float=false
 input6mode=
-input6register=59
+input6register=49
 input6slave=1
 input7BCDsAsInt=false
 input7FloatsAsInt=false

diff --git a/src/includes/Machines/Carmomaq/Speciatto_2.0.aset b/src/includes/Machines/Carmomaq/Speciatto_2.0.aset
@@ -4,13 +4,13 @@ Oversampling=true
 roastertype_setup=Carmomaq Speciatto
 
 [DefaultButtons]
-buttonactions=0, 0, 0, 0, 0, 0, 0, 0
-buttonactionstrings=, , , , , , , 
+buttonactions=3, 0, 0, 0, 0, 0, 3, 0
+buttonactionstrings="write(1,50,1)", , , , , , "write(1,50,2)", 
 buttonvisibility=true, true, true, true, true, false, true, true
-extrabuttonactions=0, 3, 0
-extrabuttonactionstrings=, "write(1,50,2)", 
-xextrabuttonactions=0, 3
-xextrabuttonactionstrings=, "write(1,50,1)"
+extrabuttonactions=0, 0, 0
+extrabuttonactionstrings=, , 
+xextrabuttonactions=0, 0
+xextrabuttonactionstrings=, 
 
 [Device]
 id=29
@@ -136,8 +136,8 @@ input6code=3
 input6div=0
 input6float=false
 input6mode=
-input6register=59
-input6slave=1
+input6register=49
+input6slave=0
 input7BCDsAsInt=false
 input7FloatsAsInt=false
 input7Signed=false

diff --git a/src/includes/Machines/Carmomaq/Stratto_1.5_Network_Legacy.aset b/src/includes/Machines/Carmomaq/Stratto_1.5_Network_Legacy.aset
diff --git a/src/includes/Machines/Carmomaq/Stratto_1.5_Serial_Legacy.aset b/src/includes/Machines/Carmomaq/Stratto_1.5_Serial_Legacy.aset
diff --git a/src/includes/Machines/Carmomaq/Stratto_2.0.aset b/src/includes/Machines/Carmomaq/Stratto_2.0.aset
@@ -4,14 +4,13 @@ Oversampling=true
 roastertype_setup=Carmomaq Stratto
 
 [DefaultButtons]
-buttonactions=0, 0, 0, 0, 0, 0, 0, 0
-buttonactionstrings=, , , , , , , 
+buttonactions=3, 0, 0, 0, 0, 0, 3, 0
+buttonactionstrings="write(1,50,1)", , , , , , "write(1,50,2)", 
 buttonvisibility=true, true, true, true, true, false, true, true
-extrabuttonactions=0, 3, 0
-extrabuttonactionstrings=, "write(1,50,2)", 
-xextrabuttonactions=0, 3
-xextrabuttonactionstrings=, "write(1,50,1)"
-
+extrabuttonactions=0, 0, 0
+extrabuttonactionstrings=, , 
+xextrabuttonactions=0, 0
+xextrabuttonactionstrings=, 
 [Device]
 id=29
 
@@ -136,8 +135,8 @@ input6code=3
 input6div=0
 input6float=false
 input6mode=
-input6register=59
-input6slave=1
+input6register=49
+input6slave=0
 input7BCDsAsInt=false
 input7FloatsAsInt=false
 input7Signed=false

diff --git a/src/includes/Machines/Kaleido/Legacy.aset b/src/includes/Machines/Kaleido/Legacy.aset
@@ -132,7 +132,7 @@ marklastbuttonpressed=false
 showextrabuttontooltips=false
 
 [SerialPort]
-baudrate=9600
+baudrate=57600
 bytesize=8
 comport=COM4
 parity=N