nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Device Wizard

Browse Source 
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.
This commit is contained in:
Mark Liversedge
2012-01-16 22:29:49 +00:00
parent 3863b7f0a2
commit 3ca7f1a5d2
39 changed files with 1633 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/DeviceTypes.cpp
View File

@@ -29,21 +29,43 @@
static DeviceType SupportedDevices[] =
{
#ifdef Q_OS_WIN32
{ DEV_ANTLOCAL, DEV_USB, (char *) "Native ANT+", true, false },
{ DEV_ANTLOCAL, DEV_USB, (char *) "Native ANT+", true, false,
"ANT+ devices such as SRM, Powertap or Quarq power meters, Heart rate belts, "
"speed or cadence meters via a Garmin ANT+ USB1 or USB2 stick",
":images/devices/garminusb.png" },
#else
{ DEV_ANTLOCAL, DEV_SERIAL, (char *) "Native ANT+", true, false },
{ DEV_ANTLOCAL, DEV_SERIAL, (char *) "Native ANT+", true, false,
"ANT+ devices such as SRM, Powertap or Quarq power meters, Heart rate belts, "
"speed or cadence meters via a Garmin ANT+ USB1 or USB2 stick" ,
":images/devices/garminusb.png" },
#endif
{ DEV_CT, DEV_SERIAL, (char *) "Racermate Computrainer",true, false },
{ DEV_CT, DEV_SERIAL, (char *) "Racermate Computrainer",true, false,
"Racermate Computrainer Lab or Pro bike trainer with the handlebar controller "
"connected via a USB adaptor or directly connected to a local serial port." ,
":images/devices/computrainer.png" },
#ifdef GC_HAVE_LIBUSB
{ DEV_FORTIUS, DEV_LIBUSB, (char *) "Tacx Fortius", true, false },
{ DEV_FORTIUS, DEV_LIBUSB, (char *) "Tacx Fortius", true, false,
"Tacx Fortius/iMagic bike trainer with the handlebar controller connected "
"to a USB port. Please make sure you have device firmware to hand." ,
":images/devices/fortius.png" },
#endif
{ DEV_GSERVER, DEV_TCP, (char *) "Golden Cheetah Server", false, false },
{ DEV_NULL, DEV_TCP, (char *) "Null device (testing)", false, false },
{ DEV_ANTPLUS, DEV_QUARQ, (char *) "ANT+ via Quarqd", true, false },
#if 0
{ DEV_GSERVER, DEV_TCP, (char *) "Golden Cheetah Server", false, false,
"Golden Cheetah racing server, not curently supported." },
{ DEV_NULL, DEV_TCP, (char *) "Null device (testing)", false, false,
"Testing device used for development only." }.
#endif
#if 0 // deprecated, but keeping code until at least 3.1
{ DEV_ANTPLUS, DEV_QUARQ, (char *) "ANT+ via Quarqd", true, false,
"ANT+ devices such as SRM, Powertap or Quarq power meters, Heart rate belts, "
"speed or cadence meters via an existing Quarqd server" ,
":images/devices/quarqd.png" },
#endif
// { DEV_PT, DEV_SERIAL, (char *) "Powertap Head Unit", false, true },
// { DEV_SRM, DEV_SERIAL, (char *) "SRM PowerControl V/VI", false, true },
// { DEV_GCLIENT, DEV_TCP, (char *) "Golden Cheetah Client", false, false },
{ 0, 0, NULL, 0, 0 }
{ 0, 0, NULL, 0, 0, "", "" }
};
DeviceTypes::DeviceTypes()