Commit Graph

64 Commits

Author SHA1 Message Date
Mark Liversedge
de85a0c6c1 Merge pull request #1638 from dresco/ANT-FEC
ANT FE-C
2015-11-07 20:25:43 +00:00
Mark Liversedge
b0fa5652d7 Merge pull request #1626 from vlcvboyer/adjust_trig
adjust ANT null rpm trigger values
2015-11-07 20:25:26 +00:00
Jon Escombe
e5b0ed436f ANT: Avoid race condition when pairing
setChannelID() could be called with a null device_id. This may
result in pairing with an unexpected channel type if more than
one channel is available from that device_number.
2015-11-07 18:59:07 +00:00
Vianney Boyer
c4008ebc92 adjust ANT null rpm trigger values 2015-11-06 11:03:28 +01:00
Jon Escombe
bae3938067 ANT FE-C Detect capabilities on initial connection 2015-11-05 18:13:18 +00:00
Jon Escombe
17db223b8a ANT FE-C Add periodic refresh of gradient in slope mode
As per the refresh in ergo mode, this is a workaround for
missing acknowledgements.
2015-11-05 13:20:41 +00:00
Vianney Boyer
f2d175f333 consider that after 15s inactivity speed and cadence are 0 2015-11-01 22:12:21 +01:00
Vianney Boyer
6171046893 we need 2 different variables when using speed an dcadence dual sensor 2015-11-01 22:11:47 +01:00
Vianney Boyer
da6392e4ba fix ANT speed and cadence: value was still at last computed value 2015-11-01 22:10:48 +01:00
Mark Liversedge
c835cbf370 Merge pull request #1541 from vlcvboyer/cosmetic-comment
[cosmetic-minor] change inaccurate comment
2015-11-01 20:55:04 +00:00
Jon Escombe
3650efa578 Add alternate power support for ANT FE-C devices 2015-11-01 15:39:53 +00:00
Jon Escombe
f0e52579d1 Invalid ANT FE-C power indicated by 0xFFF not 0xFFFF 2015-11-01 15:39:01 +00:00
Vianney Boyer
9e98b8f57e do not send SetPower request when not using ERGO mode 2015-08-30 14:38:06 +02:00
Vianney Boyer
243f062434 [cosmetic] change wrong comment 2015-08-27 22:21:48 +02:00
Vianney Boyer
0c642ba90d remove needless code after tests 2015-08-22 21:11:17 +02:00
Vianney Boyer
3ddf91a16a antfec - send Gradient update to device depending on pgmf 2015-08-22 15:32:03 +02:00
Vianney Boyer
9d94510753 WIP - ANT FE-C extension (grade, wind, ack...) 2015-08-22 01:24:36 +02:00
Vianney Boyer
8b86987a1f Basic ANT FE-C support (stschake contrib) 2015-08-21 10:36:47 +02:00
Claus Assmann
1d5755443d Fix comment typos 2015-06-07 16:31:56 +01:00
Jon Escombe
d45d7efec8 ANT: Opening incorrect device
Train view can display invalid data after opening the
wrong ANT sensor.
2015-02-19 15:19:53 +00:00
Mark Liversedge
522447f4db Merge pull request #1245 from stschake/tacxvortex-refresh-load
Periodically refresh Tacx Vortex load setpoint to avoid dropouts
2015-02-02 16:39:29 +00:00
Damien
be567c85db ANT: Priority for cadence from cadence or speed/cadence sensor
fixes #502
2015-01-23 23:36:40 +01:00
Stefan Schake
59ffa7b8f1 Periodically refresh Tacx Vortex load setpoint to avoid dropouts
Signed-off-by: Stefan Schake <schake@embedded.rwth-aachen.de>
2015-01-13 21:21:14 +01:00
Joern
c8535d9706 Train View - add TE/PS/LR Balance - Real Time Metrics
... Torque Effectiveness
... Pedal Smoothness
... L/R Balance
(mainly for Vector - but implemented following standard ANT+ message
rules
2015-01-05 13:39:18 +01:00
Stefan Schake
0df233ad58 Integrate Tacx Vortex with ANT device logic
Signed-off-by: Stefan Schake <schake@embedded.rwth-aachen.de>
2014-12-30 03:55:53 +01:00
Stefan Schake
8c3f12a50d Add Tacx Vortex ANT message decoding/encoding
Signed-off-by: Stefan Schake <schake@embedded.rwth-aachen.de>
2014-12-30 03:55:51 +01:00
Claus Assmann
a001ffef4f Fix comment spelling errors
.. lots of them !
2014-11-24 15:37:56 +00:00
Mark Liversedge
cbf20ce5fc Deprecate kickr command channel
.. Wahoo don't do that anymore.

.. now use the same channel as the device and just send plain old
   ANT+ messages to set slope etc (why they didn't do that in the
   first place is absolutely beyond me)

.. getting ready to implement Kickr for the THIRD time !!!
2014-11-21 14:58:14 +00:00
Mark Liversedge
bb00268770 Realtime Moxy Part 2a of 3
.. telemetry is plotted in dialwindow

.. need to do a part b which is the realtime plot
   of thb, smo2, o2hb and hhb to complete part 2
2014-10-31 22:26:02 +00:00
Mark Liversedge
3dd2f2e99b Realtime Moxy Part 1 of 3
.. added config and page decoding for Moxy

Next steps are (2) add telemetry to realtime data structure
                   and display on the realtime chart and telemetry

               (3) add SmO2 and tHb to file format which means moving
                   away from powertap csv format (!)
2014-10-31 21:15:06 +00:00
Mark Liversedge
ff20fd527f Placeholder for Moxy SandC cuckoo
.. the Moxy can be configured as a SandC sensor, so in
   readiness for ANT+ support in GC just adding code to
   spot it.

.. will also need to update this for when it is paired
   as a muscle oxygen monitor

.. will need to add SmO2 and tHb realtime data telemetry

.. will also need to add code to device config to notify
   when SandC is spotted as a moxy
2014-10-23 19:02:45 +01:00
Mark Liversedge
008506cc67 Less qDebug on ANT+
.. it seems to be working ok

.. it provides too much output, even for debugging purposes

.. it isn't relavent for 99% of users now its in the master
   repository and being compiled up and used
2014-08-23 12:49:03 +01:00
Jon Escombe
5b3ff1aaea Fix for cadence only sensor
Was not detecting that pedalling had stopped, therefore the previous
cadence rate was displayed indefinitely.
2014-08-22 14:13:33 +01:00
Mark Liversedge
aa7152e303 KICKR ANT+ Initial Support
.. the code has been updated to support the Wahoo Kickr
   via an ANT+ USB stick.

.. this requires the Kickr to be running a beta firmware
   of version v1.3.15. This can only be loaded via the
   Wahoo utility.

.. for those that have access to the beta firmware this
   patch will work, for all others they will need to wait
   for the formal release by Wahoo.

.. the code contains *lots* of debug and does not yet support
   calibration and slope mode is largely untested.
2014-08-18 09:46:04 +01:00
Mark Liversedge
985b27edaf Kickr Constants 2014-07-16 10:24:42 +01:00
Mark Liversedge
5f3e1f3149 Distinguish Kickr ANT+ Power Device
.. just set a bool on the channel, but will need to setup
   a separate channel for commands in executive classes
2014-07-15 19:46:52 +01:00
Mark Liversedge
0f62d66faf Add rrData signal in ANT and Robot
.. to help development of an experimental HRV tool.
2014-01-29 10:30:22 +00:00
Jon Escombe
6c21c87a42 Don't reset ANT channel settings on search timeout
Wiping out these settings prevents a successful reconnection
of the device if it comes back into range

Fixes #514
2013-12-02 23:27:01 +00:00
Mark Liversedge
2023547bf7 Documentation: Makeinfo compatibility
.. only use the @input macro if we're not running info -- we only do that
   to get nice fonts in printed output anyway.
2013-05-14 10:00:00 +01:00
Mark Liversedge
caec4ee0fe Code Cleanup: Remove #if 0 code
As a personal habit I tend to use the C pre-processor to
comment out code blocks I don't want to remove. This is in
case the code will be required in the future.

I think it is now safe to say the code commented out is not
required -- most of it is legacy and marks the transition from
earlier designs or legacy code.

I've done this in one big commit since in theory it has no
functional change, and in future can look in this commit for any
code we may want to reinstate.
2013-02-11 15:00:00 +00:00
Mark Liversedge
e9cabc116f Code Cleaning: ANT+ sources
Removing and fixing 'XXX' code markers across the ANT+
code. Largely this was to confirm against specs and mark
for future support (e.g. burst data, further refactoring
of the quarqd sources).
2013-02-07 12:20:40 +00:00
Mark Liversedge
f527d8e5c2 Fix compiler warnings
All are harmless but for the sake of clarity have
fixed them all bar a couple;

- Lucene grumbles about signed/unsigned conversion which
  is/isn't valid depending upon the version of CLucene you
  compile with. Either way it is harmless.

- QxtScheduleView has a bunch of issues, but since it is a
  third party widget its better to leave it unchanged.
2013-02-06 15:54:32 +00:00
Damien
fca4c27d2c Remove some warnings 2012-12-15 17:18:44 +01:00
Andrew Bryson
b746f86ee0 Allow more duplicate messgaes in standard mode
This should fix the current issue with Power2Max.
2012-02-12 17:41:24 +00:00
Andrew Bryson
cb497c7dbc Initialise stdNullCount 2012-02-05 19:36:19 +00:00
Andrew Bryson
04d718a76d Fix power blips from Standard Power with Quarq
Added a check to insure that we don't display the same power event more
than once.

Fixes Bug #635
2012-02-05 13:05:41 +00:00
Mark Liversedge
e9c75443d2 ANTChannel Standard Power bug
Andy Bryson's fixes for quarq power spikes removed
processing of standard power messages (see commit
cc0bd29).

This was because a check was performed on ANTMessage::period
which is not set for Standard power messages and will always
be zero.

This may fix processing of power2max power telemetry.
2012-02-02 07:11:45 +00:00
Andrew Bryson
51a6b3ffd2 Fix quarq power and cadence glitches when coasting
ANT+ telemetry data processing in ANTChannel now
checks for previous message period values.

Fixes #607.

[Tested by author on Quarq cranks, error not recreated
 on SRM or Powertap devices, but may be Quarq specific]
2012-01-21 20:54:19 +00:00
Mark Liversedge
3ca7f1a5d2 Add Device Wizard
Introduce a wizard for adding realtime devices since it
is prone to user error, is relatively complicated and is
something most users will only ever do once or twice.

There are several logical updates within this patch:

First; Fix intermittent ANT+ not working
* LibUsb     - check bufRemaining is > 0 not non-zero
* LibUsb     - Always reset the USB stick on open
* ANT.cpp    - Support > 4 channels on USB2
* ANTChannel -  Do not use pairing, but always
*               unassign, assign and set channel id.

Second; Fix device discovery
* Find and discover support in realtime controllers
* Extend Serial.cpp to cover more Serial devices
* Support for 4 or 8 ANT channels for USB1/USB2

Third; Introduce Add Device Wizard with
* General and Specific wizard pages for each device type
* Device pairing with telemetry display
* fixed compile time warnings

Fourth; Update Device Config Page
* use wizard to add new device
* remove edit fields, replaced by wizard
* remove pair, firmware buttons replaced by wizard

Fifth; Deprecate/Remove Device Types
* Null Device - used by developers only
* Quarqd client - replaced by Native ANT+
* GC Server - not implemented yet

I have also introduced a device specific wheel size
and flags for controlling the default selection and
sources for sensor data when in multi-device mode. These
are not yet supported in the code.

Fixes #611.
Fixes #497.
2012-01-21 20:28:33 +00:00
Mark Liversedge
01a6e85363 ANT+ Use Cadence from Standard Power Messages
Standard power messages include an instant cadence
value which we ignored. We should use this if it is
available.

Fixes previous attempt by setting Cadence rather than
wheelRPM with the instant cadence value (!)

Fixes #556.
2012-01-14 15:48:41 +00:00