Initial Gear UI Commit

Author: doudar

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added CSC Service to BLE server.
 - Added Yosuda-007C.
 - Updated wiki banner.
+- Added support for the Zwift gear display.
 
 ### Changed
 

include/BLE_Common.h

@@ -7,10 +7,8 @@
 
 #pragma once
 
-// #define CONFIG_SW_COEXIST_ENABLE 1
-
-#include <memory>
 #include <NimBLEDevice.h>
+#include <memory>
 #include <Arduino.h>
 #include <queue>
 #include <deque>
@@ -44,12 +42,6 @@ class MyServerCallbacks : public NimBLEServerCallbacks {
   bool onConnParamsUpdateRequest(NimBLEClient *pClient, const ble_gap_upd_params *params);
 };
 
-class MyCallbacks : public NimBLECharacteristicCallbacks {
- public:
-  void onWrite(BLECharacteristic *);
-  void onSubscribe(NimBLECharacteristic *pCharacteristic, ble_gap_conn_desc *desc, uint16_t subValue);
-};
-
 // TODO add the rest of the server to this class
 class SpinBLEServer {
  private:
@@ -72,6 +64,12 @@ class SpinBLEServer {
   SpinBLEServer() { memset(&clientSubscribed, 0, sizeof(clientSubscribed)); }
 };
 
+class MyCallbacks : public NimBLECharacteristicCallbacks {
+ public:
+  void onWrite(BLECharacteristic *);
+  void onSubscribe(NimBLECharacteristic *pCharacteristic, ble_gap_conn_desc *desc, uint16_t subValue);
+};
+
 extern SpinBLEServer spinBLEServer;
 
 void startBLEServer();
@@ -199,4 +197,4 @@ class MyClientCallback : public NimBLEClientCallbacks {
   void onAuthenticationComplete(ble_gap_conn_desc);
 };
 
-extern SpinBLEClient spinBLEClient;
+extern SpinBLEClient spinBLEClient;

include/BLE_Wattbike_Service.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#pragma once
+
+#include <NimBLEDevice.h>
+
+class BLE_Wattbike_Service {
+ public:
+  BLE_Wattbike_Service();
+  void setupService(NimBLEServer *pServer);
+  void update();
+  void parseNemit();
+
+ private:
+  NimBLEService *pWattbikeService;
+  NimBLECharacteristic *wattbikeReadCharacteristic;
+  NimBLECharacteristic *wattbikeWriteCharacteristic;
+};

lib/SS2K/include/Constants.h

@@ -59,6 +59,11 @@
 #define FITNESSMACHINEPOWERRANGE_UUID           NimBLEUUID((uint16_t)0x2AD8)
 #define FITNESSMACHINEINCLINATIONRANGE_UUID     NimBLEUUID((uint16_t)0x2AD5)
 
+// Wattbike Service
+#define WATTBIKE_SERVICE_UUID NimBLEUUID("b4cc1223-bc02-4cae-adb9-1217ad2860d1")
+#define WATTBIKE_READ_UUID    NimBLEUUID("b4cc1224-bc02-4cae-adb9-1217ad2860d1")
+#define WATTBIKE_WRITE_UUID   NimBLEUUID("b4cc1225-bc02-4cae-adb9-1217ad2860d1")
+
 // GATT service/characteristic UUIDs for Flywheel Bike from ptx2/gymnasticon/
 #define FLYWHEEL_UART_SERVICE_UUID NimBLEUUID("6e400001-b5a3-f393-e0a9-e50e24dcca9e")
 #define FLYWHEEL_UART_RX_UUID      NimBLEUUID("6e400002-b5a3-f393-e0a9-e50e24dcca9e")

src/BLE_Server.cpp

@@ -14,6 +14,7 @@
 #include "BLE_Fitness_Machine_Service.h"
 #include "BLE_Custom_Characteristic.h"
 #include "BLE_Device_Information_Service.h"
+#include "BLE_Wattbike_Service.h"
 
 #include <ArduinoJson.h>
 #include <Constants.h>
@@ -32,6 +33,7 @@ BLE_Heart_Service heartService;
 BLE_Fitness_Machine_Service fitnessMachineService;
 BLE_ss2kCustomCharacteristic ss2kCustomCharacteristic;
 BLE_Device_Information_Service deviceInformationService;
+BLE_Wattbike_Service wattbikeService;
 
 void startBLEServer() {
   // Server Setup
@@ -46,7 +48,8 @@ void startBLEServer() {
   fitnessMachineService.setupService(spinBLEServer.pServer, &chrCallbacks);
   ss2kCustomCharacteristic.setupService(spinBLEServer.pServer);
   deviceInformationService.setupService(spinBLEServer.pServer);
-  
+  wattbikeService.setupService(spinBLEServer.pServer);  // No callback needed
+
   BLEAdvertising *pAdvertising = BLEDevice::getAdvertising();
   // const std::string fitnessData = {0b00000001, 0b00100000, 0b00000000};
   // pAdvertising->setServiceData(FITNESSMACHINESERVICE_UUID, fitnessData);
@@ -56,6 +59,7 @@ void startBLEServer() {
   pAdvertising->addServiceUUID(CSCSERVICE_UUID);
   pAdvertising->addServiceUUID(HEARTSERVICE_UUID);
   pAdvertising->addServiceUUID(SMARTSPIN2K_SERVICE_UUID);
+  pAdvertising->addServiceUUID(WATTBIKE_SERVICE_UUID);
   pAdvertising->setMaxInterval(250);
   pAdvertising->setMinInterval(160);
   pAdvertising->setScanResponse(true);
@@ -74,6 +78,7 @@ void SpinBLEServer::update() {
   cyclingPowerService.update();
   cyclingSpeedCadenceService.update();
   fitnessMachineService.update();
+  wattbikeService.parseNemit();  // Changed from update() to parseNemit()
 }
 
 double SpinBLEServer::calculateSpeed() {
@@ -182,7 +187,7 @@ void MyCallbacks::onSubscribe(NimBLECharacteristic *pCharacteristic, ble_gap_con
   SS2K_LOG(BLE_SERVER_LOG_TAG, "%s", str.c_str());
 }
 
-//This might be worth depreciating. With multiple clients connected (SS2k App, + Training App), it at least needs to be an int, not a bool. 
+// This might be worth depreciating. With multiple clients connected (SS2k App, + Training App), it at least needs to be an int, not a bool.
 void SpinBLEServer::setClientSubscribed(NimBLEUUID pUUID, bool subscribe) {
   if (pUUID == HEARTCHARACTERISTIC_UUID) {
     spinBLEServer.clientSubscribed.Heartrate = subscribe;

src/BLE_Wattbike_Service.cpp

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#include "BLE_Wattbike_Service.h"
+#include "BLE_Common.h"
+#include <Constants.h>
+
+BLE_Wattbike_Service::BLE_Wattbike_Service() : pWattbikeService(nullptr), wattbikeReadCharacteristic(nullptr), wattbikeWriteCharacteristic(nullptr) {}
+
+void BLE_Wattbike_Service::setupService(NimBLEServer *pServer) {
+  // Create Wattbike service
+  pWattbikeService = spinBLEServer.pServer->createService(WATTBIKE_SERVICE_UUID);
+
+  // Create characteristic for gear notifications
+  wattbikeReadCharacteristic = pWattbikeService->createCharacteristic(WATTBIKE_READ_UUID, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
+
+  // Create characteristic for receiving commands
+  wattbikeWriteCharacteristic = pWattbikeService->createCharacteristic(WATTBIKE_WRITE_UUID, NIMBLE_PROPERTY::WRITE);
+
+  // Start the service
+  pWattbikeService->start();
+}
+
+void BLE_Wattbike_Service::parseNemit() {
+  static int lastGear = -1;  // Track last gear position
+  static unsigned long lastNotifyTime = 0;  // Track last notification time
+  const unsigned long NOTIFY_INTERVAL = 30000;  // 30 seconds in milliseconds
+  
+  // Get current shifter position
+  int currentGear = rtConfig->getShifterPosition();
+  if (currentGear < 1) {  // Ensure gear is at least 1
+    currentGear = 1;
+  }
+
+  unsigned long currentTime = millis();
+  
+  // Only call update if gear changed or 30 seconds elapsed
+  if (currentGear != lastGear || (currentTime - lastNotifyTime) >= NOTIFY_INTERVAL) {
+    update();  // Call existing update function to handle notification
+    
+    // Update tracking variables
+    lastGear = currentGear;
+    lastNotifyTime = currentTime;
+  }
+}
+
+void BLE_Wattbike_Service::update() {
+  // Get current shifter position
+  int currentGear = rtConfig->getShifterPosition();
+  if (currentGear < 1) {  // Ensure gear is at least 1
+    currentGear = 1;
+  }
+
+  // Create gear data packet with sequence number and fixed value
+  static uint8_t seq = 0;
+  ++seq;
+
+  uint8_t gearData[4];
+  gearData[0] = seq;                // Sequence number
+  gearData[1] = 0x03;               // Fixed value
+  gearData[2] = 0xB6;               // Fixed value
+  gearData[3] = (byte)currentGear;  // Gear value
+
+  // Update the characteristic
+  wattbikeReadCharacteristic->setValue(gearData, sizeof(gearData));
+  wattbikeReadCharacteristic->notify();
+
+  // Log the update
+  const int kLogBufCapacity = 100;
+  char logBuf[kLogBufCapacity];
+  logCharacteristic(logBuf, kLogBufCapacity, gearData, sizeof(gearData), WATTBIKE_SERVICE_UUID, wattbikeReadCharacteristic->getUUID(), "Wattbike Gear[ %d ]", currentGear);
+}