From 81c94313d736fcd86b2849862bd4288534fd97f0 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Tue, 11 Jun 2019 21:49:00 -0700 Subject: [PATCH 1/2] Convert all tabs to spaces Repo uses 4 space indentation, even in 2019 indentation conversion is still hard :P thank you sublime text for saving us. --- examples/LEVDisplay/LEVDisplay.ino | 210 +++++++++--------- src/Profiles/LEV/ANTPLUS_LevPrivateDefines.h | 2 +- src/Profiles/LEV/ANTPLUS_LevProfile.h | 2 +- .../Base/ANTPLUS_LevBaseMainDataPage.h | 2 +- .../DataPages/RX/ANTPLUS_LevBatteryInfo.cpp | 12 +- .../DataPages/RX/ANTPLUS_LevCapabilities.cpp | 6 +- .../ANTPLUS_LevSpeedDistanceInformation.cpp | 16 +- .../RX/ANTPLUS_LevSpeedDistanceInformation.h | 10 +- .../RX/ANTPLUS_LevSpeedSystemInformation1.cpp | 14 +- .../RX/ANTPLUS_LevSpeedSystemInformation2.cpp | 14 +- .../LEV/Display/ANTPLUS_ProfileLevDisplay.cpp | 112 +++++----- .../LEV/Display/ANTPLUS_ProfileLevDisplay.h | 52 ++--- 12 files changed, 226 insertions(+), 226 deletions(-) diff --git a/examples/LEVDisplay/LEVDisplay.ino b/examples/LEVDisplay/LEVDisplay.ino index 016818e..cff756b 100644 --- a/examples/LEVDisplay/LEVDisplay.ino +++ b/examples/LEVDisplay/LEVDisplay.ino @@ -47,24 +47,24 @@ void setup() { Serial.begin(BAUD_RATE); Serial.println("Running"); - // setup lev display + // setup lev display lev.onDataPage(levBaseDataPageHandler); - lev.onLevSpeedSystemInformation1(levSpeedSystemInformation1Handler); - lev.onLevSpeedDistanceInformation(levSpeedDistanceInformationHandler); - lev.onLevAltSpeedDistanceInformation(levAltSpeedDistanceInformationHandler); - lev.onLevSpeedSystemInformation2(levSpeedSystemInformation2Handler); - lev.onLevBatteryInfo(levBatteryInfo); - lev.onLevCapabilities(levCapabilities); - lev.onManufacturersInformation(manufacturersInformationDataPageHandler); - lev.onProductInformation(productInformationDataPageHandler); - lev.onChannelEvent(levAntChannelEvent); - lev.begin(); - delay(100); // wait for module initialization + lev.onLevSpeedSystemInformation1(levSpeedSystemInformation1Handler); + lev.onLevSpeedDistanceInformation(levSpeedDistanceInformationHandler); + lev.onLevAltSpeedDistanceInformation(levAltSpeedDistanceInformationHandler); + lev.onLevSpeedSystemInformation2(levSpeedSystemInformation2Handler); + lev.onLevBatteryInfo(levBatteryInfo); + lev.onLevCapabilities(levCapabilities); + lev.onManufacturersInformation(manufacturersInformationDataPageHandler); + lev.onProductInformation(productInformationDataPageHandler); + lev.onChannelEvent(levAntChannelEvent); + lev.begin(); + delay(100); // wait for module initialization // wait for pair to complete uint8_t status = lev.waitForPair(); - // print channel status + // print channel status Serial.println("==========================="); printStatus(status); Serial.print("Device Number: "); @@ -78,130 +78,130 @@ void loop() { } void levAntChannelEvent(ChannelEventResponse& msg, uintptr_t data) { - if (msg.getCode() == STATUS_EVENT_CHANNEL_CLOSED) { - Serial.println("channel closed - reconnect"); - lev.begin(); - } + if (msg.getCode() == STATUS_EVENT_CHANNEL_CLOSED) { + Serial.println("channel closed - reconnect"); + lev.begin(); + } } void levBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data) { - LevBaseMainDataPage dp = LevBaseMainDataPage(msg); + LevBaseMainDataPage dp = LevBaseMainDataPage(msg); Serial.println("==========================="); Serial.print("DataPage: "); Serial.println(dp.getDataPageNumber()); } void levSpeedSystemInformation1Handler(LevSpeedSystemInformation1& msg, uintptr_t data) { - Serial.print("Temp state: "); - Serial.println(msg.getTemperatureState()); - Serial.print("Travel mode state: "); - Serial.println(msg.getTravelModeState()); - Serial.print("System state: "); - Serial.println(msg.getSystemState()); - Serial.print("Gear state: "); - Serial.println(msg.getGearState()); - Serial.print("Gear error: "); - Serial.println(msg.getError()); - Serial.print("Speed: "); - Serial.print(msg.getSpeed()/10); - Serial.print("."); - Serial.println(msg.getSpeed() % 10); + Serial.print("Temp state: "); + Serial.println(msg.getTemperatureState()); + Serial.print("Travel mode state: "); + Serial.println(msg.getTravelModeState()); + Serial.print("System state: "); + Serial.println(msg.getSystemState()); + Serial.print("Gear state: "); + Serial.println(msg.getGearState()); + Serial.print("Gear error: "); + Serial.println(msg.getError()); + Serial.print("Speed: "); + Serial.print(msg.getSpeed()/10); + Serial.print("."); + Serial.println(msg.getSpeed() % 10); } void levSpeedDistanceInformationHandler(LevSpeedDistanceInformation& msg, uintptr_t data) { - Serial.print("Total dist: "); - Serial.println((float)msg.getOdometer() / 100); - Serial.print("Remaining range: "); - Serial.println(msg.getRemainingRange()); - Serial.print("Speed: "); - Serial.print(msg.getSpeed() / 10); - Serial.print("."); - Serial.println(msg.getSpeed() % 10); + Serial.print("Total dist: "); + Serial.println((float)msg.getOdometer() / 100); + Serial.print("Remaining range: "); + Serial.println(msg.getRemainingRange()); + Serial.print("Speed: "); + Serial.print(msg.getSpeed() / 10); + Serial.print("."); + Serial.println(msg.getSpeed() % 10); } void levAltSpeedDistanceInformationHandler(LevAltSpeedDistanceInformation& msg, uintptr_t data) { - Serial.print("Total dist: "); - Serial.println((float)msg.getOdometer() / 100); - Serial.print("Fuel consumption: "); - Serial.println(msg.getFuelConsumption()); - Serial.print("Speed: "); - Serial.print(msg.getSpeed() / 10); - Serial.print("."); - Serial.println(msg.getSpeed() % 10); + Serial.print("Total dist: "); + Serial.println((float)msg.getOdometer() / 100); + Serial.print("Fuel consumption: "); + Serial.println(msg.getFuelConsumption()); + Serial.print("Speed: "); + Serial.print(msg.getSpeed() / 10); + Serial.print("."); + Serial.println(msg.getSpeed() % 10); } void levSpeedSystemInformation2Handler(LevSpeedSystemInformation2& msg, uintptr_t data) { - Serial.print("Battery SOC: "); - Serial.println(msg.getBatterySOC()); - Serial.print("Travel mode state: "); - Serial.println(msg.getTravelModeState()); - Serial.print("System state: "); - Serial.println(msg.getSystemState()); - Serial.print("Gear state: "); - Serial.println(msg.getGearState()); - Serial.print("Percent Assist: "); - Serial.println(msg.getPercentAssist()); - Serial.print("Speed: "); - Serial.print(msg.getSpeed() / 10); - Serial.print("."); - Serial.println(msg.getSpeed() % 10); + Serial.print("Battery SOC: "); + Serial.println(msg.getBatterySOC()); + Serial.print("Travel mode state: "); + Serial.println(msg.getTravelModeState()); + Serial.print("System state: "); + Serial.println(msg.getSystemState()); + Serial.print("Gear state: "); + Serial.println(msg.getGearState()); + Serial.print("Percent Assist: "); + Serial.println(msg.getPercentAssist()); + Serial.print("Speed: "); + Serial.print(msg.getSpeed() / 10); + Serial.print("."); + Serial.println(msg.getSpeed() % 10); } void levBatteryInfo(LevBatteryInfo& msg, uintptr_t data) { - Serial.print("Charging Cycle Count: "); - Serial.println(msg.getChargingCycleCount()); - Serial.print("Fuel consumption: "); - Serial.println(msg.getFuelConsumption()); - Serial.print("Battery voltage: "); - Serial.println(msg.getBatteryVoltage()); - Serial.print("Distance on current charge: "); - Serial.println(msg.getDistanceOnCurrentCharge()); + Serial.print("Charging Cycle Count: "); + Serial.println(msg.getChargingCycleCount()); + Serial.print("Fuel consumption: "); + Serial.println(msg.getFuelConsumption()); + Serial.print("Battery voltage: "); + Serial.println(msg.getBatteryVoltage()); + Serial.print("Distance on current charge: "); + Serial.println(msg.getDistanceOnCurrentCharge()); } void levCapabilities(LevCapabilities& msg, uintptr_t data) { - Serial.print("Travel modes supported: "); - Serial.println(msg.getTravelModesSupported()); - Serial.print("Wheel circumference: "); - Serial.println(msg.getWheelCircumference()); + Serial.print("Travel modes supported: "); + Serial.println(msg.getTravelModesSupported()); + Serial.print("Wheel circumference: "); + Serial.println(msg.getWheelCircumference()); } void manufacturersInformationDataPageHandler(ManufacturersInformation& msg, uintptr_t data) { - Serial.print("DataPage: "); - Serial.println(msg.getDataPageNumber()); - Serial.print("HW Revision: "); - Serial.println(msg.getHWRevision()); - Serial.print("ManufacturerID: "); - Serial.println(msg.getManufacturerID()); - Serial.print("Model Number: "); - Serial.println(msg.getModelNumber()); + Serial.print("DataPage: "); + Serial.println(msg.getDataPageNumber()); + Serial.print("HW Revision: "); + Serial.println(msg.getHWRevision()); + Serial.print("ManufacturerID: "); + Serial.println(msg.getManufacturerID()); + Serial.print("Model Number: "); + Serial.println(msg.getModelNumber()); } void productInformationDataPageHandler(ProductInformation& msg, uintptr_t data) { - Serial.print("DataPage: "); - Serial.println(msg.getDataPageNumber()); - Serial.print("SW Revision Supplemental: "); - Serial.println(msg.getSWRevisionSupplemental()); - Serial.print("SW Revision Main: "); - Serial.println(msg.getSWRevisionMain()); - Serial.print("Serial Number: "); - Serial.println(msg.getSerialNumber()); + Serial.print("DataPage: "); + Serial.println(msg.getDataPageNumber()); + Serial.print("SW Revision Supplemental: "); + Serial.println(msg.getSWRevisionSupplemental()); + Serial.print("SW Revision Main: "); + Serial.println(msg.getSWRevisionMain()); + Serial.print("Serial Number: "); + Serial.println(msg.getSerialNumber()); } void printStatus(uint8_t status) { - Serial.print("Channel Status: "); - switch (status) { - case CHANNEL_STATUS_UNASSIGNED: - Serial.println("Unassigned"); - break; - case CHANNEL_STATUS_ASSIGNED: - Serial.println("Assigned"); - break; - case CHANNEL_STATUS_SEARCHING: - Serial.println("Searching"); - break; - case CHANNEL_STATUS_TRACKING: - Serial.println("Tracking"); - break; - } + Serial.print("Channel Status: "); + switch (status) { + case CHANNEL_STATUS_UNASSIGNED: + Serial.println("Unassigned"); + break; + case CHANNEL_STATUS_ASSIGNED: + Serial.println("Assigned"); + break; + case CHANNEL_STATUS_SEARCHING: + Serial.println("Searching"); + break; + case CHANNEL_STATUS_TRACKING: + Serial.println("Tracking"); + break; + } } diff --git a/src/Profiles/LEV/ANTPLUS_LevPrivateDefines.h b/src/Profiles/LEV/ANTPLUS_LevPrivateDefines.h index 6f0234c..cab9b33 100644 --- a/src/Profiles/LEV/ANTPLUS_LevPrivateDefines.h +++ b/src/Profiles/LEV/ANTPLUS_LevPrivateDefines.h @@ -2,7 +2,7 @@ #define ANTPLUS_LEVPROFILEPRIVATEDEFINES_h /* Channel Config */ -#define ANTPLUS_LEV_CHANNELTYPE CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE +#define ANTPLUS_LEV_CHANNELTYPE CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE #define ANTPLUS_LEV_DEVICETYPE 20 #define ANTPLUS_LEV_CHANNELPERIOD 8192 // 30 / 2.5 = 12 diff --git a/src/Profiles/LEV/ANTPLUS_LevProfile.h b/src/Profiles/LEV/ANTPLUS_LevProfile.h index f743f61..a6a1c97 100644 --- a/src/Profiles/LEV/ANTPLUS_LevProfile.h +++ b/src/Profiles/LEV/ANTPLUS_LevProfile.h @@ -2,7 +2,7 @@ #define ANTPLUS_LEVPROFILE_h // General Definitions -// todo +// TODO // Datapages #include diff --git a/src/Profiles/LEV/DataPages/Base/ANTPLUS_LevBaseMainDataPage.h b/src/Profiles/LEV/DataPages/Base/ANTPLUS_LevBaseMainDataPage.h index 86acdd4..bc8ed24 100644 --- a/src/Profiles/LEV/DataPages/Base/ANTPLUS_LevBaseMainDataPage.h +++ b/src/Profiles/LEV/DataPages/Base/ANTPLUS_LevBaseMainDataPage.h @@ -7,7 +7,7 @@ class LevBaseMainDataPage : public BaseDataPage { public: - LevBaseMainDataPage(AntRxDataResponse& dp); + LevBaseMainDataPage(AntRxDataResponse& dp); uint8_t getDataPageNumber(); }; diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevBatteryInfo.cpp b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevBatteryInfo.cpp index 57b49a4..db058d3 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevBatteryInfo.cpp +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevBatteryInfo.cpp @@ -2,26 +2,26 @@ #include LevBatteryInfo::LevBatteryInfo(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint16_t LevBatteryInfo::getChargingCycleCount() { - return (uint16_t)getData(2) + (((uint16_t)getData(3) & 0x0F) << 8); + return (uint16_t)getData(2) + (((uint16_t)getData(3) & 0x0F) << 8); } uint16_t LevBatteryInfo::getFuelConsumption() { - uint16_t c = (uint16_t)getData(3) + (((uint16_t)getData(4) & 0x0F) << 8); - return c >> 4; + uint16_t c = (uint16_t)getData(3) + (((uint16_t)getData(4) & 0x0F) << 8); + return c >> 4; } uint8_t LevBatteryInfo::getBatteryVoltage() { - return getData(5); + return getData(5); } uint16_t LevBatteryInfo::getDistanceOnCurrentCharge() { - return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); + return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); } diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevCapabilities.cpp b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevCapabilities.cpp index 908315e..7b152ca 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevCapabilities.cpp +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevCapabilities.cpp @@ -2,15 +2,15 @@ #include LevCapabilities::LevCapabilities(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint8_t LevCapabilities::getTravelModesSupported() { - return getData(2); + return getData(2); } uint16_t LevCapabilities::getWheelCircumference() { - return (uint16_t)getData(3) + (((uint16_t)getData(4) & 0x0F) << 8); + return (uint16_t)getData(3) + (((uint16_t)getData(4) & 0x0F) << 8); } diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.cpp b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.cpp index 2d74905..6767af6 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.cpp +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.cpp @@ -3,37 +3,37 @@ /* Speed and Distance */ LevSpeedDistanceInformation::LevSpeedDistanceInformation(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint32_t LevSpeedDistanceInformation::getOdometer() { // in km - return (uint32_t)getData(1) + ((uint32_t)getData(2) << 8) + ((uint32_t)getData(3) << 16); + return (uint32_t)getData(1) + ((uint32_t)getData(2) << 8) + ((uint32_t)getData(3) << 16); } uint16_t LevSpeedDistanceInformation::getRemainingRange() { // in km - return (uint16_t)getData(4) + (((uint16_t)getData(5) & 0x0F) << 8); + return (uint16_t)getData(4) + (((uint16_t)getData(5) & 0x0F) << 8); } uint16_t LevSpeedDistanceInformation::getSpeed() { // in 1/10 km/h - return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); + return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); } /* Alt Speed and Distance */ LevAltSpeedDistanceInformation::LevAltSpeedDistanceInformation(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint32_t LevAltSpeedDistanceInformation::getOdometer() // in km { - return (uint32_t)getData(1) + ((uint32_t)getData(2) << 8) + ((uint32_t)getData(3) << 16); + return (uint32_t)getData(1) + ((uint32_t)getData(2) << 8) + ((uint32_t)getData(3) << 16); } uint16_t LevAltSpeedDistanceInformation::getFuelConsumption() // in Wh/km { - return (uint16_t)getData(4) + (((uint16_t)getData(5) & 0x0F) << 8); + return (uint16_t)getData(4) + (((uint16_t)getData(5) & 0x0F) << 8); } uint16_t LevAltSpeedDistanceInformation::getSpeed() // in 1/10 km/h { - return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); + return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); } diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.h b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.h index b326337..6545c8c 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.h +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedDistanceInformation.h @@ -6,8 +6,8 @@ class LevSpeedDistanceInformation : public LevBaseMainDataPage { public: LevSpeedDistanceInformation(AntRxDataResponse& dp); - uint32_t getOdometer(); // in km - uint16_t getRemainingRange(); // in km + uint32_t getOdometer(); // in km + uint16_t getRemainingRange(); // in km uint16_t getSpeed(); // in 1/10 km/h }; @@ -15,9 +15,9 @@ class LevSpeedDistanceInformation : public LevBaseMainDataPage { class LevAltSpeedDistanceInformation : public LevBaseMainDataPage { public: LevAltSpeedDistanceInformation(AntRxDataResponse& dp); - uint32_t getOdometer(); // in km - uint16_t getFuelConsumption(); // in Wh/km - uint16_t getSpeed(); // in 1/10 km/h + uint32_t getOdometer(); // in km + uint16_t getFuelConsumption(); // in Wh/km + uint16_t getSpeed(); // in 1/10 km/h }; #endif // ANTPLUS_LEVSPEEDDISTANCEINFORMATION_h diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation1.cpp b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation1.cpp index 6c75595..874f156 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation1.cpp +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation1.cpp @@ -2,35 +2,35 @@ #include LevSpeedSystemInformation1::LevSpeedSystemInformation1(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint8_t LevSpeedSystemInformation1::getTemperatureState() { - return getData(1); + return getData(1); } uint8_t LevSpeedSystemInformation1::getTravelModeState() { - return getData(2); + return getData(2); } uint8_t LevSpeedSystemInformation1::getSystemState() { - return getData(3); + return getData(3); } uint8_t LevSpeedSystemInformation1::getGearState() { - return getData(4); + return getData(4); } uint8_t LevSpeedSystemInformation1::getError() { - return getData(5); + return getData(5); } uint16_t LevSpeedSystemInformation1::getSpeed() // in 1/10 km/h { - return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); + return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); } diff --git a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation2.cpp b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation2.cpp index 657c8ba..201807c 100644 --- a/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation2.cpp +++ b/src/Profiles/LEV/DataPages/RX/ANTPLUS_LevSpeedSystemInformation2.cpp @@ -2,35 +2,35 @@ #include LevSpeedSystemInformation2::LevSpeedSystemInformation2(AntRxDataResponse& dp) : LevBaseMainDataPage(dp) { - return; + return; } uint8_t LevSpeedSystemInformation2::getBatterySOC() { - return getData(1); + return getData(1); } uint8_t LevSpeedSystemInformation2::getTravelModeState() { - return getData(2); + return getData(2); } uint8_t LevSpeedSystemInformation2::getSystemState() { - return getData(3); + return getData(3); } uint8_t LevSpeedSystemInformation2::getGearState() { - return getData(4); + return getData(4); } uint8_t LevSpeedSystemInformation2::getPercentAssist() { - return getData(5); + return getData(5); } uint16_t LevSpeedSystemInformation2::getSpeed() // in 1/10 km/h { - return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); + return (uint16_t)getData(6) + (((uint16_t)getData(7) & 0x0F) << 8); } diff --git a/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.cpp b/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.cpp index b27bed1..2a0aca6 100644 --- a/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.cpp +++ b/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.cpp @@ -16,14 +16,14 @@ ProfileLevDisplay::ProfileLevDisplay(uint16_t deviceNumber, uint8_t transmission } void ProfileLevDisplay::setChannelConfig() { - setChannelType(ANTPLUS_LEV_CHANNELTYPE); - setDeviceType(ANTPLUS_LEV_DEVICETYPE); - setChannelPeriod(ANTPLUS_LEV_CHANNELPERIOD); - setSearchTimeout(ANTPLUS_LEV_SEARCHTIMEOUT); + setChannelType(ANTPLUS_LEV_CHANNELTYPE); + setDeviceType(ANTPLUS_LEV_DEVICETYPE); + setChannelPeriod(ANTPLUS_LEV_CHANNELPERIOD); + setSearchTimeout(ANTPLUS_LEV_SEARCHTIMEOUT); } void ProfileLevDisplay::onBroadcastData(BroadcastData& msg) { - BaseProfile::onBroadcastData(msg); + BaseProfile::onBroadcastData(msg); LevBaseMainDataPage dp = LevBaseMainDataPage(msg); if (!handleDataPage(dp)) { callOnOtherDataPage(msg); @@ -31,90 +31,90 @@ void ProfileLevDisplay::onBroadcastData(BroadcastData& msg) { } void ProfileLevDisplay::onAcknowledgedData(AcknowledgedData& msg) { - BaseProfile::onAcknowledgedData(msg); - LevBaseMainDataPage dp = LevBaseMainDataPage(msg); - if (!handleDataPage(dp)) { - callOnOtherDataPage(msg); - } + BaseProfile::onAcknowledgedData(msg); + LevBaseMainDataPage dp = LevBaseMainDataPage(msg); + if (!handleDataPage(dp)) { + callOnOtherDataPage(msg); + } } /* void ProfileLevDisplay::onChannelEventResponse(ChannelEventResponse& msg) { - Serial.print("lev event: "); - Serial.println(msg.getCode()); + Serial.print("lev event: "); + Serial.println(msg.getCode()); }*/ bool ProfileLevDisplay::handleDataPage(LevBaseMainDataPage& dp) { uint8_t dataPage = dp.getDataPageNumber(); bool called = false; - switch (dataPage) { - - case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_NUMBER: - called = handleSpeedSystemInformation1(dp); - break; - case ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_NUMBER: - called = handleSpeedDistanceInformation(dp); - break; - case ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_NUMBER: - called = handleAltSpeedDistanceInformation(dp); - break; - case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_NUMBER: - called = handleSpeedSystemInformation2(dp); - break; - case ANTPLUS_LEV_DATAPAGE_BATTERYINFO_NUMBER: - called = handleBatteryInfo(dp); - break; - case ANTPLUS_LEV_DATAPAGE_CAPABILITIES_NUMBER: - called = handleCapabilities(dp); - break; - case ANTPLUS_COMMON_DATAPAGE_MANUFACTURERSINFORMATION_NUMBER: - // Called Manufacturers Identification in Environment Profile PDF - called = handleManufacturersInformation(dp); - break; - case ANTPLUS_COMMON_DATAPAGE_PRODUCTINFORMATION_NUMBER: - called = handleProductInformation(dp); - break; - } + switch (dataPage) { + + case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION1_NUMBER: + called = handleSpeedSystemInformation1(dp); + break; + case ANTPLUS_LEV_DATAPAGE_SPEEDDISTANCEINFORMATION_NUMBER: + called = handleSpeedDistanceInformation(dp); + break; + case ANTPLUS_LEV_DATAPAGE_ALTSPEEDDISTANCEINFORMATION_NUMBER: + called = handleAltSpeedDistanceInformation(dp); + break; + case ANTPLUS_LEV_DATAPAGE_SPEEDSYSTEMINFORMATION2_NUMBER: + called = handleSpeedSystemInformation2(dp); + break; + case ANTPLUS_LEV_DATAPAGE_BATTERYINFO_NUMBER: + called = handleBatteryInfo(dp); + break; + case ANTPLUS_LEV_DATAPAGE_CAPABILITIES_NUMBER: + called = handleCapabilities(dp); + break; + case ANTPLUS_COMMON_DATAPAGE_MANUFACTURERSINFORMATION_NUMBER: + // Called Manufacturers Identification in Environment Profile PDF + called = handleManufacturersInformation(dp); + break; + case ANTPLUS_COMMON_DATAPAGE_PRODUCTINFORMATION_NUMBER: + called = handleProductInformation(dp); + break; + } return called; } bool ProfileLevDisplay::handleSpeedSystemInformation1(LevBaseMainDataPage& dataPage) { - LevSpeedSystemInformation1 dp = LevSpeedSystemInformation1(dataPage); - return _onLevSpeedSystemInformation1.call(dp); + LevSpeedSystemInformation1 dp = LevSpeedSystemInformation1(dataPage); + return _onLevSpeedSystemInformation1.call(dp); } bool ProfileLevDisplay::handleSpeedDistanceInformation(LevBaseMainDataPage& dataPage) { - LevSpeedDistanceInformation dp = LevSpeedDistanceInformation(dataPage); - return _onLevSpeedDistanceInformation.call(dp); + LevSpeedDistanceInformation dp = LevSpeedDistanceInformation(dataPage); + return _onLevSpeedDistanceInformation.call(dp); } bool ProfileLevDisplay::handleAltSpeedDistanceInformation(LevBaseMainDataPage& dataPage) { - LevAltSpeedDistanceInformation dp = LevAltSpeedDistanceInformation(dataPage); - return _onLevAltSpeedDistanceInformation.call(dp); + LevAltSpeedDistanceInformation dp = LevAltSpeedDistanceInformation(dataPage); + return _onLevAltSpeedDistanceInformation.call(dp); } bool ProfileLevDisplay::handleSpeedSystemInformation2(LevBaseMainDataPage& dataPage) { - LevSpeedSystemInformation2 dp = LevSpeedSystemInformation2(dataPage); - return _onLevSpeedSystemInformation2.call(dp); + LevSpeedSystemInformation2 dp = LevSpeedSystemInformation2(dataPage); + return _onLevSpeedSystemInformation2.call(dp); } bool ProfileLevDisplay::handleBatteryInfo(LevBaseMainDataPage& dataPage) { - LevBatteryInfo dp = LevBatteryInfo(dataPage); - return _onLevBatteryInfo.call(dp); + LevBatteryInfo dp = LevBatteryInfo(dataPage); + return _onLevBatteryInfo.call(dp); } bool ProfileLevDisplay::handleCapabilities(LevBaseMainDataPage& dataPage) { - LevCapabilities dp = LevCapabilities(dataPage); - return _onLevCapabilities.call(dp); + LevCapabilities dp = LevCapabilities(dataPage); + return _onLevCapabilities.call(dp); } bool ProfileLevDisplay::handleManufacturersInformation(LevBaseMainDataPage& dataPage) { - ManufacturersInformation dp = ManufacturersInformation(dataPage); - return _onManufacturersInformation.call(dp); + ManufacturersInformation dp = ManufacturersInformation(dataPage); + return _onManufacturersInformation.call(dp); } bool ProfileLevDisplay::handleProductInformation(LevBaseMainDataPage& dataPage) { - ProductInformation dp = ProductInformation(dataPage); - return _onProductInformation.call(dp); + ProductInformation dp = ProductInformation(dataPage); + return _onProductInformation.call(dp); } diff --git a/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.h b/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.h index 35bde4f..d4f19f6 100644 --- a/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.h +++ b/src/Profiles/LEV/Display/ANTPLUS_ProfileLevDisplay.h @@ -13,17 +13,17 @@ class ProfileLevDisplay : public BaseSlaveProfile { ProfileLevDisplay(uint16_t deviceNumber); ProfileLevDisplay(uint16_t deviceNumber, uint8_t transmissionType); - void onLevSpeedSystemInformation1(void(*func)(LevSpeedSystemInformation1&, uintptr_t), uintptr_t data = 0) { _onLevSpeedSystemInformation1.set(func, data); } - void onLevSpeedDistanceInformation(void(*func)(LevSpeedDistanceInformation&, uintptr_t), uintptr_t data = 0) { _onLevSpeedDistanceInformation.set(func, data); } - void onLevAltSpeedDistanceInformation(void(*func)(LevAltSpeedDistanceInformation&, uintptr_t), uintptr_t data = 0) { _onLevAltSpeedDistanceInformation.set(func, data); } - void onLevSpeedSystemInformation2(void(*func)(LevSpeedSystemInformation2&, uintptr_t), uintptr_t data = 0) { _onLevSpeedSystemInformation2.set(func, data); } - void onLevBatteryInfo(void(*func)(LevBatteryInfo&, uintptr_t), uintptr_t data = 0) { _onLevBatteryInfo.set(func, data); } - void onLevCapabilities(void(*func)(LevCapabilities&, uintptr_t), uintptr_t data = 0) { _onLevCapabilities.set(func, data); } - void onManufacturersInformation(void(*func)(ManufacturersInformation&, uintptr_t), uintptr_t data = 0) { _onManufacturersInformation.set(func, data); } - void onProductInformation(void(*func)(ProductInformation&, uintptr_t), uintptr_t data = 0) { _onProductInformation.set(func, data); } + void onLevSpeedSystemInformation1(void(*func)(LevSpeedSystemInformation1&, uintptr_t), uintptr_t data = 0) { _onLevSpeedSystemInformation1.set(func, data); } + void onLevSpeedDistanceInformation(void(*func)(LevSpeedDistanceInformation&, uintptr_t), uintptr_t data = 0) { _onLevSpeedDistanceInformation.set(func, data); } + void onLevAltSpeedDistanceInformation(void(*func)(LevAltSpeedDistanceInformation&, uintptr_t), uintptr_t data = 0) { _onLevAltSpeedDistanceInformation.set(func, data); } + void onLevSpeedSystemInformation2(void(*func)(LevSpeedSystemInformation2&, uintptr_t), uintptr_t data = 0) { _onLevSpeedSystemInformation2.set(func, data); } + void onLevBatteryInfo(void(*func)(LevBatteryInfo&, uintptr_t), uintptr_t data = 0) { _onLevBatteryInfo.set(func, data); } + void onLevCapabilities(void(*func)(LevCapabilities&, uintptr_t), uintptr_t data = 0) { _onLevCapabilities.set(func, data); } + void onManufacturersInformation(void(*func)(ManufacturersInformation&, uintptr_t), uintptr_t data = 0) { _onManufacturersInformation.set(func, data); } + void onProductInformation(void(*func)(ProductInformation&, uintptr_t), uintptr_t data = 0) { _onProductInformation.set(func, data); } protected: - // virtual void onChannelEventResponse(ChannelEventResponse& msg); + // virtual void onChannelEventResponse(ChannelEventResponse& msg); private: void setChannelConfig(); @@ -31,23 +31,23 @@ class ProfileLevDisplay : public BaseSlaveProfile { void onAcknowledgedData(AcknowledgedData& msg); bool handleDataPage(LevBaseMainDataPage& dataPage); - bool handleSpeedSystemInformation1(LevBaseMainDataPage& dataPage); - bool handleSpeedDistanceInformation(LevBaseMainDataPage& dataPage); - bool handleAltSpeedDistanceInformation(LevBaseMainDataPage& dataPage); - bool handleSpeedSystemInformation2(LevBaseMainDataPage& dataPage); - bool handleBatteryInfo(LevBaseMainDataPage& dataPage); - bool handleCapabilities(LevBaseMainDataPage& dataPage); - bool handleManufacturersInformation(LevBaseMainDataPage& dataPage); - bool handleProductInformation(LevBaseMainDataPage& dataPage); - - Callback _onLevSpeedSystemInformation1; - Callback _onLevSpeedDistanceInformation; - Callback _onLevAltSpeedDistanceInformation; - Callback _onLevSpeedSystemInformation2; - Callback _onLevBatteryInfo; - Callback _onLevCapabilities; - Callback _onManufacturersInformation; - Callback _onProductInformation; + bool handleSpeedSystemInformation1(LevBaseMainDataPage& dataPage); + bool handleSpeedDistanceInformation(LevBaseMainDataPage& dataPage); + bool handleAltSpeedDistanceInformation(LevBaseMainDataPage& dataPage); + bool handleSpeedSystemInformation2(LevBaseMainDataPage& dataPage); + bool handleBatteryInfo(LevBaseMainDataPage& dataPage); + bool handleCapabilities(LevBaseMainDataPage& dataPage); + bool handleManufacturersInformation(LevBaseMainDataPage& dataPage); + bool handleProductInformation(LevBaseMainDataPage& dataPage); + + Callback _onLevSpeedSystemInformation1; + Callback _onLevSpeedDistanceInformation; + Callback _onLevAltSpeedDistanceInformation; + Callback _onLevSpeedSystemInformation2; + Callback _onLevBatteryInfo; + Callback _onLevCapabilities; + Callback _onManufacturersInformation; + Callback _onProductInformation; }; #endif // ANTPLUS_PROFILELEVDISPLAY_h From 50e7ce8c043f101e9f0b3fd51fce65e016199a73 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Tue, 11 Jun 2019 23:06:11 -0700 Subject: [PATCH 2/2] LEV: Display: Add example to Travis config Add to build so its compile tested all the time --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 92e4035..25f2571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ env: - PLATFORMIO_CI_SRC=examples/EnvironmentDisplay/EnvironmentDisplay.ino - PLATFORMIO_CI_SRC=examples/HeartRateDisplay/HeartRateDisplay.ino - PLATFORMIO_CI_SRC=examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino + - PLATFORMIO_CI_SRC=examples/LEVDisplay/LEVDisplay.ino install: - pip install -U platformio