54 usb trainer - release 3.0 beta

pythoncode/ExplorAnt.py

@@ -1,7 +1,9 @@
 #-------------------------------------------------------------------------------
 # Version info
 #-------------------------------------------------------------------------------
-__version__ = "2020-05-01"
+__version__ = "2020-05-07"
+# 2020-05-07    clsAntDongle encapsulates all functions
+#               and implements dongle recovery
 # 2020-05-01    Added: Vortex Headunit
 # 2020-04-22    Miscellaneous improvements for Tacx i-Vortex
 #               Versions displayed on console
@@ -39,9 +41,6 @@
 import ExplorAntCommand  as cmd
 import logfile
 import usbTrainer
-
-from  FortiusAntBody     import SimulateReceiveFromTrainer
-
 class clsDeviceID(object):
     def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, TransmissionType):
         self.Channel             = Channel
@@ -101,10 +100,10 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
 else:
     p = None            # Take the default
 
-devAntDongle, msg = ant.GetDongle(p)
-logfile.Console (msg)
+AntDongle = ant.clsAntDongle(p)
+logfile.Console (AntDongle.Message)
 
-if devAntDongle and not clv.SimulateTrainer:
+if AntDongle.OK and not clv.SimulateTrainer:
     #---------------------------------------------------------------------------
     # We are going to look what MASTER devices there are
     #---------------------------------------------------------------------------
@@ -113,15 +112,15 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
     #---------------------------------------------------------------------------
     # Initialize dongle
     #---------------------------------------------------------------------------
-    ant.Calibrate(devAntDongle)                          # calibrate ANT+ dongle
+    AntDongle.Calibrate()                          # calibrate ANT+ dongle
 
     #---------------------------------------------------------------------------
     # Create ANT+ slave channels for pairing to a master device (HRM, FE, ...)
     #
     # A channel with a wild-card is established when a master-device found.
     # After that moment, no other device will be seen on that channel.
     #
-    # If ant.SlaveHRM_ChannelConfig(devAntDongle, 0) is used, the first HRM will
+    # If ant.SlaveHRM_ChannelConfig(0) is used, the first HRM will
     # be found and not a list of HRM's.
     #
     # Therefore, open as many channels as devices you want to find.
@@ -139,15 +138,15 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
     for i in range(0, NrDevicesToPair):
         print (i, end=' ')
         if i == ant.channel_VTX_s:
-            ant.SlaveVTX_ChannelConfig(devAntDongle, 0)
+            AntDongle.SlaveVTX_ChannelConfig(0)
         elif i == ant.channel_VHU_s:
-            ant.SlaveVHU_ChannelConfig(devAntDongle, 0)
+            AntDongle.SlaveVHU_ChannelConfig(0)
         else:
             DeviceNumber    =0
             DeviceTypeID    =0
             TransmissionType=0
             if i % 1 == 1: DeviceTypeID &= 0x80
-            ant.SlavePair_ChannelConfig(devAntDongle, i, DeviceNumber, DeviceTypeID, TransmissionType)
+            AntDongle.SlavePair_ChannelConfig(i, DeviceNumber, DeviceTypeID, TransmissionType)
     print ('')
 
     deviceIDs = []
@@ -166,15 +165,15 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
         messages = []
         for i in range(0, NrDevicesToPair):
             messages.append (ant.msg4D_RequestMessage(i, ant.msgID_ChannelID) )
-        ant.SendToDongle(messages, devAntDongle, '', False, False)
+        AntDongle.Write(messages, False, False)
 
         print ('Wait for responses from channel what device is paired: ', end='')
         while RunningSwitch == True and pairingCounter > 0:
             StartTime = time.time()
             #-------------------------------------------------------------------
             # Receive response from channels
             #-------------------------------------------------------------------
-            data = ant.ReadFromDongle(devAntDongle, False)
+            data = AntDongle.Read(False)
 
             #-------------------------------------------------------------------
             # Only handle ChannelID messages and ignore everyting else
@@ -239,8 +238,8 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
                     deviceID = clsDeviceID(Channel, DeviceType, DeviceNumber, DeviceTypeID, TransmissionType)
                     # print (Channel, end=' ')
                     if DeviceNumber == 0:      # No device paired, request again
-                        ant.SendToDongle([ant.msg4D_RequestMessage(Channel, ant.msgID_ChannelID)], \
-                                        devAntDongle, '', False, False)
+                        AntDongle.Write([ant.msg4D_RequestMessage(Channel, ant.msgID_ChannelID)], \
+                                        False, False)
                         pass
                     else:
                         d = deviceID
@@ -257,7 +256,7 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
                             #---------------------------------------------------
                             info = ant.msgPage70_RequestDataPage(Channel, ant.DeviceNumber_EA, 255, 255, 1, 70, 0)
                             d    = ant.ComposeMessage (ant.msgID_AcknowledgedData, info)
-                            ant.SendToDongle([d], devAntDongle, '', False)
+                            AntDongle.Write([d], False)
                         else:
                             print('*', end=' ')
                             logfile.Write('ExplorANT: already in list')
