From 563c949f6f63370f8d19e676351059c16d121447 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 11:12:52 +0200 Subject: [PATCH] Chore: restructure and clean up --- Arduino/OmobiDisplay/OmobiDisplay.ino | 160 ------------------ .../LedDisplay}/.gitignore | 0 .../LedDisplay}/.travis.yml | 0 .../LedDisplay}/.vscode/extensions.json | 0 .../LedDisplay}/.vscode/settings.json | 0 .../include/BluetoothLeUartServer.h | 0 .../LedDisplay}/include/EepromManager.h | 0 .../include/LedDisplayController.h | 0 .../LedDisplay}/include/OmobiLedDisplay.h | 0 .../LedDisplay}/include/README | 0 .../LedDisplay}/lib/README | 0 .../LedDisplay}/platformio.ini | 0 .../LedDisplay}/src/BluetoothLeUartServer.cpp | 0 .../LedDisplay}/src/EepromManager.cpp | 0 .../LedDisplay}/src/LedDisplayController.cpp | 0 .../LedDisplay}/src/OmobiLedDisplay.cpp | 0 .../LedDisplay}/src/main.cpp | 0 .../LedDisplay}/test/README | 0 .../OmobiLEDdisplay}/.gitignore | 0 .../OmobiLEDdisplay}/.travis.yml | 0 .../OmobiLEDdisplay/.vscode/extensions.json | 0 .../OmobiLEDdisplay/.vscode/settings.json | 0 .../OmobiLEDdisplay}/include/README | 0 .../OmobiLEDdisplay/include/omobi_html.h | 0 .../OmobiLEDdisplay}/lib/README | 0 .../OmobiLEDdisplay/platformio.ini | 0 .../OmobiLEDdisplay/src/index.html | 0 .../OmobiLEDdisplay/src/main.cpp | 0 .../OmobiLEDdisplay}/test/README | 0 29 files changed, 160 deletions(-) delete mode 100644 Arduino/OmobiDisplay/OmobiDisplay.ino rename {vscode/OmobiLEDdisplay => firmware/LedDisplay}/.gitignore (100%) rename {vscode/OmobiLEDdisplay => firmware/LedDisplay}/.travis.yml (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/.vscode/extensions.json (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/.vscode/settings.json (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/include/BluetoothLeUartServer.h (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/include/EepromManager.h (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/include/LedDisplayController.h (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/include/OmobiLedDisplay.h (100%) rename {vscode/OmobiLEDdisplay => firmware/LedDisplay}/include/README (100%) rename {vscode/OmobiLEDdisplay => firmware/LedDisplay}/lib/README (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/platformio.ini (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/src/BluetoothLeUartServer.cpp (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/src/EepromManager.cpp (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/src/LedDisplayController.cpp (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/src/OmobiLedDisplay.cpp (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/LedDisplay}/src/main.cpp (100%) rename {vscode/OmobiLEDdisplay => firmware/LedDisplay}/test/README (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/OmobiLEDdisplay}/.gitignore (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/OmobiLEDdisplay}/.travis.yml (100%) rename {vscode => firmware}/OmobiLEDdisplay/.vscode/extensions.json (100%) rename {vscode => firmware}/OmobiLEDdisplay/.vscode/settings.json (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/OmobiLEDdisplay}/include/README (100%) rename {vscode => firmware}/OmobiLEDdisplay/include/omobi_html.h (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/OmobiLEDdisplay}/lib/README (100%) rename {vscode => firmware}/OmobiLEDdisplay/platformio.ini (100%) rename {vscode => firmware}/OmobiLEDdisplay/src/index.html (100%) rename {vscode => firmware}/OmobiLEDdisplay/src/main.cpp (100%) rename {vscode/OmobiLEDdisplayBluetooth => firmware/OmobiLEDdisplay}/test/README (100%) diff --git a/Arduino/OmobiDisplay/OmobiDisplay.ino b/Arduino/OmobiDisplay/OmobiDisplay.ino deleted file mode 100644 index 9c97df4..0000000 --- a/Arduino/OmobiDisplay/OmobiDisplay.ino +++ /dev/null @@ -1,160 +0,0 @@ -#include -#include -#include -#include - -BLECharacteristic *pCharacteristic; -bool deviceConnected = false; -float txValue = 0; -const int readPin = 32; // Use GPIO number. See ESP32 board pinouts -const int LED = 2; // Could be different depending on the dev board. I used the DOIT ESP32 dev board. - -//std::string rxValue; // Could also make this a global var to access it in loop() - -// See the following for generating UUIDs: -// https://www.uuidgenerator.net/ - -#define SERVICE_UUID "6E400001-B5A3-F393-E0A9-E50E24DCCA9E" // UART service UUID -#define CHARACTERISTIC_UUID_RX "6E400002-B5A3-F393-E0A9-E50E24DCCA9E" -#define CHARACTERISTIC_UUID_TX "6E400003-B5A3-F393-E0A9-E50E24DCCA9E" - - -#include -#include -#include - -#define PIN 4 - -TaskHandle_t Task1; - -Adafruit_NeoMatrix matrix = Adafruit_NeoMatrix(8, 8, 2, 1, PIN, - NEO_TILE_TOP + NEO_TILE_LEFT + NEO_TILE_ROWS + NEO_TILE_PROGRESSIVE + - NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_ROWS + NEO_TILE_PROGRESSIVE, - NEO_GRB + NEO_KHZ800); - - -const uint16_t colors[] = { - matrix.Color(255, 0, 0), matrix.Color(0, 255, 0), matrix.Color(0, 0, 255) }; - -void Task1code(); - -int x = matrix.width(); -int pass = 0; -String scroll_text = "This is a test !!!"; - -void sendMessage(std::string message) { - - pCharacteristic->setValue(message); // Sending a test message -// pCharacteristic->setValue(txString); - - pCharacteristic->notify(); // Send the value to the app! -} - -class MyServerCallbacks: public BLEServerCallbacks { - void onConnect(BLEServer* pServer) { - deviceConnected = true; - }; - - void onDisconnect(BLEServer* pServer) { - deviceConnected = false; - } -}; - -class MyCallbacks: public BLECharacteristicCallbacks { - void onWrite(BLECharacteristic *pCharacteristic) { - std::string rxValue = pCharacteristic->getValue(); - - if (rxValue.length() > 0) { - Serial.println("*********"); - Serial.print("Received Value: "); - Serial.println(rxValue.c_str()); - Serial.println("*********"); - - scroll_text = String(rxValue.c_str()); - - sendMessage(rxValue); - } - } -}; - -void Task1code( void * pvParameters ) { - uint32_t color = 0; - for (;;) { - matrix.fillScreen(0); - matrix.setCursor(x, 0); - matrix.print(scroll_text.c_str()); - if (--x < (int)(-6 * scroll_text.length())) { - x = matrix.width(); - if (++pass >= 3) pass = 0; - matrix.setTextColor(colors[pass]); - } - - - matrix.drawPixel(0,0,color); - color = colorsetCallbacks(new MyServerCallbacks()); - - // Create the BLE Service - BLEService *pService = pServer->createService(SERVICE_UUID); - - // Create a BLE Characteristic - pCharacteristic = pService->createCharacteristic( - CHARACTERISTIC_UUID_TX, - BLECharacteristic::PROPERTY_NOTIFY - ); - - pCharacteristic->addDescriptor(new BLE2902()); - - BLECharacteristic *pCharacteristic = pService->createCharacteristic( - CHARACTERISTIC_UUID_RX, - BLECharacteristic::PROPERTY_READ | - BLECharacteristic::PROPERTY_WRITE - ); - - pCharacteristic->setCallbacks(new MyCallbacks()); - - // Start the service - pService->start(); - - // Start advertising - pServer->getAdvertising()->addServiceUUID(pService->getUUID()); - pServer->getAdvertising()->setScanResponse(true); - pServer->getAdvertising()->setMinPreferred(0x06); // functions that help with iPhone connections issue - pServer->getAdvertising()->setMinPreferred(0x12); - pServer->getAdvertising()->start(); - Serial.println("Waiting a client connection to notify..."); - - - - matrix.begin(); - matrix.setTextWrap(false); - matrix.setBrightness(40); - matrix.setTextColor(colors[0]); - - xTaskCreatePinnedToCore(Task1code, "Task1", 10000, NULL, 1, &Task1, 0); -} - -void loop() { - if (deviceConnected) { - sendMessage("PING"); - } - delay(1000); - -} diff --git a/vscode/OmobiLEDdisplay/.gitignore b/firmware/LedDisplay/.gitignore similarity index 100% rename from vscode/OmobiLEDdisplay/.gitignore rename to firmware/LedDisplay/.gitignore diff --git a/vscode/OmobiLEDdisplay/.travis.yml b/firmware/LedDisplay/.travis.yml similarity index 100% rename from vscode/OmobiLEDdisplay/.travis.yml rename to firmware/LedDisplay/.travis.yml diff --git a/vscode/OmobiLEDdisplayBluetooth/.vscode/extensions.json b/firmware/LedDisplay/.vscode/extensions.json similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/.vscode/extensions.json rename to firmware/LedDisplay/.vscode/extensions.json diff --git a/vscode/OmobiLEDdisplayBluetooth/.vscode/settings.json b/firmware/LedDisplay/.vscode/settings.json similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/.vscode/settings.json rename to firmware/LedDisplay/.vscode/settings.json diff --git a/vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h b/firmware/LedDisplay/include/BluetoothLeUartServer.h similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/include/BluetoothLeUartServer.h rename to firmware/LedDisplay/include/BluetoothLeUartServer.h diff --git a/vscode/OmobiLEDdisplayBluetooth/include/EepromManager.h b/firmware/LedDisplay/include/EepromManager.h similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/include/EepromManager.h rename to firmware/LedDisplay/include/EepromManager.h diff --git a/vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h b/firmware/LedDisplay/include/LedDisplayController.h similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/include/LedDisplayController.h rename to firmware/LedDisplay/include/LedDisplayController.h diff --git a/vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h b/firmware/LedDisplay/include/OmobiLedDisplay.h similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/include/OmobiLedDisplay.h rename to firmware/LedDisplay/include/OmobiLedDisplay.h diff --git a/vscode/OmobiLEDdisplay/include/README b/firmware/LedDisplay/include/README similarity index 100% rename from vscode/OmobiLEDdisplay/include/README rename to firmware/LedDisplay/include/README diff --git a/vscode/OmobiLEDdisplay/lib/README b/firmware/LedDisplay/lib/README similarity index 100% rename from vscode/OmobiLEDdisplay/lib/README rename to firmware/LedDisplay/lib/README diff --git a/vscode/OmobiLEDdisplayBluetooth/platformio.ini b/firmware/LedDisplay/platformio.ini similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/platformio.ini rename to firmware/LedDisplay/platformio.ini diff --git a/vscode/OmobiLEDdisplayBluetooth/src/BluetoothLeUartServer.cpp b/firmware/LedDisplay/src/BluetoothLeUartServer.cpp similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/src/BluetoothLeUartServer.cpp rename to firmware/LedDisplay/src/BluetoothLeUartServer.cpp diff --git a/vscode/OmobiLEDdisplayBluetooth/src/EepromManager.cpp b/firmware/LedDisplay/src/EepromManager.cpp similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/src/EepromManager.cpp rename to firmware/LedDisplay/src/EepromManager.cpp diff --git a/vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp b/firmware/LedDisplay/src/LedDisplayController.cpp similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/src/LedDisplayController.cpp rename to firmware/LedDisplay/src/LedDisplayController.cpp diff --git a/vscode/OmobiLEDdisplayBluetooth/src/OmobiLedDisplay.cpp b/firmware/LedDisplay/src/OmobiLedDisplay.cpp similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/src/OmobiLedDisplay.cpp rename to firmware/LedDisplay/src/OmobiLedDisplay.cpp diff --git a/vscode/OmobiLEDdisplayBluetooth/src/main.cpp b/firmware/LedDisplay/src/main.cpp similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/src/main.cpp rename to firmware/LedDisplay/src/main.cpp diff --git a/vscode/OmobiLEDdisplay/test/README b/firmware/LedDisplay/test/README similarity index 100% rename from vscode/OmobiLEDdisplay/test/README rename to firmware/LedDisplay/test/README diff --git a/vscode/OmobiLEDdisplayBluetooth/.gitignore b/firmware/OmobiLEDdisplay/.gitignore similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/.gitignore rename to firmware/OmobiLEDdisplay/.gitignore diff --git a/vscode/OmobiLEDdisplayBluetooth/.travis.yml b/firmware/OmobiLEDdisplay/.travis.yml similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/.travis.yml rename to firmware/OmobiLEDdisplay/.travis.yml diff --git a/vscode/OmobiLEDdisplay/.vscode/extensions.json b/firmware/OmobiLEDdisplay/.vscode/extensions.json similarity index 100% rename from vscode/OmobiLEDdisplay/.vscode/extensions.json rename to firmware/OmobiLEDdisplay/.vscode/extensions.json diff --git a/vscode/OmobiLEDdisplay/.vscode/settings.json b/firmware/OmobiLEDdisplay/.vscode/settings.json similarity index 100% rename from vscode/OmobiLEDdisplay/.vscode/settings.json rename to firmware/OmobiLEDdisplay/.vscode/settings.json diff --git a/vscode/OmobiLEDdisplayBluetooth/include/README b/firmware/OmobiLEDdisplay/include/README similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/include/README rename to firmware/OmobiLEDdisplay/include/README diff --git a/vscode/OmobiLEDdisplay/include/omobi_html.h b/firmware/OmobiLEDdisplay/include/omobi_html.h similarity index 100% rename from vscode/OmobiLEDdisplay/include/omobi_html.h rename to firmware/OmobiLEDdisplay/include/omobi_html.h diff --git a/vscode/OmobiLEDdisplayBluetooth/lib/README b/firmware/OmobiLEDdisplay/lib/README similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/lib/README rename to firmware/OmobiLEDdisplay/lib/README diff --git a/vscode/OmobiLEDdisplay/platformio.ini b/firmware/OmobiLEDdisplay/platformio.ini similarity index 100% rename from vscode/OmobiLEDdisplay/platformio.ini rename to firmware/OmobiLEDdisplay/platformio.ini diff --git a/vscode/OmobiLEDdisplay/src/index.html b/firmware/OmobiLEDdisplay/src/index.html similarity index 100% rename from vscode/OmobiLEDdisplay/src/index.html rename to firmware/OmobiLEDdisplay/src/index.html diff --git a/vscode/OmobiLEDdisplay/src/main.cpp b/firmware/OmobiLEDdisplay/src/main.cpp similarity index 100% rename from vscode/OmobiLEDdisplay/src/main.cpp rename to firmware/OmobiLEDdisplay/src/main.cpp diff --git a/vscode/OmobiLEDdisplayBluetooth/test/README b/firmware/OmobiLEDdisplay/test/README similarity index 100% rename from vscode/OmobiLEDdisplayBluetooth/test/README rename to firmware/OmobiLEDdisplay/test/README