Gemma 2IND and 6-8IND updates

artisan-roaster-scope · Oct 31, 2024 · 949c559 · 949c559
1 parent f08fc19
commit 949c559
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/src/includes/Machines/Sweet Coffee Italia/Gemma_2IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gemma_2IND.aset
@@ -31,7 +31,7 @@ extraLCDvisibility1=true, true, false, false, false, false, false, false, false,
 extraLCDvisibility2=true, false, false, false, false, false, false, false, false, false
 extradevicecolor1=#ff5d00ff, #000000, #000000, #43a7cfff
 extradevicecolor2=#2298c7ff, #000000, #0c6aa6ff, #49b160ff
-extradevices=33, 55, 25, 150
+extradevices=33, 55, 109, 150
 extramathexpression1=, , , 
 extramathexpression2=, , , 
 extraname1=IT, kWh, {3}, {0}
@@ -42,7 +42,7 @@ extraname2=CT, Extra 2, SP, {1}
 svSlider=true
 svSliderMax=250
 svSliderMin=0
-svSync=0
+svSync=8
 
 [Modbus]
 IP_retries=1
@@ -63,14 +63,14 @@ comport=COM5
 fetch_max_blocks=false
 host=192.168.103.200
 input10BCDsAsInt=false
-input10FloatsAsInt=false
+input10FloatsAsInt=true
 input10Signed=true
 input10bcd=false
 input10code=3
 input10div=1
 input10float=false
 input10mode=
-input10register=1006
+input10register=9000
 input10slave=255
 input1BCDsAsInt=false
 input1FloatsAsInt=true
@@ -117,10 +117,10 @@ input5FloatsAsInt=true
 input5Signed=true
 input5bcd=false
 input5code=3
-input5div=0
+input5div=2
 input5float=false
 input5mode=
-input5register=4666
+input5register=18670
 input5slave=255
 input6BCDsAsInt=false
 input6FloatsAsInt=true
@@ -133,25 +133,25 @@ input6mode=C
 input6register=4550
 input6slave=0
 input7BCDsAsInt=false
-input7FloatsAsInt=false
-input7Signed=false
+input7FloatsAsInt=true
+input7Signed=true
 input7bcd=false
 input7code=3
-input7div=0
+input7div=1
 input7float=false
-input7mode=C
-input7register=0
-input7slave=0
+input7mode=
+input7register=4650
+input7slave=255
 input8BCDsAsInt=false
-input8FloatsAsInt=false
-input8Signed=false
+input8FloatsAsInt=true
+input8Signed=true
 input8bcd=false
 input8code=3
-input8div=0
+input8div=1
 input8float=false
 input8mode=C
-input8register=0
-input8slave=0
+input8register=4550
+input8slave=255
 input9BCDsAsInt=false
 input9FloatsAsInt=true
 input9Signed=true
@@ -160,7 +160,7 @@ input9code=3
 input9div=1
 input9float=false
 input9mode=
-input9register=2060
+input9register=9002
 input9slave=255
 littleEndianFloats=false
 modbus_serial_connect_delay=0
@@ -216,11 +216,11 @@ slidervisibilities=1, 1, 0, 1
 clusterEventsFlag=false
 eventquantifierSV=0, 0, 0, 0
 eventquantifieraction=0, 0, 0, 0
-quantifieractive=1, 1, 0, 0
+quantifieractive=1, 1, 0, 1
 quantifiercoarse=0, 0, 0, 0
 quantifiermax=100, 100, 100, 100
 quantifiermin=0, 0, 0, 0
-quantifiersource=8, 9, 0, 0
+quantifiersource=8, 9, 0, 6
 
 [EnergyDefaults]
 ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x2-\x80\x4\x95\"\x2\0\0\0\0\0\0}\x94K\x3}\x94(G@\0\0\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6Heater\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(G@\x4\0\0\0\0\0\0G?\xd3\x33\x33\x33\x33\x33\x33K\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x2K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuG@ \0\0\0\0\0\0}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@(\0\0\0\0\0\0G?\xfc\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuG@>\0\0\0\0\0\0}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@>\0\0\0\0\0\0G@\x14\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuus.)
diff --git a/src/includes/Machines/Sweet Coffee Italia/Gemma_6-8IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gemma_6-8IND.aset
@@ -31,18 +31,17 @@ extraLCDvisibility1=true, true, false, false, false, false, false, false, false,
 extraLCDvisibility2=true, false, false, false, false, false, false, false, false, false
 extradevicecolor1=#ff5d00ff, #000000, #000000, #43a7cfff
 extradevicecolor2=#2298c7ff, #000000, #0c6aa6ff, #49b160ff
-extradevices=33, 55, 25, 150
+extradevices=33, 55, 109, 150
 extramathexpression1=, , , 
 extramathexpression2=, , , 
 extraname1=IT, kWh, {3}, {0}
 extraname2=CT, Extra 2, SP, {1}
 