@@ -303,10 +302,10 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
     for i in range(0, NrDevicesToPair):
         messages.append ( ant.msg41_UnassignChannel(i) )    # Does not have much effect
         pass
-    ant.SendToDongle(messages, devAntDongle)
-    ant.ResetDongle (devAntDongle)                          # This one does the job
+    AntDongle.Write(messages)
+    AntDongle.ResetDongle ()                          # This one does the job
 
-if devAntDongle:
+while AntDongle.OK:
     #---------------------------------------------------------------------------
     # If any channel specified and/or found: Open the device channels & listen.
     #---------------------------------------------------------------------------
@@ -316,7 +315,7 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
         # ----------------------------------------------------------------------
         # Calibrate ANT+ dongle (because reset was done!)
         # ----------------------------------------------------------------------
-        ant.Calibrate(devAntDongle)
+        AntDongle.Calibrate()
 
         # ----------------------------------------------------------------------
         # Open channels
@@ -329,33 +328,33 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
 
             if clv.hrm >= 0:
                 hrm.Initialize()
-                ant.HRM_ChannelConfig(devAntDongle)
+                AntDongle.HRM_ChannelConfig()
                 logfile.Console ('HRM master channel %s opened; device %s (act as an HRM)' % (ant.channel_HRM, ant.DeviceNumber_HRM))
 
             if clv.fe  >= 0:
                 fe.Initialize()
-                ant.Trainer_ChannelConfig(devAntDongle)
+                AntDongle.Trainer_ChannelConfig()
                 logfile.Console ('FE  master channel %s opened; device %s (act as a Tacx Trainer)' % (ant.channel_FE, ant.DeviceNumber_FE))
 
             if clv.vtx >= 0:
-                ant.VTX_ChannelConfig(devAntDongle)
+                AntDongle.VTX_ChannelConfig()
                 logfile.Console ('VTX master channel %s opened; device %s (act as a Tacx -Vortex)' % (ant.channel_VTX, ant.DeviceNumber_VTX))
 
         else:
             if clv.hrm > 0:
-                ant.SlaveHRM_ChannelConfig(devAntDongle, clv.hrm)
+                AntDongle.SlaveHRM_ChannelConfig(clv.hrm)
                 logfile.Console ('HRM slave channel %s opened; listening to master device %s' % (ant.channel_HRM_s, clv.hrm))
 
             if clv.fe  > 0:
-                ant.SlaveTrainer_ChannelConfig(devAntDongle, clv.fe)
+                AntDongle.SlaveTrainer_ChannelConfig(clv.fe)
                 logfile.Console ('FE  slave channel %s opened; listening to master device %s' % (ant.channel_FE_s,  clv.fe))
 
             if clv.vtx > 0:
-                ant.SlaveVTX_ChannelConfig(devAntDongle, clv.vtx)
+                AntDongle.SlaveVTX_ChannelConfig(clv.vtx)
                 logfile.Console ('VTX slave channel %s opened; listening to master device %s' % (ant.channel_VTX_s, 0))
 
             if clv.vhu > 0:
-                ant.SlaveVHU_ChannelConfig(devAntDongle, clv.vhu)
+                AntDongle.SlaveVHU_ChannelConfig(clv.vhu)
                 logfile.Console ('VHU slave channel %s opened; listening to master device %s' % (ant.channel_VHU_s, 0))
 
         # ----------------------------------------------------------------------
@@ -400,25 +399,26 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
 
             EventCounter        = 0
 
-            while RunningSwitch == True:
+            while RunningSwitch == True and not AntDongle.DongleReconnected:
                 StartTime = time.time()
                 #---------------------------------------------------------------
                 # Simulate HRM, FE-S, VTX (master device, broadcasting data)
                 #---------------------------------------------------------------
                 messages     = []
 
                 if clv.SimulateTrainer:
-                    if True:
-                        SpeedKmh, PedalEcho, HeartRate, CurrentPower, Cadence, Resistance, CurrentResistance, Buttons, Axis = \
-                            SimulateReceiveFromTrainer (TargetPower, CurrentPower)
+                    if False:
+                        raise NotImplementedError
+                        # SpeedKmh, PedalEcho, HeartRate, CurrentPower, Cadence, Resistance, CurrentResistance, Buttons, Axis = \
+                        #     SimulateReceiveFromTrainer (TargetPower, CurrentPower)
                     else:
                         Cadence, CurrentPower, SpeedKmh, HeartRate = 98, 234, 35.6, 123     # Always the same, ennoying but predictable
 
                     if clv.hrm >= 0:
-                        messages.append(hrm.BroadcastHeartrateMessage (devAntDongle, HeartRate))
+                        messages.append(hrm.BroadcastHeartrateMessage (HeartRate))
 
                     if clv.fe >= 0:
-                        messages.append(fe.BroadcastTrainerDataMessage(devAntDongle, Cadence, CurrentPower, SpeedKmh, HeartRate))
+                        messages.append(fe.BroadcastTrainerDataMessage(Cadence, CurrentPower, SpeedKmh, HeartRate))
 
                     if clv.vtx >= 0:
                         EventCounter += 1
