diff --git a/vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h b/vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h index 04928b3..4a3b330 100644 --- a/vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h +++ b/vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h @@ -89,10 +89,6 @@ private: class BluetoothLeUartServerCallbacks { public: - virtual ~BluetoothLeUartServerCallbacks(){}; - - const char *test = "testlol"; - virtual void onDeviceConnectedChanged(bool deviceConnected); virtual void onDataReceived(String data); }; diff --git a/vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h b/vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h index d5a8064..dee716c 100644 --- a/vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h +++ b/vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h @@ -101,6 +101,7 @@ private: } sets_t; // storage variables + const text_set_t defaultTextSet {"", false, 0, "", AlignCenter, false, 0, 0}; sets_t text_sets; // storage control diff --git a/vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp b/vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp index c9f6a6d..821dbf4 100644 --- a/vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp +++ b/vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp @@ -194,8 +194,19 @@ LedDisplayController::GetSetTextSetParameterExitCode LedDisplayController::getSe switch (parameter) { case TextParameter: - if (set) - strncpy(currentTextSet->text, value->c_str(), sizeof(currentTextSet->text)); + if (set) { + if(*value == "") + // delete the index + for (int i = index; i < this->maximumTextSets; i++) + { + if(i > this->maximumTextSets - 1) + this->text_sets.sets[i] = this->text_sets.sets[i+1]; + else + this->text_sets.sets[i] = this->defaultTextSet; + } + else + strncpy(currentTextSet->text, value->c_str(), sizeof(currentTextSet->text)); + } else returnValue = String(currentTextSet->text); break; @@ -320,17 +331,7 @@ bool LedDisplayController::loadTextSets() for (int i = 0; i < this->maximumTextSets; i++) { - text_set_t defaultTextSet{ - "", - false, - 0, - "", - AlignCenter, - false, - 0, - 0}; - - defaultTextSets.sets[i] = defaultTextSet; + defaultTextSets.sets[i] = this->defaultTextSet; } this->text_sets = defaultTextSets;