Skip to content

Commit 5b15611

Browse files
committed
Added mt encoder spi speed selector
1 parent 701cc60 commit 5b15611

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
### Changes this version:
22
- Fixed TMC4671 tab calibration warning popup blocking thread causing timeouts
3+
- Added MT encoder spi speed selector
34

45
### Changes in v16.x:
56
- Added RMD CAN motor tab

encoderconf_ui.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,33 @@ def initUI(self):
126126

127127
self.comboBox_mode = QComboBox()
128128
layout.addRow(QLabel("Type"),self.comboBox_mode)
129+
130+
self.comboBox_spispeed = QComboBox()
131+
layout.addRow(QLabel("SPI speed"),self.comboBox_spispeed)
132+
129133
self.setLayout(layout)
130134

131135
def updateModes(self,reply):
132136
updateListComboBox(self.comboBox_mode,reply,entrySep='\n')
133137

138+
def updateSpeeds(self,reply):
139+
def f(data):
140+
data = str(f"{float(data)/1000000:.5g}MHz")
141+
return data
142+
updateListComboBox(self.comboBox_spispeed,reply,entrySep='\n',labelconv=f)
143+
134144
def onshown(self):
135145
self.get_value_async("mtenc","mode",self.updateModes,typechar='!')
146+
self.get_value_async("mtenc","speed",self.updateSpeeds,typechar='!')
136147
self.get_value_async("mtenc","cs",self.spinBox_cs.setValue,0,int)
137148
self.get_value_async("mtenc","mode",self.comboBox_mode.setCurrentIndex,0,int)
149+
self.get_value_async("mtenc","speed",self.comboBox_spispeed.setCurrentIndex,0,int)
138150

139151
def apply(self):
140152
val = self.spinBox_cs.value()
141153
self.send_value("mtenc","cs",val=val)
142154
self.send_value("mtenc","mode",val=self.comboBox_mode.currentData())
155+
self.send_value("mtenc","speed",val=self.comboBox_spispeed.currentData())
143156

144157
class BissEncoderConf(EncoderOption,CommunicationHandler):
145158
def __init__(self,parent,main):

helper.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def updateClassComboBox(combobox,ids,classes,selected = None):
3939
if(selected in ids and combobox.currentIndex() != ids[selected][0]):
4040
combobox.setCurrentIndex(ids[selected][0])
4141

42-
def updateListComboBox(combobox,reply,entrySep=',',dataSep=':',lookup = None,dataconv = None):
42+
def updateListComboBox(combobox,reply,entrySep=',',dataSep=':',lookup = None,dataconv = None,labelconv = None):
4343
"""Populates a combobox with entries formatted as Entrylabel<datasep>data<entrysep>..."""
4444
combobox.clear()
4545
if lookup != None:
@@ -50,9 +50,12 @@ def updateListComboBox(combobox,reply,entrySep=',',dataSep=':',lookup = None,dat
5050
continue # empty
5151
e = s.split(dataSep)
5252
data = e[1]
53+
label = e[0]
5354
if dataconv != None:
5455
data = dataconv(data)
55-
combobox.addItem(e[0],data)
56+
if labelconv != None:
57+
label = labelconv(label)
58+
combobox.addItem(label,data)
5659
if lookup != None:
5760
lookup[data] = i
5861
i += 1

0 commit comments

Comments
 (0)