@@ -435,9 +435,9 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
                 # Receive data
                 #---------------------------------------------------------------
                 if clv.SimulateTrainer and len(messages) > 0:
-                    data = ant.SendToDongle(messages, devAntDongle, '', True, False)
+                    data = AntDongle.Write(messages, True, False)
                 else:
-                    data = ant.ReadFromDongle(devAntDongle, False)
+                    data = AntDongle.Read( False)
 
                 #---------------------------------------------------------------
                 # Simulate vortex data, just to test the loop
@@ -674,7 +674,7 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
                                     while (NrTimes):
                                         data.append(d)
                                         NrTimes -= 1
-                                    ant.SendToDongle(data, devAntDongle, comment, False)
+                                    AntDongle.Write(data, False)
 
                             #-------------------------------------------------------
                             # Other data pages
@@ -722,7 +722,7 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
                     logfile.Console('ExplorANT: Set Tacx Vortex power %s' % Power)
                     info = ant.msgPage16_TacxVortexSetPower (ant.channel_VTX_s, VTX_VortexID, Power)
                     msg  = ant.ComposeMessage (ant.msgID_BroadcastData, info)
-                    ant.SendToDongle([msg], devAntDongle, '', False)
+                    AntDongle.Write([msg], False)
 
         except KeyboardInterrupt:
             logfile.Console ("Listening stopped")
@@ -734,10 +734,17 @@ def __init__(self, Channel, DeviceType, DeviceNumber, DeviceTypeID, Transmission
         messages = []
         if clv.hrm > 0: messages.append ( ant.msg41_UnassignChannel(ant.channel_HRM_s) )
         if clv.fe  > 0: messages.append ( ant.msg41_UnassignChannel(ant.channel_FE_s ) )
-        ant.SendToDongle(messages, devAntDongle)
+        AntDongle.Write(messages)
         #---------------------------------------------------------------
         # Release dongle
-        #---------------------------------------------------------------
-        ant.ResetDongle (devAntDongle)
+        #-----------------------------------------------------------------------
+        AntDongle.ResetDongle ()
+    #---------------------------------------------------------------------------
+    # Quit "while AntDongle.OK"
+    #---------------------------------------------------------------------------
+    if AntDongle.DongleReconnected:
+        AntDongle.ApplicationRestart()
+    else:
+        break
 logfile.Console ("We're done")
 logfile.Console ("--------------------")

pythoncode/antFE.py

@@ -2,6 +2,7 @@
 # Version info
 #-------------------------------------------------------------------------------
 __version__ = "2020-05-07"
+# 2020-05-07    devAntDongle not needed, not used
 # 2020-05-07    pylint error free
 # 2020-02-18    First version, split-off from FortiusAnt.py
 #-------------------------------------------------------------------------------
@@ -28,7 +29,7 @@ def Initialize():
 #
 # Returns:      fedata; next message to be broadcasted on ANT+ channel
 # ------------------------------------------------------------------------------
-def BroadcastTrainerDataMessage (devAntDongle, Cadence, CurrentPower, SpeedKmh, HeartRate):
+def BroadcastTrainerDataMessage (Cadence, CurrentPower, SpeedKmh, HeartRate):
     global EventCounter, AccumulatedPower, AccumulatedTimeCounter, DistanceTravelled, AccumulatedLastTime
     #---------------------------------------------------------------------------
     # Prepare data to be sent to ANT+
@@ -106,5 +107,5 @@ def BroadcastTrainerDataMessage (devAntDongle, Cadence, CurrentPower, SpeedKmh,
 #-------------------------------------------------------------------------------
 if __name__ == "__main__":
     Initialize()
-    fedata = BroadcastTrainerDataMessage (-1, 98, 234, 35.6, 123)
+    fedata = BroadcastTrainerDataMessage (98, 234, 35.6, 123)
     print (fedata)

pythoncode/antHRM.py

@@ -2,6 +2,7 @@
 # Version info
 #-------------------------------------------------------------------------------
 __version__ = "2020-05-07"
+# 2020-05-07    devAntDongle not needed, not used
 # 2020-05-07    pylint error free
 # 2020-02-18    First version, split-off from FortiusAnt.py
 #-------------------------------------------------------------------------------
@@ -17,7 +18,7 @@ def Initialize():
     PageChangeToggle    = 0
 
 
-def BroadcastHeartrateMessage (devAntDongle, HeartRate):
+def BroadcastHeartrateMessage (HeartRate):
     global EventCounter, HeartBeatCounter, HeartBeatEventTime, HeartBeatTime, PageChangeToggle
     #---------------------------------------------------------------------------
     # Check if heart beat has occurred as tacx only reports
@@ -87,5 +88,5 @@ def BroadcastHeartrateMessage (devAntDongle, HeartRate):
 #-------------------------------------------------------------------------------
 if __name__ == "__main__":
     Initialize()
-    fedata = BroadcastHeartrateMessage (-1, 123)
+    fedata = BroadcastHeartrateMessage (123)
     print (fedata)