Rev 637 | Rev 639 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 637 | Rev 638 | ||
---|---|---|---|
Line 191... | Line 191... | ||
191 | self.voltageCtrl.SetTicks(ticks) |
191 | self.voltageCtrl.SetTicks(ticks) |
192 | self.firstVoltage = False |
192 | self.firstVoltage = False |
193 | i = (v-vmin)/(vmax-vmin) # 0..1 |
193 | i = (v-vmin)/(vmax-vmin) # 0..1 |
194 | i *= 2 |
194 | i *= 2 |
195 | i = i+1 |
195 | i = i+1 |
196 | i = min(max(i,0.1),4.9) |
196 | i = min(max(i,0),4) |
197 | self.voltageCtrl.SetSpeedValue(i) |
197 | self.voltageCtrl.SetSpeedValue(i) |
Line 198... | Line 198... | ||
198 | 198 | ||
Line 801... | Line 801... | ||
801 | evt = MeasStatusUpdateEvent(running=self.running, msg=msg, error=error, voltage=parVoltage, speed=speed) |
801 | evt = MeasStatusUpdateEvent(running=self.running, msg=msg, error=error, voltage=parVoltage, speed=speed) |
802 | wx.PostEvent(self.evtConsumer, evt) |
802 | wx.PostEvent(self.evtConsumer, evt) |
Line 803... | Line 803... | ||
803 | 803 | ||
804 | def _setMotorSpeed(self, speed, settlingTime): |
804 | def _setMotorSpeed(self, speed, settlingTime): |
- | 805 | speeds = [0,0,0,0] |
|
805 | speeds = [0,0,0,0] |
806 | |
806 | for motor in self.param.motors: |
807 | for motor in self.param.motors: |
807 | speeds[motor-1] = speed |
808 | speeds[motor-1] = speed |
808 | for i in range(int(settlingTime*10)): |
809 | for i in range(int(settlingTime*10)): |
809 | self._testCancel() |
810 | self._testCancel() |