| 372,7 → 372,7 |
|---|
| self.label_3.SetMinSize((110, -1)) |
| self.label_3.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) |
| self.label_4.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) |
| self.speedCtrl.SetToolTipString("e.g. \n 100 \n 100,150 \n 100-200:10") |
| self.speedCtrl.SetToolTipString("e.g. \n 100 \n 100,150 \n 100-200:10 \n 50,100-200:10 \n 5*100,5*200") |
| self.bitmap_button_1.SetToolTipString("Start Measurement") |
| self.bitmap_button_1.SetSize(self.bitmap_button_1.GetBestSize()) |
| self.static_line_1.SetMinSize((800,3)) |
| 688,20 → 688,24 |
|---|
| if self.accTopCb.IsChecked(): mp.channels.append(5) |
| if self.accRollCb.IsChecked(): mp.channels.append(6) |
| if self.accNickCb.IsChecked(): mp.channels.append(7) |
| s = self.speedCtrl.GetValue() |
| if s=="test1": |
| mp.speeds = (100,100,100,100,100,100,100,100, 200,200,200,200,200,200,200,200, 100,200, 100,200, 100,200, 100,200) |
| elif s=="test2": |
| mp.speeds = (100,100,100,100,100, 150,150,150,150,150, 200,200,200,200,200, 100,150,200, 100,150,200, 100,150,200, 100,150,200) |
| elif s.count("-") == 1: |
| # assume from-to:step format |
| s = s.split("-") |
| if len(s) != 2: raise Exception("Invalid format") |
| s[1] = s[1].split(":") |
| if len(s[1]) != 2: raise Exception("Invalid format") |
| mp.speeds = range(int(s[0]),int(s[1][0])+int(s[1][1]),int(s[1][1])) |
| else: |
| mp.speeds = map(int,s.split(',')) |
| |
| mp.speeds = [] |
| for speedTxt in self.speedCtrl.GetValue().split(","): |
| if speedTxt.count("-") == 1: |
| # assume from-to:step format |
| speedTxt = speedTxt.split("-") |
| if len(speedTxt) != 2: raise Exception("Invalid format") |
| speedTxt[1] = speedTxt[1].split(":") |
| if len(speedTxt[1]) != 2: raise Exception("Invalid format") |
| mp.speeds = range(int(speedTxt[0]),int(speedTxt[1][0])+int(speedTxt[1][1]),int(speedTxt[1][1])) |
| else: |
| # assume s or s*n format |
| if speedTxt.count("*") == 1: |
| speedTxt = speedTxt.split("*") |
| for i in range(int(speedTxt[0])): |
| mp.speeds.append(int(speedTxt[1])) |
| else: |
| mp.speeds.append(int(speedTxt)) |
| except Exception,e: |
| dial = wx.MessageDialog(None, 'Invalid paramters', 'Error', wx.OK | |
| wx.ICON_ERROR) |
| 835,12 → 839,14 |
|---|
| self._testCancel() |
| self.mk.setMotorTest(speeds) |
| time.sleep(.1) |
| self.currSpeed = speed |
| |
| |
| def _run(self): |
| self.running = True |
| self._sendEvent("Starting test \"%s\"" % self.param.descr) |
| |
| self.currSpeed = 0 |
| |
| try: |
| self._sendEvent("Opening SerialPort \"%s\"" % self.param.serialPort) |
| self.mk.open(comPort=self.param.serialPort) |
| 878,8 → 884,9 |
|---|
| self._setMotorSpeed(self.param.motorStartupSpeed, self.param.motorStartupSettlingTime) |
| |
| for speed in self.param.speeds: |
| self._sendEvent("Changing motor speed to %d... " % speed, speed=speed) |
| self._setMotorSpeed(speed, 1) |
| if speed != self.currSpeed: |
| self._sendEvent("Changing motor speed to %d... " % speed, speed=speed) |
| self._setMotorSpeed(speed, 1) |
| |
| for channel in self.param.channels: |
| self._setMotorSpeed(speed, .1) |