Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 652 → Rev 653

/VibrationTest/trunk/VibrationTest/VibrationTestGui.py
781,7 → 781,7
print "about"
info = wx.AboutDialogInfo()
info.Name = "MK Vibration Test - "
info.Version = "v0.9 RC2 ($Rev$)".replace("$","")
info.Version = "v0.9 RC3 ($Rev$)".replace("$","")
info.Copyright = ""
info.Developers=["Frederic Goddeeris (Frederic@rc-flight.be)"]
info.Description = "Please consult the WIKI page for a complete description of the tool:"
867,6 → 867,10
try:
self._sendEvent("Opening SerialPort \"%s\"" % self.param.serialPort)
self.mk.open(comPort=self.param.serialPort)
print "Sending FC->NC forwarding",
self.mk.sendNCRedirectUartFromFC()
print "Done"
msg = self.mk.getVersionMsg()
version = msg.getVersion()
/VibrationTest/trunk/VibrationTest/mkProto.py
190,8 → 190,11
return (self.msg.data[0], self.msg.data[1])
 
class MkComm:
FCADDRESS = 1
 
ADDRESS_ALL = 0
ADDRESS_FC = 1
ADDRESS_NC = 2
ADDRESS_MK3MAG = 3
def __init__(self, printDebugMsg=False):
#self.logfile = open('mklog.txt', "rbU")
 
204,7 → 207,6
self.getDebugMsgLn = msg.generateMsg()
 
 
def open(self, comPort):
self.serPort = serial.Serial(comPort, 57600, timeout=0.5)
if not self.serPort.isOpen():
239,6 → 241,13
pass
return msg
 
def sendNCRedirectUartFromFC(self):
self.serPort.flushInput()
msg = MkMsg(address=MkComm.ADDRESS_NC, cmd='u', data=[0])
self.sendLn(msg.generateMsg())
time.sleep(.5)
# No reply expected...
 
def getDebugMsg(self):
self.serPort.flushInput()
self.sendLn(self.getDebugMsgLn)
253,13 → 262,13
return msg
 
def setMotorTest(self, motorSpeeds):
msg = MkMsg(address=MkComm.FCADDRESS, cmd='t', data=motorSpeeds)
msg = MkMsg(address=MkComm.ADDRESS_FC, cmd='t', data=motorSpeeds)
self.sendLn(msg.generateMsg())
def doVibrationTest(self, nbSamples, channel):
data = []
for i in range(0,(min(nbSamples,1000)/50)):
msg = MkMsg(address=MkComm.FCADDRESS, cmd='f', data=[channel, i])
msg = MkMsg(address=MkComm.ADDRESS_FC, cmd='f', data=[channel, i])
self.sendLn(msg.generateMsg())
msg = self.waitForMsg('F')
msg = VibrationDataMsg(msg)