itsblue-development/LedDisplay
itsblue-development/LedDisplay
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Chore: remove all occurences of "Omobi"

Browse source
This commit is contained in:
Dorian Zedler 2022-08-03 13:19:25 +02:00
parent b29d7d4063
commit 39ab8bbccf
Signed by: dorian
GPG key ID: 989DE36109AFA354
5 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/ressources/qml/main.qml
View file

@ -298,7 +298,7 @@ ApplicationWindow {
DisclaimerDialog {
id: infoDisclaimerDialog
title: "LedDisplayController v" + APP_VERSION + "<br>By <a href=\"https://itsblue.de\">Itsblue Development</a>, <a href=\"https://itsblue.de/apps/bluerock\">" + qsTr("privacy policy") + "</a>"
title: "LedDisplayController v" + APP_VERSION + "<br>By <a href=\"https://itsblue.de\">Itsblue Development</a>, <a href=\"https://itsblue.de/apps/leddisplaycontroller\">" + qsTr("privacy policy") + "</a>"
content: qsTr("This app was built using the <a href='https://qt.io'>Qt Framework</a> licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>This app is open source and licensed under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>, the source code can be found <a href='https://itsblue.dev/itsblue-development/LedDisplay'>here</a>.")
}

3
firmware/include/BluetoothLeUartServer.h
View file

@ -15,7 +15,6 @@ class BluetoothLeUartServerCallbacks;
* Example use
* \code
* #include <Arduino.h>
* #include "OmobiLedDisplay.h"
*
* BluetoothLeUartServer* server;
*
@ -33,7 +32,7 @@ class BluetoothLeUartServerCallbacks;
*
* void setup()
* {
* server = new BluetoothLeUartServer("OmobiLedDisplay1", "6e400001-b5a3-f393-e0a9-e50e24dcca9e", "6e400002-b5a3-f393-e0a9-e50e24dcca9e", "6e400003-b5a3-f393-e0a9-e50e24dcca9e");
* server = new BluetoothLeUartServer("LedDisplay1", "6e400001-b5a3-f393-e0a9-e50e24dcca9e", "6e400002-b5a3-f393-e0a9-e50e24dcca9e", "6e400003-b5a3-f393-e0a9-e50e24dcca9e");
* server->setCallbacks(new MyCallbacks());
* }
*

14
firmware/include/OmobiLedDisplay.h → firmware/include/LedDisplay.h
View file

@ -1,5 +1,5 @@
#ifndef OMOBI_LED_DISPLAY
#define OMOBI_LED_DISPLAY
#ifndef LED_DISPLAY
#define LED_DISPLAY
#include <Arduino.h>
#include <ArduinoJson.h>
@ -9,12 +9,12 @@
#include "LedDisplayController.h"
class OmobiLedDisplay : protected BluetoothLeUartServerCallbacks
class LedDisplay : protected BluetoothLeUartServerCallbacks
{
public:
template<typename T_COLOR_FEATURE, typename T_METHOD>
explicit OmobiLedDisplay(String deviceName, NeoPixelBrightnessBusGfx<T_COLOR_FEATURE, T_METHOD> *ledDisplayMatrix)
explicit LedDisplay(String deviceName, NeoPixelBrightnessBusGfx<T_COLOR_FEATURE, T_METHOD> *ledDisplayMatrix)
{
this->lastKeepAlive = -1;
this->sessionAuthorized = false;
@ -49,7 +49,7 @@ protected:
private:
enum OmobiDisplayCommand
enum DisplayCommand
{
AuthenticateCommand = 0,
KeepAliveCommand = 1,
@ -62,7 +62,7 @@ private:
SetDisplayNameCommand = 23
};
enum OmobiDisplayStatusCode
enum DisplayStatusCode
{
Success = 200,
BadRequestError = 400,
@ -94,4 +94,4 @@ private:
String sha256(String payload);
};
#endif // OMOBI_LED_DISPLAY
#endif // LED_DISPLAY

22
firmware/src/OmobiLedDisplay.cpp → firmware/src/LedDisplay.cpp
View file

@ -1,9 +1,9 @@
#include "OmobiLedDisplay.h"
#include "LedDisplay.h"
//OmobiLedDisplay::OmobiLedDisplay(String deviceName, Adafruit_NeoMatrix *ledDisplayMatrix)
//LedDisplay::LedDisplay(String deviceName, Adafruit_NeoMatrix *ledDisplayMatrix)
void OmobiLedDisplay::loop()
void LedDisplay::loop()
{
if (millis() - lastKeepAlive > this->maximumKeepAliveDelay)
{
@ -12,7 +12,7 @@ void OmobiLedDisplay::loop()
}
}
void OmobiLedDisplay::onDeviceConnectedChanged(bool deviceConnected)
void LedDisplay::onDeviceConnectedChanged(bool deviceConnected)
{
if (deviceConnected)
{
@ -27,7 +27,7 @@ void OmobiLedDisplay::onDeviceConnectedChanged(bool deviceConnected)
}
}
void OmobiLedDisplay::onDataReceived(String dataString)
void LedDisplay::onDataReceived(String dataString)
{
// process JSON
const size_t capacity = JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(3) + 200;
@ -39,13 +39,13 @@ void OmobiLedDisplay::onDataReceived(String dataString)
return;
// get reuqest data
OmobiDisplayCommand requestHeader = requestDoc["header"];
DisplayCommand requestHeader = requestDoc["header"];
JsonObject requestData = requestDoc["data"];
// prepare reply data
DynamicJsonDocument replyDoc(capacity);
replyDoc["header"] = requestHeader;
OmobiDisplayStatusCode replyStatus = InternalError;
DisplayStatusCode replyStatus = InternalError;
JsonObject replyData = replyDoc.createNestedObject("data");
if (requestHeader > KeepAliveCommand && !this->sessionAuthorized)
@ -183,7 +183,7 @@ void OmobiLedDisplay::onDataReceived(String dataString)
}
bool OmobiLedDisplay::loadProperties()
bool LedDisplay::loadProperties()
{
if (this->eepromUnit == nullptr)
return false;
@ -201,7 +201,7 @@ bool OmobiLedDisplay::loadProperties()
{
// There was an error reading the properties -> rebuild with default values!
DisplayProperties defaultProperties{
"Omobi Led Display",
"Led Display",
"1234",
"OK"};
@ -212,7 +212,7 @@ bool OmobiLedDisplay::loadProperties()
return true;
}
bool OmobiLedDisplay::storeProperties()
bool LedDisplay::storeProperties()
{
if (this->eepromUnit == nullptr)
return false;
@ -222,7 +222,7 @@ bool OmobiLedDisplay::storeProperties()
return true;
}
String OmobiLedDisplay::sha256(String payload)
String LedDisplay::sha256(String payload)
{
byte shaResult[32];
mbedtls_md_context_t ctx;

6
firmware/src/main.cpp
View file

@ -1,5 +1,5 @@
#include <Arduino.h>
#include "OmobiLedDisplay.h"
#include "LedDisplay.h"
#define MATRIX_PIN 4
#define TILE_PIXEL_ROWS 8
@ -9,7 +9,7 @@
#define MATRIX_PIXEL_WIDTH TILE_PIXEL_COLS*MATRIX_TILES_COL
#define MATRIX_PIXEL_HEIGHT TILE_PIXEL_ROWS*MATRIX_TILES_ROW
OmobiLedDisplay *display;
LedDisplay *display;
///----- Setup of display driver and topology: -------------------------------------------------------------------------
// For detailed information on NeoPixel and NeoTiles etc. - all around display topology setup please see here:
@ -29,7 +29,7 @@ void setup()
Serial.printf("Los\n");
// create our display
displayMatrix->setRemapFunction(&remap);
display = new OmobiLedDisplay("OmobiLedDisplay1", displayMatrix);
display = new LedDisplay("LedDisplay1", displayMatrix);
}