Rev 627 | Rev 629 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 627 | Rev 628 | ||
|---|---|---|---|
| Line 730... | Line 730... | ||
| 730 | self._sendEvent("Version: %d.%d" % version) |
730 | self._sendEvent("Version: %d.%d" % version) |
| Line 731... | Line 731... | ||
| 731 | 731 | ||
| 732 | msg = self.mk.getDebugMsg() |
732 | msg = self.mk.getDebugMsg() |
| 733 | voltage = msg.getVoltage() |
733 | voltage = msg.getVoltage() |
| - | 734 | if (voltage == 0): |
|
| 734 | if (voltage == 0): |
735 | # Board is probably fed by USB |
| 735 | minVoltage = 0 |
736 | minVoltage = 0 |
| 736 | maxVoltage = 1 |
737 | maxVoltage = 1 |
| - | 738 | else: |
|
| 737 | else: |
739 | # Determine the n umber of cells |
| 738 | if (voltage > 4.2*3): |
740 | if (voltage > 4.2*3): |
| 739 | nbCells = 4 |
741 | nbCells = 4 |
| 740 | else: |
742 | else: |
| - | 743 | nbCells = 3 |
|
| - | 744 | # Set minimum and maximum voltages |
|
| - | 745 | if self.param.minVoltage > 0: |
|
| - | 746 | minVoltage = self.param.minVoltage |
|
| 741 | nbCells = 3 |
747 | else: |
| - | 748 | minVoltage = nbCells*3.5 # auto |
|
| - | 749 | if self.param.maxVoltage > 0: |
|
| - | 750 | maxVoltage = self.param.maxVoltage |
|
| 742 | minVoltage = nbCells*3.5 |
751 | else: |
| - | 752 | maxVoltage = nbCells*3.9 |
|
| 743 | maxVoltage = nbCells*3.9 |
753 | |
| 744 | self._sendEvent("Voltage: %2.1fV" % voltage) |
754 | self._sendEvent("Voltage: %2.1fV" % voltage) |
| Line 745... | Line -... | ||
| 745 | self._sendEvent("Min/Max Voltage: %2.1fV-%2.1fV" % (minVoltage, maxVoltage), parVoltage=(minVoltage, maxVoltage, voltage)) |
- | |
| 746 | 755 | self._sendEvent("Min/Max Voltage: %2.1fV-%2.1fV" % (minVoltage, maxVoltage), parVoltage=(minVoltage, maxVoltage, voltage)) |
|
| 747 | 756 | ||
| Line 748... | Line 757... | ||
| 748 | self._sendEvent("Starting motor(s) (speed=%d)... " % self.param.motorStartupSpeed, speed=self.param.motorStartupSpeed) |
757 | self._sendEvent("Starting motor(s) (speed=%d)... " % self.param.motorStartupSpeed, speed=self.param.motorStartupSpeed) |
| 749 | self._setMotorSpeed(self.param.motorStartupSpeed, self.param.motorStartupSettlingTime) |
758 | self._setMotorSpeed(self.param.motorStartupSpeed, self.param.motorStartupSettlingTime) |
| Line 857... | Line 866... | ||
| 857 | self.settings["startupspeed"] = Setting("Motor Startup Speed", 25) |
866 | self.settings["startupspeed"] = Setting("Motor Startup Speed", 25) |
| 858 | self.settings["startupsettling"] = Setting("Motor Startup Setting time (s)", 3) |
867 | self.settings["startupsettling"] = Setting("Motor Startup Setting time (s)", 3) |
| 859 | self.settings["serialport"] = Setting("Serial Port", "COM1") |
868 | self.settings["serialport"] = Setting("Serial Port", "COM1") |
| 860 | self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50) |
869 | self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50) |
| 861 | self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 180) |
870 | self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 180) |
| - | 871 | self.settings["minvoltage"] = Setting("Minimum Bettery Voltage (0=Automatic) (V) ", 0) |
|
| - | 872 | self.settings["maxvoltage"] = Setting("Maximum Bettery Voltage (0=Automatic) (V) ", 0) |
|
| - | 873 | ||
| Line 862... | Line 874... | ||
| 862 | 874 | ||
| Line 863... | Line 875... | ||
| 863 | self.readSettings() |
875 | self.readSettings() |
| 864 | 876 | ||
| Line 993... | Line 1005... | ||
| 993 | print "Start measuring" |
1005 | print "Start measuring" |
| Line 994... | Line 1006... | ||
| 994 | 1006 | ||
| 995 | measureParams.serialPort = self.settings["serialport"].value |
1007 | measureParams.serialPort = self.settings["serialport"].value |
| 996 | measureParams.motorStartupSpeed = self.settings["startupspeed"].value |
1008 | measureParams.motorStartupSpeed = self.settings["startupspeed"].value |
| - | 1009 | measureParams.motorStartupSettlingTime = self.settings["startupsettling"].value |
|
| - | 1010 | measureParams.minVoltage = self.settings["minvoltage"].value |
|
| Line 997... | Line 1011... | ||
| 997 | measureParams.motorStartupSettlingTime = self.settings["startupsettling"].value |
1011 | measureParams.maxVoltage = self.settings["maxvoltage"].value |
| 998 | 1012 | ||
| Line 999... | Line 1013... | ||
| 999 | self.measureThread = MeasureThread(measureParams, dialog) |
1013 | self.measureThread = MeasureThread(measureParams, dialog) |