adds Cogen setup

src/includes/Machines/Cogen/Series_C.aset

@@ -0,0 +1,190 @@
+[General]
+Delay=1000
+roastertype_setup=Cogen Series C
+
+[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]
+devicetablecolumnwidths=158, 76, 76, 126, 126, 126, 126, 40, 42, 51, 52, 54, 56, 42, 42
+extraCurveVisibility1=false, false, true, true, true, true, true, true, true, true
+extraCurveVisibility2=false, 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=false, false, false, false, false, false, false, false, false, false
+extraLCDvisibility2=true, false, false, false, false, false, false, false, false, false
+extradevicecolor1=#9b001d, #3da54d
+extradevicecolor2=#6b006d, #3796c4
+extradevices=33, 55
+extramathexpression1=, 
+extramathexpression2=, 
+extraname1={3}, {1}
+extraname2=Pa, {0}
+
+[ExtraEventButtons]
+buttonlistmaxlen=11
+buttonpalette=@Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0), @Variant(\0\0\0\t\0\0\0\0)
+buttonpalette_label=
+buttonpalette_shortcuts=true
+buttonpalettemaxlen=11, 14, 14, 14, 14, 14, 14, 14, 14, 14
+buttonsize=1
+eventbuttontablecolumnwidths=70, 80, 100, 50, 150, 100, 80, 80, 80, 321
+extraeventbuttoncolor=#ad0018, #bd5563, #808080, #00aa44, #65b686, #808080, #0098c9, #70bdd7
+extraeventbuttontextcolor=white, white, white, white, white, white, white, white
+extraeventsactions=4, 4, 0, 4, 4, 0, 4, 4
+extraeventsactionstrings="write(1,169,{})", "write(1,169,{})", , "writeWord(1,115,{})", "writeWord(1,115,{})", , "writeWord(1,118,{})", "writeWord(1,118,{})"
+extraeventsbuttonsflags=0, 1, 1
+extraeventsdescriptions=, , , , , , , 
+extraeventslabels=\\t\n+1, \\t\n-1, E, \\t\n+5, \\t\n-5, E, \\t\n+10%, \\t\n-10%
+extraeventstypes=8, 8, 4, 6, 6, 4, 5, 5
+extraeventsvalues=1.1, -1.1, 0, 1.5, -1.5, 0, 2, -2
+extraeventsvisibility=1, 1, 0, 1, 1, 0, 1, 1
+marklastbuttonpressed=true
+showextrabuttontooltips=false
+
+
+[Modbus]
+IP_retries=1
+IP_timeout=0.4
+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
+input1BCDsAsInt=false
+input1FloatsAsInt=false
+input1Signed=false
+input1bcd=false
+input1code=4
+input1div=0
+input1float=true
+input1mode=C
+input1register=1
+input1slave=1
+input2BCDsAsInt=false
+input2FloatsAsInt=false
+input2Signed=false
+input2bcd=false
+input2code=4
+input2div=0
+input2float=true
+input2mode=C
+input2register=3
+input2slave=1
+input3BCDsAsInt=false
+input3FloatsAsInt=false
+input3Signed=false
+input3bcd=false
+input3code=3
+input3div=0
+input3float=false
+input3mode=
+input3register=169
+input3slave=1
+input4BCDsAsInt=false
+input4FloatsAsInt=false
+input4Signed=false
+input4bcd=false
+input4code=3
+input4div=0
+input4float=true
+input4mode=
+input4register=109
+input4slave=1
+input5BCDsAsInt=false
+input5FloatsAsInt=false
+input5Signed=false
+input5bcd=false
+input5code=3
+input5div=0
+input5float=true
+input5mode=
+input5register=115
+input5slave=1
+input6BCDsAsInt=false
+input6FloatsAsInt=false
+input6Signed=false
+input6bcd=false
+input6code=3
+input6div=0
+input6float=true
+input6mode=
+input6register=118
+input6slave=1
+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
+littleEndianFloats=false
+modbus_serial_extra_read_delay=0
+optimizer=true
+parity=N
+port=502
+reset_socket=false
+serial_readRetries=0
+stopbits=1
+timeout=0.4
+type=3
+wordorderLittle=true
+
+[Quantifiers]
+clusterEventsFlag=false
+eventquantifierSV=1, 1, 0, 1
+eventquantifieraction=0, 0, 0, 0
+quantifieractive=1, 1, 0, 1
+quantifiercoarse=0, 0, 0, 0
+quantifiermax=100, 68, 100, 10
+quantifiermin=0, 0, 0, 0
+quantifiersource=5, 4, 0, 2
+
+[Sliders]
+ModeTempSliders=C
+eventsliderAlternativeLayout=false
+eventsliderBernoulli=0, 0, 0, 0
+eventsliderKeyboardControl=true
+eventslidercoarse=0, 0, 0, 0
+eventslidersflags=0, 1, 1
+eventslidertemp=0, 0, 0, 0
+eventsliderunits=%, RPM, , 
+slideractions=2, 2, 0, 2
+slidercommands="writeWord(1,118,{})", "writeWord(1,115,{})", , "write(1,169,{})"
+sliderfactors=1, 1, 1, 1
+slidermax=100, 68, 100, 10
+slidermin=0, 0, 0, 0
+slideroffsets=0, 0, 0, 0
+slidervisibilities=1, 1, 0, 1

src/requirements-dev.txt

@@ -8,7 +8,7 @@ types-requests==2.31.0.2
 types-setuptools==68.2.0.0
 types-urllib3==1.26.25.14
 mypy==1.5.1
-pyright==1.1.324
+pyright==1.1.327
 ruff>=0.0.285
 pylint==2.17.5
 pre-commit>=3.3.3

src/requirements.txt

@@ -49,7 +49,7 @@ psutil==5.9.4
 typing-extensions==4.71; python_version < '3.8' # required for supporting Final and TypeDict on Python <3.8
 protobuf==4.24.3
 numpy==1.24.3; python_version < '3.9' # last Python 3.8 release
-numpy==1.25.2; python_version >= '3.9'
+numpy==1.26.0; python_version >= '3.9'
 scipy==1.10.1; python_version < '3.9' # last Python 3.8 release
 scipy==1.11.2; python_version >= '3.9'
 wquantiles==0.6

src/setup-macos3.py

@@ -385,3 +385,16 @@
 subprocess.check_call(r'rm -f artisan-mac-' + VERSION + r'.dmg',shell = True)
 subprocess.check_call(r'hdiutil create artisan-mac-' + VERSION + r'.dmg -volname "artisan" -fs HFS+ -srcfolder "dist"',shell = True)
 # otool -L dist/Artisan.app/Contents/MacOS/Artisan
+
+# brew install create-dmg
+#subprocess.check_call(r'create-dmg \
+#  --volname "Artisan" \
+#  --volicon "Hello World.icns" \
+#  --window-pos 200 120 \
+#  --window-size 600 300 \
+#  --icon-size 100 \
+#  --icon "Hello World.app" 175 120 \
+#  --hide-extension "Hello World.app" \
+#  --app-drop-link 425 120 \
+#  "dist/Hello World.dmg" \
+#  "dist/dmg/"