From dbbe037f064ff4caa43f111e559a770a9da227d3 Mon Sep 17 00:00:00 2001 From: Jens Noack Date: Sat, 17 Oct 2020 23:20:15 +0200 Subject: [PATCH] Latest merge --- OmobiDisplayApp/QBluetoothLeUart | 2 +- .../OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/OmobiDisplayApp/QBluetoothLeUart b/OmobiDisplayApp/QBluetoothLeUart index 534277a..76e4575 160000 --- a/OmobiDisplayApp/QBluetoothLeUart +++ b/OmobiDisplayApp/QBluetoothLeUart @@ -1 +1 @@ -Subproject commit 534277a19867f2e41a2699fc863e1cae48dee741 +Subproject commit 76e457593e889885fd410fdbcdd659706a1eceb8 diff --git a/vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h b/vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h index 98c7f8a..8ad72e3 100644 --- a/vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h +++ b/vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h @@ -26,12 +26,14 @@ public: this->ledDisplayController = new LedDisplayController(ledDisplayMatrix); this->ledDisplayController->registerEepromUnit(this->eepromManager); - // init ble server - this->bleServer = new BluetoothLeUartServer("Omobi Display", "92fecb20-1406-426a-afa5-cd5c1f306462", "92fecb21-1406-426a-afa5-cd5c1f306462", "92fecb22-1406-426a-afa5-cd5c1f306462"); - this->bleServer->setCallbacks(this); - + // register eeprom for this class this->eepromUnit = this->eepromManager->registerEempromUnit(sizeof(DisplayProperties)); this->loadProperties(); + + // init ble server + this->bleServer = new BluetoothLeUartServer(this->properties.deviceName, "92fecb20-1406-426a-afa5-cd5c1f306462", "92fecb21-1406-426a-afa5-cd5c1f306462", "92fecb22-1406-426a-afa5-cd5c1f306462"); + this->bleServer->setCallbacks(this); + };