5.1+4.2 quality upgrade (#198)

* #184 Power in Rouvy issue

* #173 Version 4.0 Communicates Much Higher Power vs. 3.8

* #184 Power in Rouvy issue #2

* #184 Power in Rouvy issue #2

* #184 Power in Rouvy issue #3

* Fortius Antifier v4.2 test IV

* Fortius Antifier v5.1 test I

* Fortius Antifier v5.1 test II

* Fortius Antifier v5.1 test IIb

* #201

* #201

* Fortius Antifier v5.1 test III

* heart -> Heart2

* heart -> Heart2

* heart* -> heart.jpg

* Fortius Antifier v5.1 test IV

* Fortius Antifier v5.1 test V

* Fortius Antifier v5.1 test VI

* Fortius Antifier v5.1

.gitignore

@@ -10,3 +10,4 @@ Miscellaneous/
 node_modules
 package-lock.json
 pythoncode/help.txt
+!StartUp Json/FortiusAntSettings.json

StartUp Json/FortiusAnt (create json file).bat

@@ -0,0 +1,2 @@
+..\pythoncode\FortiusAnt.py
+pause

StartUp Json/FortiusAnt (use json file).bat

@@ -0,0 +1,2 @@
+..\pythoncode\FortiusAnt.py -a
+pause

StartUp Json/FortiusAntSettings.json

@@ -0,0 +1,40 @@
+{
+    "ant": {
+        "device ID": ""
+    },
+    "bluetooth": {
+        "enable": false
+    },
+    "general": {
+        "autostart": true,
+        "debug": "",
+        "export TCX-file": false,
+        "gui": false,
+        "hrm": ""
+    },
+    "simulation": {
+        "manual grade": false,
+        "manual power": false,
+        "resistance": false,
+        "simulate": false
+    },
+    "trainer": {
+        "auto calibrate": true,
+        "calibrate rolling resistance": "",
+        "factor": "100",
+        "grade factor": "100",
+        "grade factor downhill": "100",
+        "pedal stroke analysis": true,
+        "power mode": false,
+        "runoff": {
+            "dip": "2",
+            "max speed": "40",
+            "min speed": "1",
+            "power": "100",
+            "time": "7.0"
+        },
+        "transmission": "34-50*x34-30-27-25-23-21-19*-17-15-13-11",
+        "type": ""
+    },
+    "version": "1"
+}

StartUp/FortiusAnt (gui) d.bat

@@ -1,4 +1,4 @@
-del *.log *.json *.tcx
+del *.log FortiusAnt.*.json *.tcx
 rem No              = 0x00      # 0
 rem Application     = 0x01      # 1
 rem Function        = 0x02      # 2

StartUp/FortiusAnt (gui, Bushido, autostart).bat

@@ -1,3 +1,2 @@
-del *.log
 ..\pythoncode\FortiusAnt.py -a -g -H0 -t Bushido
 pause

StartUp/FortiusAnt (gui, Genius, autostart).bat

@@ -1,3 +1,2 @@
-del *.log
 ..\pythoncode\FortiusAnt.py -a -g -H0 -t Genius
 pause

StartUp/FortiusAnt (gui, i-Vortex, autostart).bat → StartUp/FortiusAnt (gui, Vortex, autostart).bat

@@ -1,3 +1,2 @@
-del *.log
 ..\pythoncode\FortiusAnt.py -a -g -H0 -t Vortex
 pause

StartUp/FortiusAnt (gui, autostart, BLE, d, s).bat

@@ -1,3 +1,3 @@
-del *.log *.json *.tcx
+del *.log FortiusAnt.*.json *.tcx
 ..\pythoncode\FortiusAnt.py -a -g -b -d64 -n -s
 pause

StartUp/FortiusAnt (gui, autostart, Rouvy).bat

@@ -0,0 +1,2 @@
+..\pythoncode\FortiusAnt.py -g -a -A -H0 -G50
+pause

StartUp/FortiusAnt (gui, autostart, json, tcx).bat

@@ -1,3 +1,3 @@
-del *.log *.json *.tcx
+del *.log FortiusAnt.*.json *.tcx
 ..\pythoncode\FortiusAnt.py -g -a -A -H0 -d32 -x
 pause

StartUp/FortiusAnt (gui, autostart, manual power, r).bat

@@ -1,3 +1,2 @@
-del *.log *.json *.tcx
-..\pythoncode\FortiusAnt.py -g -a -H0 -m -r -d127
+..\pythoncode\FortiusAnt.py -g -a -H0 -m -r
 pause

StartUp/FortiusAnt (gui, autostart, manual power, r, exe).bat

@@ -1,3 +1,2 @@
-del *.log *.json *.tcx
-..\WindowsExecutable\FortiusAnt.exe -g -a -H0 -m -r -d127
+..\WindowsExecutable\FortiusAnt.exe -g -a -H0 -m -r
 pause

StartUp/FortiusAnt (gui, autostart, simulate).bat

@@ -1,9 +1,2 @@
-del *.log
-rem No              = 0x00      # 0
-rem Application     = 0x01      # 1
-rem Function        = 0x02      # 2
-rem Data1           = 0x04      # 4			antDongle
-rem Data2           = 0x08      # 8			usbTrainer
-rem Multiprocessing = 0x10      # 16
 ..\pythoncode\FortiusAnt.py -g -a -A -s
 pause

StartUp/FortiusAnt (gui, autostart, simulate)==test ANT===.bat

@@ -1,4 +1,4 @@
-del FortiusANT*.log
+del FortiusANT.*.log
 rem No              = 0x00      # 0
 rem Application     = 0x01      # 1
 rem Function        = 0x02      # 2

StartUp/FortiusAnt (gui, autostart, simulate, manual grade, TCX).bat

@@ -0,0 +1,2 @@
+..\pythoncode\FortiusAnt.py -g -a -A -s -P -M -x
+pause

StartUp/FortiusAnt (gui, autostart, simulate, manual power, TCX).bat

@@ -1,3 +1,2 @@
-del *.log *.json *.tcx
-..\pythoncode\FortiusAnt.py -g -a -s -P -d32 -m -x
+..\pythoncode\FortiusAnt.py -g -a -s -P -m -x
 pause

StartUp/help.txt

@@ -1,41 +1,51 @@
 usage: FortiusAnt.py [-h] [-a] [-A] [-b] [-c CALIBRATERR] [-d DEBUG]
                      [-D ANTDEVICEID] [-g] [-G GRADEADJUST] [-H HRM] [-m] [-M]
-                     [-n] [-p FACTOR] [-P] [-r] [-R RUNOFF] [-s] [-t] [-x]
+                     [-n] [-p FACTOR] [-P] [-r] [-R RUNOFF] [-s]
+                     [-T TRANSMISSION] [-t] [-x]
 
 Program to broadcast data from USB Tacx Fortius trainer, and to receive
 resistance data for the trainer
 
 optional arguments:
   -h, --help            show this help message and exit
-  -a, --autostart       Automatically start
+  -a, --autostart       Automatically start; �Locate HW� and �Start� if the
+                        required devices were found.
   -A, --PedalStrokeAnalysis
-                        Pedal Stroke Analysis
-  -b, --ble             (EXPERIMENTAL) Use Bluetooth LE instead of ANT+
+                        Pedal Stroke Analysis.
+  -b, --ble             Advertise FortiusAnt as �FortiusAnt Trainer� on a
+                        Bluetooth Low Energy dongle.
   -c CALIBRATERR, --CalibrateRR CALIBRATERR
-                        calibrate Rolling Resistance for Magnetic Brake
+                        Calibrate the rolling resistance for magnetic brake.
   -d DEBUG, --debug DEBUG
-                        Show debugging data
+                        Create logfile with debugging data.
   -D ANTDEVICEID, --antDeviceID ANTDEVICEID
-                        Use this antDongle type only
-  -g, --gui             Run with graphical user interface
+                        Select one specific antDongle (perhaps with a non-
+                        standard deviceID).
+  -g, --gui             Run with graphical user interface.
   -G GRADEADJUST, --GradeAdjust GRADEADJUST
-                        Adjust slope% in GradeMode (factor/factorDownhill)
-  -H HRM, --hrm HRM     Pair this ANT+ Heart Rate Monitor (0: any, -1: none);
-                        Tacx HRM is used if not specified
-  -m, --manual          Run manual power (ignore target from ANT+ Dongle)
-  -M, --manualGrade     Run manual grade (ignore target from ANT+ Dongle)
-  -n, --calibrate       Do not calibrate before start
+                        Modify the requested grade with a
+                        factor/factorDownhill.
+  -H HRM, --hrm HRM     Pair this Heart Rate Monitor (0: any, -1: none). Tacx
+                        HRM is used if not specified.
+  -m, --manual          Run manual power (ignore target from ANT+ Dongle).
+  -M, --manualGrade     Run manual grade (ignore target from ANT+ Dongle).
+  -n, --calibrate       Do not calibrate before start.
   -p FACTOR, --factor FACTOR
                         Adjust target Power by multiplying by this factor for
-                        static calibration
+                        static calibration.
   -P, --PowerMode       Power mode has preference over Resistance mode (for 30
-                        seconds)
+                        seconds).
   -r, --Resistance      Target Resistance = Target Power (to create power
-                        curve)
+                        curve).
   -R RUNOFF, --Runoff RUNOFF
-                        maxSpeed/dip/minSpeed/targetTime/power
-  -s, --simulate        Simulated trainer to test ANT+ connectivity
-  -t , --TacxType       Specify Tacx Type; e.g. Vortex,
-                        default=autodetect.Allowed values are: Vortex, Genius,
-                        Bushido
-  -x, --exportTCX       Export TCX file
+                        The runoff procedure can be customized:
+                        maxSpeed/dip/minSpeed/targetTime/power.
+  -s, --simulate        Simulate trainer to test ANT+ connectivity.
+  -T TRANSMISSION, --Transmission TRANSMISSION
+                        Transmission, default value =
+                        34-50*x34-30-27-25-23-21-19*-17-15-13-11
+  -t , --TacxType       Specify Tacx Type; if not specified, USB-trainers will
+                        be detected automatically. Allowed values are:
+                        Bushido, Genius, Vortex, Magneticbrake, Motorbrake
+  -x, --exportTCX       Export TCX file to upload into Strava, Sporttracks,
+                        Training peaks.