(&(csc.flags))) = 0;
+
+ // Set flags based on data presence
+ csc.flags.wheelRevolutionDataPresent = 1; // Wheel Revolution Data Present
+ csc.flags.crankRevolutionDataPresent = 1; // Crank Revolution Data Present
+
+ // Set data fields
+ csc.cumulativeWheelRevolutions = spinBLEClient.cscCumulativeWheelRev;
+ csc.lastWheelEventTime = spinBLEClient.cscLastWheelEvtTime;
+ csc.cumulativeCrankRevolutions = spinBLEClient.cscCumulativeCrankRev;
+ csc.lastCrankEventTime = spinBLEClient.cscLastCrankEvtTime;
+
+ auto byteArray = csc.toByteArray();
+
+ cscMeasurement->setValue(&byteArray[0], byteArray.size());
+ cscMeasurement->notify();
+
+ const int kLogBufCapacity = 150;
+ char logBuf[kLogBufCapacity];
+ const size_t byteArrayLength = byteArray.size();
+
+ logCharacteristic(logBuf, kLogBufCapacity, &byteArray[0], byteArrayLength, CSCSERVICE_UUID, cscMeasurement->getUUID(),
+ "CSC(CSM)[ WheelRev(%lu) WheelTime(%u) CrankRev(%u) CrankTime(%u) ]", spinBLEClient.cscCumulativeWheelRev, spinBLEClient.cscLastWheelEvtTime,
+ spinBLEClient.cscCumulativeCrankRev, spinBLEClient.cscLastCrankEvtTime);
+}
+
void updateHeartRateMeasurementChar() {
if (!spinBLEServer.clientSubscribed.Heartrate) {
return;
@@ -323,9 +423,11 @@ void MyServerCallbacks::onConnect(BLEServer *pServer, ble_gap_conn_desc *desc) {
void MyServerCallbacks::onDisconnect(BLEServer *pServer) {
SS2K_LOG(BLE_SERVER_LOG_TAG, "Bluetooth Remote Client Disconnected. Remaining Clients: %d", pServer->getConnectedCount());
BLEDevice::startAdvertising();
- //client disconnected while trying to write fw - reboot to clear the faulty upload.
- if (ss2k->isUpdating) {SS2K_LOG(BLE_SERVER_LOG_TAG, "Rebooting because of update interruption.", pServer->getConnectedCount());
- ss2k->rebootFlag = true;}
+ // client disconnected while trying to write fw - reboot to clear the faulty upload.
+ if (ss2k->isUpdating) {
+ SS2K_LOG(BLE_SERVER_LOG_TAG, "Rebooting because of update interruption.", pServer->getConnectedCount());
+ ss2k->rebootFlag = true;
+ }
}
bool MyServerCallbacks::onConnParamsUpdateRequest(NimBLEClient *pClient, const ble_gap_upd_params *params) {
@@ -366,6 +468,8 @@ void SpinBLEServer::setClientSubscribed(NimBLEUUID pUUID, bool subscribe) {
spinBLEServer.clientSubscribed.CyclingPowerMeasurement = subscribe;
} else if (pUUID == FITNESSMACHINEINDOORBIKEDATA_UUID) {
spinBLEServer.clientSubscribed.IndoorBikeData = subscribe;
+ } else if (pUUID == CSCMEASUREMENT_UUID) {
+ spinBLEServer.clientSubscribed.CyclingSpeedCadence = subscribe;
}
}
diff --git a/src/BLE_Setup.cpp b/src/BLE_Setup.cpp
index b4609145..11589ab8 100644
--- a/src/BLE_Setup.cpp
+++ b/src/BLE_Setup.cpp
@@ -14,7 +14,7 @@
void setupBLE() { // Common BLE setup for both client and server
SS2K_LOG(BLE_SETUP_LOG_TAG, "Starting Arduino BLE Client application...");
BLEDevice::init(userConfig->getDeviceName());
- BLEDevice::setMTU(515);
+ BLEDevice::setMTU(515); //-- enabling this is very important for BLE firmware updates.
FTMSWrite = "";
spinBLEClient.start();
startBLEServer();
diff --git a/src/Custom_Characteristic.cpp b/src/Custom_Characteristic.cpp
index d13466a1..9df86321 100644
--- a/src/Custom_Characteristic.cpp
+++ b/src/Custom_Characteristic.cpp
@@ -45,6 +45,10 @@ void ss2kCustomCharacteristicCallbacks::onWrite(BLECharacteristic *pCharacterist
ss2kCustomCharacteristic::process(rxValue);
}
+void ss2kCustomCharacteristicCallbacks::onSubscribe(NimBLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc, uint16_t subValue){
+ NimBLEDevice::setMTU(515);
+}
+
void ss2kCustomCharacteristic::notify(char _item) {
std::string returnValue = {cc_read, _item};
process(returnValue);
diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
index a54140d6..35bf8ff2 100644
--- a/src/HTTP_Server_Basic.cpp
+++ b/src/HTTP_Server_Basic.cpp
@@ -52,26 +52,42 @@ void _staSetup() {
WiFi.setAutoReconnect(true);
}
+void _APSetup() {
+ // WiFi.eraseAP(); //Needed if we switch back to espressif32 @6.5.0
+ WiFi.mode(WIFI_AP);
+ WiFi.setHostname("reset"); // Fixes a bug when switching Arduino Core Versions
+ WiFi.softAPsetHostname("reset");
+ WiFi.setHostname(userConfig->getDeviceName());
+ WiFi.softAPsetHostname(userConfig->getDeviceName());
+ WiFi.enableAP(true);
+ vTaskDelay(500); // Micro controller requires some time to reset the mode
+}
+
// ********************************WIFI Setup*************************
void startWifi() {
int i = 0;
// Trying Station mode first:
- SS2K_LOG(HTTP_SERVER_LOG_TAG, "Connecting to: %s", userConfig->getSsid());
- if (WiFi.SSID() != String(userConfig->getSsid())) {
+ if (strcmp(userConfig->getSsid(), DEVICE_NAME) != 0) {
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "Connecting to: %s", userConfig->getSsid());
_staSetup();
- }
-
- while (WiFi.status() != WL_CONNECTED) {
- vTaskDelay(1000 / portTICK_RATE_MS);
- SS2K_LOG(HTTP_SERVER_LOG_TAG, "Waiting for connection to be established...");
- i++;
- if (i > WIFI_CONNECT_TIMEOUT || (String(userConfig->getSsid()) == DEVICE_NAME)) {
- i = 0;
- SS2K_LOG(HTTP_SERVER_LOG_TAG, "Couldn't Connect. Switching to AP mode");
- break;
+ while (WiFi.status() != WL_CONNECTED) {
+ vTaskDelay(1000 / portTICK_RATE_MS);
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "Waiting for connection to be established...");
+ i++;
+ if (i > WIFI_CONNECT_TIMEOUT) {
+ i = 0;
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "Couldn't Connect. Switching to AP mode");
+ WiFi.disconnect(true, true);
+ WiFi.setAutoReconnect(false);
+ WiFi.mode(WIFI_MODE_NULL);
+ vTaskDelay(1000 / portTICK_RATE_MS);
+ break;
+ }
}
}
+
+ // Did we connect in STA mode?
if (WiFi.status() == WL_CONNECTED) {
myIP = WiFi.localIP();
httpServer.internetConnection = true;
@@ -79,24 +95,10 @@ void startWifi() {
// Couldn't connect to existing network, Create SoftAP
if (WiFi.status() != WL_CONNECTED) {
- // This below is to compensate for a bug in platform = espressif32 @ 6.5.0 . Hopefully it's fixed soon.
- // The Symptoms are that we cannot connect in AP mode unless .eraseAp is called. Then Station needs to get initialized and dumped again before it will connect. Dumbest thing
- // ever.
- WiFi.eraseAP();
- _staSetup();
- WiFi.disconnect(true, true);
- WiFi.mode(WIFI_MODE_NULL);
- vTaskDelay(1000 / portTICK_RATE_MS);
- // *********************** End of platform = espressif32 @ 6.5.0 Bug Workaround *************************
- WiFi.mode(WIFI_AP);
- WiFi.softAPsetHostname(userConfig->getDeviceName());
- WiFi.setAutoReconnect(false);
- WiFi.enableAP(true);
- vTaskDelay(50); // Micro controller requires some time to reset the mode
+ _APSetup();
if (strcmp(userConfig->getSsid(), DEVICE_NAME) == 0) {
- // If default SSID is still in use, let the user
- // select a new password.
- // Else Fall Back to the default password (probably "password")
+ // If default SSID is still in use, let the user select a new password.
+ // Else fall back to the default password.
WiFi.softAP(userConfig->getDeviceName(), userConfig->getPassword());
} else {
WiFi.softAP(userConfig->getDeviceName(), DEFAULT_PASSWORD);
@@ -155,7 +157,7 @@ void HTTP_Server::start() {
server.on("/shift.html", handleLittleFSFile);
server.on("/settings.html", handleLittleFSFile);
server.on("/status.html", handleLittleFSFile);
- server.on("/bluetoothscanner.html", handleLittleFSFile);
+ server.on("/bluetoothscanner.html", handleBTScanner);
server.on("/streamfit.html", handleLittleFSFile);
server.on("/hrtowatts.html", handleLittleFSFile);
server.on("/favicon.ico", handleLittleFSFile);
@@ -176,7 +178,7 @@ void HTTP_Server::start() {
server.on("/load_defaults.html", []() {
SS2K_LOG(HTTP_SERVER_LOG_TAG, "Setting Defaults from Web Request");
- ss2k->resetDefaultsFlag = true;
+ ss2k->resetDefaultsFlag = true;
String response =
"Defaults have been "
"loaded.
Please reconnect to the device on WiFi "
@@ -437,6 +439,11 @@ void HTTP_Server::webClientUpdate(void *pvParameters) {
}
}
+void HTTP_Server::handleBTScanner(){
+ spinBLEClient.doScan = true;
+ handleLittleFSFile();
+}
+
void HTTP_Server::handleIndexFile() {
String filename = "/index.html";
if (LittleFS.exists(filename)) {
diff --git a/src/Main.cpp b/src/Main.cpp
index 55500ea4..74b10353 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -17,6 +17,7 @@
#include "WebsocketAppender.h"
#include "Custom_Characteristic.h"
#include
+#include "settings.h"
// Stepper Motor Serial
HardwareSerial stepperSerial(2);
diff --git a/src/SensorCollector.cpp b/src/SensorCollector.cpp
index da103905..426c4ac9 100644
--- a/src/SensorCollector.cpp
+++ b/src/SensorCollector.cpp
@@ -54,6 +54,7 @@ void collectAndSet(NimBLEUUID charUUID, NimBLEUUID serviceUUID, NimBLEAddress ad
if (sensorData->hasSpeed()) {
float speed = sensorData->getSpeed();
rtConfig->setSimulatedSpeed(speed);
+ spinBLEClient.connectedSpeed = true;
logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " SD(%.2f)", fmodf(speed, 1000.0));
}
if (sensorData->hasResistance()) {
# [Description]
-This version of SmartSpin2K is designed with DIY in mind. The PCB can be hand soldered using readily available components.
+This version of SmartSpin2k is designed with DIY in mind. The PCB can be hand soldered using readily available components.
The case for V2 is available in multiple versions that are suitable for various needs. The direct mount design is the currently recommended case design.
diff --git a/data/bluetoothscanner.html b/data/bluetoothscanner.html
index 27d41497..412e7fc0 100644
--- a/data/bluetoothscanner.html
+++ b/data/bluetoothscanner.html
@@ -7,7 +7,7 @@
background-color: #03245c;
}
-