Skip to content

Commit b31f793

Browse files
committed
updates Cube PID and Kaleido setups
1 parent e16b118 commit b31f793

File tree

8 files changed

+15
-12
lines changed

8 files changed

+15
-12
lines changed

src/artisanlib/canvas.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5646,8 +5646,8 @@ def selectAlarmSet(self, n:int) -> None:
56465646

56475647
@pyqtSlot(str,int)
56485648
def moveBackgroundAndRedraw(self, direction:str, step:int) -> None:
5649-
self.movebackground(direction, step)
5650-
self.redraw(recomputeAllDeltas=False, #(direction in {'left', 'right'}),
5649+
self.movebackground(direction, step) # direction in {'left', 'right'}
5650+
self.redraw_keep_view(recomputeAllDeltas=False,
56515651
re_smooth_foreground=False,
56525652
re_smooth_background=False)
56535653

@@ -6086,7 +6086,7 @@ def playbackevent(self) -> None:
60866086
if (event_type not in slider_events and # only if there is no slider event of the corresponding type
60876087
self.specialeventplayback[event_type] and # only replay event types activated for replay
60886088
(str(self.etypesf(event_type) == str(self.Betypesf(event_type)))) and
6089-
#self.aw.eventslidervisibilities[event_type] and # we ramp also events ofinvisible sliders
6089+
#self.aw.eventslidervisibilities[event_type] and # we ramp also events of invisible sliders
60906090
self.specialeventplaybackramp[event_type]): # only calculate ramp for ramping events
60916091

60926092
## calculate ramping

src/artisanlib/pid_control.py

+1
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,7 @@ def setSV(self, sv:float, move:bool = True, init:bool = False) -> None:
16941694
self.aw.moveSVslider(sv,setValue=True)
16951695
self.aw.qmc.pid.setTarget(sv,init=init)
16961696
self.sv = sv # remember last sv
1697+
self.svValue = sv
16971698

16981699
# set RS patterns from one of the RS sets
16991700
def setRSpattern(self, n:int) -> None:

src/artisanlib/santoker.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ def send_msg(self, target:bytes, value: int) -> None:
364364
def start(self, connect_timeout:float=5) -> None:
365365
if self._connect_using_ble and hasattr(self, '_ble_client') and self._ble_client is not None:
366366
self._ble_client.setLogging(self._logging)
367-
self._ble_client.start(case_sensitive=False)
367+
self._ble_client.start(case_sensitive=False, scan_timeout=5, connect_timeout=3)
368368
else:
369369
super().start(connect_timeout)
370370

src/includes/Machines/Kaleido/Legacy.aset

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,4 @@ showEtypes=true, true, false, true, false
195195
showeventsonbt=true
196196
specialeventannotations=, , ,
197197
specialeventannovisibilities=0, 0, 0, 0
198-
autoDrop=false
198+
autoDrop=true

src/includes/Machines/Kaleido/Network.aset

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,4 @@ showEtypes=true, true, false, true, false
203203
showeventsonbt=true
204204
specialeventannotations=, , ,
205205
specialeventannovisibilities=0, 0, 0, 0
206-
autoDrop=false
206+
autoDrop=true

src/includes/Machines/Kaleido/Serial.aset

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,4 @@ showEtypes=true, true, false, true, false
203203
showeventsonbt=true
204204
specialeventannotations=, , ,
205205
specialeventannovisibilities=0, 0, 0, 0
206-
autoDrop=false
206+
autoDrop=true

src/includes/Machines/Santoker/Cube_Bluetooth_PID.aset

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
[General]
2-
Delay=500
2+
Delay=200
33
roastertype_setup=Santoker Cube BT PID
44
roasterheating_setup=3
55
roastersize_setup=0.1
66
specialeventplayback=true, true, true, false
77
specialeventplaybackramp=false, false, true, false
8+
dropDuplicates=true
9+
dropDuplicatesLimit=0.1
810

911
[Device]
1012
id=134
@@ -144,9 +146,9 @@ invertControl=false
144146
negativeTargetMax=100
145147
negativeTargetMin=0
146148
negativeTargetRangeLimit=false
147-
pidKd=6
148-
pidKi=0.13
149-
pidKp=1.1
149+
pidKp=0.65
150+
pidKi=0.025
151+
pidKd=3.5
150152
pidNegativeTarget=0
151153
pidOnCHARGE=true
152154
pidPositiveTarget=4

src/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ setuptools==70.3.0 # py2app fails on 71.0.3 and 71.0.4; pyinstaller windows/linu
3030
wheel==0.45.1
3131
pyserial==3.5
3232
pymodbus==3.6.9; python_version < '3.9' # last Python 3.8 release
33-
pymodbus==3.8.6; python_version >= '3.9'
33+
pymodbus==3.9.0; python_version >= '3.9'
3434
python-snap7==1.3; python_version < '3.10' # last Python 3.9 release
3535
python-snap7==2.0.2; python_version >= '3.10'
3636
Phidget22==1.22.20250106

0 commit comments

Comments
 (0)