adds SCI support

artisan-roaster-scope · Oct 1, 2024 · 7af38be · 7af38be
1 parent 83dc1f8
commit 7af38be
Show file tree

Hide file tree

Showing 5 changed files with 488 additions and 2 deletions.
diff --git a/src/artisanlib/modbusport.py b/src/artisanlib/modbusport.py
@@ -440,7 +440,7 @@ async def read_active_registers_async(self) -> None:
                         if 0 < count <= self.maxCount:
                             res:Optional[Union[ModbusResponse,Awaitable[ModbusResponse]]] = None
 #                            if just_send:
-#                                await self.sleepBetween() # we start with a sleep, as it could be that just a send command happened before the semaphore was caught
+#                                await self.sleepBetweenAsync() # we start with a sleep, as it could be that just a send command happened before the semaphore was caught
 #                            just_send = True
                             tx:float = time.time()
                             while True:

diff --git a/src/includes/Machines/Sweet Coffee Italia/Gema_26-30IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gema_26-30IND.aset
@@ -0,0 +1,162 @@
+[General]
+Delay=2000
+roastertype_setup=Sweet Coffee Italia – Gema 26-30IND
+roastersize_setup=30
+roasterheating_setup=3
+
+[Device]
+id=29
+
+[ExtraComm]
+extrabaudrate=38400, 38400
+extrabytesize=8, 8
+extracomport=COM1, COM1
+extraparity=E, E
+extrastopbits=1, 1
+extratimeout=0.5, 0.5
+
+[ExtraDev]
+extraCurveVisibility1=true, false, true, true, true, true, true, true, true, true
+extraCurveVisibility2=true, false, true, true, true, true, true, true, true, true
+extraDelta1=false, false, false, false, false, false, false, false, false, false
+extraDelta2=false, false, false, false, false, false, false, false, false, false
+extraFill1=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+extraFill2=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+extraLCDvisibility1=true, true, false, false, false, false, false, false, false, false
+extraLCDvisibility2=true, false, false, false, false, false, false, false, false, false
+extradevicecolor1=#000000, #000000
+extradevicecolor2=#000000, #000000
+extradevices=33, 55
+extramathexpression1=, 
+extramathexpression2=, 
+extraname1=IT, kWh
+extraname2=CT, Extra 2
+
+[Modbus]
+IP_retries=1
+IP_timeout=0.2
+PID_OFF_action=
+PID_ON_action=
+PID_SV_register=0
+PID_d_register=0
+PID_i_register=0
+PID_p_register=0
+PID_slave_ID=0
+PIDmultiplier=0
+SVmultiplier=0
+baudrate=115200
+bytesize=8
+comport=COM5
+fetch_max_blocks=false
+host=127.0.0.1
+input10BCDsAsInt=false
+input10FloatsAsInt=false
+input10Signed=false
+input10bcd=false
+input10code=3
+input10div=0
+input10float=false
+input10mode=C
+input10register=0
+input10slave=0
+input1BCDsAsInt=false
+input1FloatsAsInt=false
+input1Signed=false
+input1bcd=false
+input1code=3
+input1div=0
+input1float=true
+input1mode=C
+input1register=5004
+input1slave=1
+input2BCDsAsInt=false
+input2FloatsAsInt=false
+input2Signed=false
+input2bcd=false
+input2code=3
+input2div=0
+input2float=true
+input2mode=C
+input2register=5000
+input2slave=1
+input3BCDsAsInt=false
+input3FloatsAsInt=false
+input3Signed=false
+input3bcd=false
+input3code=3
+input3div=0
+input3float=true
+input3mode=C
+input3register=5006
+input3slave=1
+input4BCDsAsInt=false
+input4FloatsAsInt=false
+input4Signed=false
+input4bcd=false
+input4code=3
+input4div=0
+input4float=true
+input4mode=C
+input4register=5002
+input4slave=1
+input5BCDsAsInt=false
+input5FloatsAsInt=false
+input5Signed=false
+input5bcd=false
+input5code=3
+input5div=0
+input5float=false
+input5mode=
+input5register=4666
+input5slave=1
+input6BCDsAsInt=false
+input6FloatsAsInt=false
+input6Signed=false
+input6bcd=false
+input6code=3
+input6div=0
+input6float=false
+input6mode=C
+input6register=0
+input6slave=0
+input7BCDsAsInt=false
+input7FloatsAsInt=false
+input7Signed=false
+input7bcd=false
+input7code=3
+input7div=0
+input7float=false
+input7mode=C
+input7register=0
+input7slave=0
+input8BCDsAsInt=false
+input8FloatsAsInt=false
+input8Signed=false
+input8bcd=false
+input8code=3
+input8div=0
+input8float=false
+input8mode=C
+input8register=0
+input8slave=0
+input9BCDsAsInt=false
+input9FloatsAsInt=false
+input9Signed=false
+input9bcd=false
+input9code=3
+input9div=0
+input9float=false
+input9mode=C
+input9register=0
+input9slave=0
+littleEndianFloats=false
+modbus_serial_connect_delay=0
+optimizer=false
+parity=N
+port=502
+serial_readRetries=1
+serial_strict_timing=false
+stopbits=1
+timeout=0.4
+type=3
+wordorderLittle=true
diff --git a/src/includes/Machines/Sweet Coffee Italia/Gema_2IND.aset b/src/includes/Machines/Sweet Coffee Italia/Gema_2IND.aset
@@ -0,0 +1,162 @@
+[General]
+Delay=2000
+roastertype_setup=Sweet Coffee Italia – Gema 2IND
+roastersize_setup=2
+roasterheating_setup=3
+
+[Device]
+id=29
+
+[ExtraComm]
+extrabaudrate=38400, 38400
+extrabytesize=8, 8
+extracomport=COM1, COM1
+extraparity=E, E
+extrastopbits=1, 1
+extratimeout=0.5, 0.5
+
+[ExtraDev]
+extraCurveVisibility1=true, false, true, true, true, true, true, true, true, true
+extraCurveVisibility2=true, false, true, true, true, true, true, true, true, true
+extraDelta1=false, false, false, false, false, false, false, false, false, false
+extraDelta2=false, false, false, false, false, false, false, false, false, false
+extraFill1=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+extraFill2=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+extraLCDvisibility1=true, true, false, false, false, false, false, false, false, false
+extraLCDvisibility2=true, false, false, false, false, false, false, false, false, false
+extradevicecolor1=#000000, #000000
+extradevicecolor2=#000000, #000000
+extradevices=33, 55
+extramathexpression1=, 
+extramathexpression2=, 
+extraname1=IT, kWh
+extraname2=CT, Extra 2
+
+[Modbus]
+IP_retries=1
+IP_timeout=0.2
+PID_OFF_action=
+PID_ON_action=
+PID_SV_register=0
+PID_d_register=0
+PID_i_register=0
+PID_p_register=0
+PID_slave_ID=0
+PIDmultiplier=0
+SVmultiplier=0
+baudrate=115200
+bytesize=8
+comport=COM5
+fetch_max_blocks=false
+host=127.0.0.1
+input10BCDsAsInt=false
+input10FloatsAsInt=false
+input10Signed=false
+input10bcd=false
+input10code=3
+input10div=0
+input10float=false
+input10mode=C
+input10register=0
+input10slave=0
+input1BCDsAsInt=false
+input1FloatsAsInt=false
+input1Signed=false
+input1bcd=false
+input1code=3
+input1div=0
+input1float=true
+input1mode=C
+input1register=5004
+input1slave=1
+input2BCDsAsInt=false
+input2FloatsAsInt=false
+input2Signed=false
+input2bcd=false
+input2code=3
+input2div=0
+input2float=true
+input2mode=C
+input2register=5000
+input2slave=1
+input3BCDsAsInt=false
+input3FloatsAsInt=false
+input3Signed=false
+input3bcd=false
+input3code=3
+input3div=0
+input3float=true
+input3mode=C
+input3register=5006
+input3slave=1
+input4BCDsAsInt=false
+input4FloatsAsInt=false
+input4Signed=false
+input4bcd=false
+input4code=3
+input4div=0
+input4float=true
+input4mode=C
+input4register=5002
+input4slave=1
+input5BCDsAsInt=false
+input5FloatsAsInt=false
+input5Signed=false
+input5bcd=false
+input5code=3
+input5div=0
+input5float=false
+input5mode=
+input5register=4666
+input5slave=1
+input6BCDsAsInt=false
+input6FloatsAsInt=false
+input6Signed=false
+input6bcd=false
+input6code=3
+input6div=0
+input6float=false
+input6mode=C
+input6register=0
+input6slave=0
+input7BCDsAsInt=false
+input7FloatsAsInt=false
+input7Signed=false
+input7bcd=false
+input7code=3
+input7div=0
+input7float=false
+input7mode=C
+input7register=0
+input7slave=0
+input8BCDsAsInt=false
+input8FloatsAsInt=false
+input8Signed=false
+input8bcd=false
+input8code=3
+input8div=0
+input8float=false
+input8mode=C
+input8register=0
+input8slave=0
+input9BCDsAsInt=false
+input9FloatsAsInt=false
+input9Signed=false
+input9bcd=false
+input9code=3
+input9div=0
+input9float=false
+input9mode=C
+input9register=0
+input9slave=0
+littleEndianFloats=false
+modbus_serial_connect_delay=0
+optimizer=false
+parity=N
+port=502
+serial_readRetries=1
+serial_strict_timing=false
+stopbits=1
+timeout=0.4
+type=3
+wordorderLittle=true