-
 [ArduinoPID]
 svSlider=true
 svSliderMax=250
 svSliderMin=0
-svSync=0
+svSync=8
 
 [Modbus]
 IP_retries=1
@@ -63,14 +62,14 @@ comport=COM5
 fetch_max_blocks=false
 host=192.168.103.200
 input10BCDsAsInt=false
-input10FloatsAsInt=false
+input10FloatsAsInt=true
 input10Signed=true
 input10bcd=false
 input10code=3
 input10div=1
 input10float=false
 input10mode=
-input10register=1006
+input10register=9000
 input10slave=255
 input1BCDsAsInt=false
 input1FloatsAsInt=true
@@ -117,10 +116,10 @@ input5FloatsAsInt=true
 input5Signed=true
 input5bcd=false
 input5code=3
-input5div=0
+input5div=2
 input5float=false
 input5mode=
-input5register=4666
+input5register=18670
 input5slave=255
 input6BCDsAsInt=false
 input6FloatsAsInt=true
@@ -133,25 +132,25 @@ input6mode=C
 input6register=4550
 input6slave=0
 input7BCDsAsInt=false
-input7FloatsAsInt=false
-input7Signed=false
+input7FloatsAsInt=true
+input7Signed=true
 input7bcd=false
 input7code=3
-input7div=0
+input7div=1
 input7float=false
-input7mode=C
-input7register=0
-input7slave=0
+input7mode=
+input7register=4650
+input7slave=255
 input8BCDsAsInt=false
-input8FloatsAsInt=false
-input8Signed=false
+input8FloatsAsInt=true
+input8Signed=true
 input8bcd=false
 input8code=3
-input8div=0
+input8div=1
 input8float=false
 input8mode=C
-input8register=0
-input8slave=0
+input8register=4550
+input8slave=255
 input9BCDsAsInt=false
 input9FloatsAsInt=true
 input9Signed=true
@@ -160,7 +159,7 @@ input9code=3
 input9div=1
 input9float=false
 input9mode=
-input9register=2060
+input9register=9002
 input9slave=255
 littleEndianFloats=false
 modbus_serial_connect_delay=0
@@ -174,6 +173,7 @@ timeout=0.4
 type=3
 wordorderLittle=true
 
+
 [ExtraEventButtons]
 buttonlistmaxlen=11
 buttonpalette=@Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\x1c\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\t\0\0\0\0)
@@ -216,11 +216,11 @@ slidervisibilities=1, 1, 0, 1
 clusterEventsFlag=false
 eventquantifierSV=0, 0, 0, 0
 eventquantifieraction=0, 0, 0, 0
-quantifieractive=1, 1, 0, 0
+quantifieractive=1, 1, 0, 1
 quantifiercoarse=0, 0, 0, 0
 quantifiermax=100, 100, 100, 100
 quantifiermin=0, 0, 0, 0
-quantifiersource=8, 9, 0, 0
+quantifiersource=8, 9, 0, 6
 
 [EnergyDefaults]
 ratings=@Variant(\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\x2-\x80\x4\x95\"\x2\0\0\0\0\0\0}\x94K\x3}\x94(G@\0\0\0\0\0\0\0}\x94(\x8c\nloadlabels\x94]\x94(\x8c\x6Heater\x94\x8c\x6Others\x94\x8c\0\x94h\ae\x8c\vloadratings\x94]\x94(G@\x4\0\0\0\0\0\0G?\xd3\x33\x33\x33\x33\x33\x33K\0K\0\x65\x8c\vratingunits\x94]\x94(K\x3K\x3K\0K\0\x65\x8c\vsourcetypes\x94]\x94(K\x2K\x2K\0K\0\x65\x8c\vload_etypes\x94]\x94(K\x4K\0K\0K\0\x65\x8c\x12presssure_percents\x94]\x94(\x89\x89\x89\x89\x65\x8c\x12loadevent_zeropcts\x94]\x94(K\0K\0K\0K\0\x65\x8c\x12loadevent_hundpcts\x94]\x94(KdKdKdKdeuG@ \0\0\0\0\0\0}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@(\0\0\0\0\0\0G?\xfc\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuG@>\0\0\0\0\0\0}\x94(h\x3]\x94(h\x5h\x6h\ah\aeh\b]\x94(G@>\0\0\0\0\0\0G@\x14\0\0\0\0\0\0K\0K\0\x65h\n]\x94(K\x3K\x3K\0K\0\x65h\f]\x94(K\x2K\x2K\0K\0\x65h\xe]\x94(K\x4K\0K\0K\0\x65h\x10]\x94(\x89\x89\x89\x89\x65h\x12]\x94(K\0K\0K\0K\0\x65h\x14]\x94(KdKdKdKdeuus.)