From 540e6807ee295069b5f2b1a4bc01f02ed131f894 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 3 Aug 2022 11:16:45 +0200 Subject: [PATCH] Chore: more clean up --- LedDisplayController/QBluetoothLeUart | 1 - {LedDisplayController => app}/.gitignore | 0 .../LedDisplayController.pro | 0 .../android/AndroidManifest.xml | 0 .../android/build.gradle | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {LedDisplayController => app}/android/gradlew | 0 .../android/gradlew.bat | 0 .../android/res/drawable-hdpi/icon.png | Bin .../android/res/drawable-ldpi/icon.png | Bin .../android/res/drawable-mdpi/icon.png | Bin .../android/res/values/libs.xml | 0 .../favicon/GooglePlayBanner.png | Bin .../favicon/GooglePlayBanner.xcf | Bin .../favicon/favicon.cdr | Bin .../favicon/favicon.png | Bin .../favicon/favicon.xcf | Bin .../favicon/faviconNoOutline.png | Bin .../leddisplaybackend.cpp | 0 .../leddisplaybackend.h | 0 .../leddisplaytextmodel.cpp | 0 .../leddisplaytextmodel.h | 0 {LedDisplayController => app}/main.cpp | 0 .../ressources/qml/Chip.qml | 0 .../ressources/qml/ColorPicker.qml | 0 .../ressources/qml/ColorPickerDelegate.qml | 0 .../ressources/qml/ComboBoxDelegate.qml | 0 .../ressources/qml/ConnectPage.qml | 0 .../ressources/qml/ConnectedPage.qml | 0 .../ressources/qml/DisclaimerDialog.qml | 0 .../ressources/qml/DisplayEditDialog.qml | 0 .../ressources/qml/DisplayTextDelegate.qml | 0 .../qml/DisplayTextModelListView.qml | 0 .../ressources/qml/PasswordInputDelegate.qml | 0 .../ressources/qml/SpinBoxDelegate.qml | 0 .../ressources/qml/TextEditDialog.qml | 0 .../ressources/qml/TextInputDelegate.qml | 0 .../ressources/qml/main.qml | 0 .../ressources/qml/qml.qrc | 0 .../ressources/shared/fa5brands.woff | Bin .../ressources/shared/fa5solid.woff | Bin .../ressources/shared/itsblue.png | Bin .../ressources/shared/omobi.png | Bin .../ressources/shared/shared.qrc | 0 .../ressources/translations/de.qm | Bin .../ressources/translations/de.ts | 0 .../ressources/translations/translations.qrc | 0 .../screenshots/1.jpg | Bin .../screenshots/2.jpg | Bin .../screenshots/3.jpg | Bin .../screenshots/4.jpg | Bin firmware/{LedDisplay => }/.gitignore | 0 firmware/{LedDisplay => }/.travis.yml | 0 .../{LedDisplay => }/.vscode/extensions.json | 0 .../{LedDisplay => }/.vscode/settings.json | 0 firmware/OmobiLEDdisplay/.gitignore | 5 - firmware/OmobiLEDdisplay/.travis.yml | 67 ---- .../OmobiLEDdisplay/.vscode/extensions.json | 7 - .../OmobiLEDdisplay/.vscode/settings.json | 5 - firmware/OmobiLEDdisplay/include/README | 39 -- firmware/OmobiLEDdisplay/include/omobi_html.h | 2 - firmware/OmobiLEDdisplay/lib/README | 46 --- firmware/OmobiLEDdisplay/platformio.ini | 21 -- firmware/OmobiLEDdisplay/src/index.html | 323 ---------------- firmware/OmobiLEDdisplay/src/main.cpp | 354 ------------------ firmware/OmobiLEDdisplay/test/README | 11 - .../include/BluetoothLeUartServer.h | 0 .../{LedDisplay => }/include/EepromManager.h | 0 .../include/LedDisplayController.h | 0 .../include/OmobiLedDisplay.h | 0 firmware/{LedDisplay => }/include/README | 0 firmware/{LedDisplay => }/lib/README | 0 firmware/{LedDisplay => }/platformio.ini | 0 .../src/BluetoothLeUartServer.cpp | 0 .../{LedDisplay => }/src/EepromManager.cpp | 0 .../src/LedDisplayController.cpp | 0 .../{LedDisplay => }/src/OmobiLedDisplay.cpp | 0 firmware/{LedDisplay => }/src/main.cpp | 0 firmware/{LedDisplay => }/test/README | 0 .../Sicherungskopie_von_omobidisplay.cdr | Bin {corel => hardware}/omobidisplay.cdr | Bin 82 files changed, 881 deletions(-) delete mode 160000 LedDisplayController/QBluetoothLeUart rename {LedDisplayController => app}/.gitignore (100%) rename {LedDisplayController => app}/LedDisplayController.pro (100%) rename {LedDisplayController => app}/android/AndroidManifest.xml (100%) rename {LedDisplayController => app}/android/build.gradle (100%) rename {LedDisplayController => app}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename {LedDisplayController => app}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {LedDisplayController => app}/android/gradlew (100%) rename {LedDisplayController => app}/android/gradlew.bat (100%) rename {LedDisplayController => app}/android/res/drawable-hdpi/icon.png (100%) rename {LedDisplayController => app}/android/res/drawable-ldpi/icon.png (100%) rename {LedDisplayController => app}/android/res/drawable-mdpi/icon.png (100%) rename {LedDisplayController => app}/android/res/values/libs.xml (100%) rename {LedDisplayController => app}/favicon/GooglePlayBanner.png (100%) rename {LedDisplayController => app}/favicon/GooglePlayBanner.xcf (100%) rename {LedDisplayController => app}/favicon/favicon.cdr (100%) rename {LedDisplayController => app}/favicon/favicon.png (100%) rename {LedDisplayController => app}/favicon/favicon.xcf (100%) rename {LedDisplayController => app}/favicon/faviconNoOutline.png (100%) rename {LedDisplayController => app}/leddisplaybackend.cpp (100%) rename {LedDisplayController => app}/leddisplaybackend.h (100%) rename {LedDisplayController => app}/leddisplaytextmodel.cpp (100%) rename {LedDisplayController => app}/leddisplaytextmodel.h (100%) rename {LedDisplayController => app}/main.cpp (100%) rename {LedDisplayController => app}/ressources/qml/Chip.qml (100%) rename {LedDisplayController => app}/ressources/qml/ColorPicker.qml (100%) rename {LedDisplayController => app}/ressources/qml/ColorPickerDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/ComboBoxDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/ConnectPage.qml (100%) rename {LedDisplayController => app}/ressources/qml/ConnectedPage.qml (100%) rename {LedDisplayController => app}/ressources/qml/DisclaimerDialog.qml (100%) rename {LedDisplayController => app}/ressources/qml/DisplayEditDialog.qml (100%) rename {LedDisplayController => app}/ressources/qml/DisplayTextDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/DisplayTextModelListView.qml (100%) rename {LedDisplayController => app}/ressources/qml/PasswordInputDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/SpinBoxDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/TextEditDialog.qml (100%) rename {LedDisplayController => app}/ressources/qml/TextInputDelegate.qml (100%) rename {LedDisplayController => app}/ressources/qml/main.qml (100%) rename {LedDisplayController => app}/ressources/qml/qml.qrc (100%) rename {LedDisplayController => app}/ressources/shared/fa5brands.woff (100%) rename {LedDisplayController => app}/ressources/shared/fa5solid.woff (100%) rename {LedDisplayController => app}/ressources/shared/itsblue.png (100%) rename {LedDisplayController => app}/ressources/shared/omobi.png (100%) rename {LedDisplayController => app}/ressources/shared/shared.qrc (100%) rename {LedDisplayController => app}/ressources/translations/de.qm (100%) rename {LedDisplayController => app}/ressources/translations/de.ts (100%) rename {LedDisplayController => app}/ressources/translations/translations.qrc (100%) rename {LedDisplayController => app}/screenshots/1.jpg (100%) rename {LedDisplayController => app}/screenshots/2.jpg (100%) rename {LedDisplayController => app}/screenshots/3.jpg (100%) rename {LedDisplayController => app}/screenshots/4.jpg (100%) rename firmware/{LedDisplay => }/.gitignore (100%) rename firmware/{LedDisplay => }/.travis.yml (100%) rename firmware/{LedDisplay => }/.vscode/extensions.json (100%) rename firmware/{LedDisplay => }/.vscode/settings.json (100%) delete mode 100644 firmware/OmobiLEDdisplay/.gitignore delete mode 100644 firmware/OmobiLEDdisplay/.travis.yml delete mode 100644 firmware/OmobiLEDdisplay/.vscode/extensions.json delete mode 100644 firmware/OmobiLEDdisplay/.vscode/settings.json delete mode 100644 firmware/OmobiLEDdisplay/include/README delete mode 100644 firmware/OmobiLEDdisplay/include/omobi_html.h delete mode 100644 firmware/OmobiLEDdisplay/lib/README delete mode 100644 firmware/OmobiLEDdisplay/platformio.ini delete mode 100644 firmware/OmobiLEDdisplay/src/index.html delete mode 100644 firmware/OmobiLEDdisplay/src/main.cpp delete mode 100644 firmware/OmobiLEDdisplay/test/README rename firmware/{LedDisplay => }/include/BluetoothLeUartServer.h (100%) rename firmware/{LedDisplay => }/include/EepromManager.h (100%) rename firmware/{LedDisplay => }/include/LedDisplayController.h (100%) rename firmware/{LedDisplay => }/include/OmobiLedDisplay.h (100%) rename firmware/{LedDisplay => }/include/README (100%) rename firmware/{LedDisplay => }/lib/README (100%) rename firmware/{LedDisplay => }/platformio.ini (100%) rename firmware/{LedDisplay => }/src/BluetoothLeUartServer.cpp (100%) rename firmware/{LedDisplay => }/src/EepromManager.cpp (100%) rename firmware/{LedDisplay => }/src/LedDisplayController.cpp (100%) rename firmware/{LedDisplay => }/src/OmobiLedDisplay.cpp (100%) rename firmware/{LedDisplay => }/src/main.cpp (100%) rename firmware/{LedDisplay => }/test/README (100%) rename {corel => hardware}/Sicherungskopie_von_omobidisplay.cdr (100%) rename {corel => hardware}/omobidisplay.cdr (100%) diff --git a/LedDisplayController/QBluetoothLeUart b/LedDisplayController/QBluetoothLeUart deleted file mode 160000 index c72dc56..0000000 --- a/LedDisplayController/QBluetoothLeUart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c72dc564e144315032f1d0d1c132aafdb2392c8c diff --git a/LedDisplayController/.gitignore b/app/.gitignore similarity index 100% rename from LedDisplayController/.gitignore rename to app/.gitignore diff --git a/LedDisplayController/LedDisplayController.pro b/app/LedDisplayController.pro similarity index 100% rename from LedDisplayController/LedDisplayController.pro rename to app/LedDisplayController.pro diff --git a/LedDisplayController/android/AndroidManifest.xml b/app/android/AndroidManifest.xml similarity index 100% rename from LedDisplayController/android/AndroidManifest.xml rename to app/android/AndroidManifest.xml diff --git a/LedDisplayController/android/build.gradle b/app/android/build.gradle similarity index 100% rename from LedDisplayController/android/build.gradle rename to app/android/build.gradle diff --git a/LedDisplayController/android/gradle/wrapper/gradle-wrapper.jar b/app/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from LedDisplayController/android/gradle/wrapper/gradle-wrapper.jar rename to app/android/gradle/wrapper/gradle-wrapper.jar diff --git a/LedDisplayController/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from LedDisplayController/android/gradle/wrapper/gradle-wrapper.properties rename to app/android/gradle/wrapper/gradle-wrapper.properties diff --git a/LedDisplayController/android/gradlew b/app/android/gradlew similarity index 100% rename from LedDisplayController/android/gradlew rename to app/android/gradlew diff --git a/LedDisplayController/android/gradlew.bat b/app/android/gradlew.bat similarity index 100% rename from LedDisplayController/android/gradlew.bat rename to app/android/gradlew.bat diff --git a/LedDisplayController/android/res/drawable-hdpi/icon.png b/app/android/res/drawable-hdpi/icon.png similarity index 100% rename from LedDisplayController/android/res/drawable-hdpi/icon.png rename to app/android/res/drawable-hdpi/icon.png diff --git a/LedDisplayController/android/res/drawable-ldpi/icon.png b/app/android/res/drawable-ldpi/icon.png similarity index 100% rename from LedDisplayController/android/res/drawable-ldpi/icon.png rename to app/android/res/drawable-ldpi/icon.png diff --git a/LedDisplayController/android/res/drawable-mdpi/icon.png b/app/android/res/drawable-mdpi/icon.png similarity index 100% rename from LedDisplayController/android/res/drawable-mdpi/icon.png rename to app/android/res/drawable-mdpi/icon.png diff --git a/LedDisplayController/android/res/values/libs.xml b/app/android/res/values/libs.xml similarity index 100% rename from LedDisplayController/android/res/values/libs.xml rename to app/android/res/values/libs.xml diff --git a/LedDisplayController/favicon/GooglePlayBanner.png b/app/favicon/GooglePlayBanner.png similarity index 100% rename from LedDisplayController/favicon/GooglePlayBanner.png rename to app/favicon/GooglePlayBanner.png diff --git a/LedDisplayController/favicon/GooglePlayBanner.xcf b/app/favicon/GooglePlayBanner.xcf similarity index 100% rename from LedDisplayController/favicon/GooglePlayBanner.xcf rename to app/favicon/GooglePlayBanner.xcf diff --git a/LedDisplayController/favicon/favicon.cdr b/app/favicon/favicon.cdr similarity index 100% rename from LedDisplayController/favicon/favicon.cdr rename to app/favicon/favicon.cdr diff --git a/LedDisplayController/favicon/favicon.png b/app/favicon/favicon.png similarity index 100% rename from LedDisplayController/favicon/favicon.png rename to app/favicon/favicon.png diff --git a/LedDisplayController/favicon/favicon.xcf b/app/favicon/favicon.xcf similarity index 100% rename from LedDisplayController/favicon/favicon.xcf rename to app/favicon/favicon.xcf diff --git a/LedDisplayController/favicon/faviconNoOutline.png b/app/favicon/faviconNoOutline.png similarity index 100% rename from LedDisplayController/favicon/faviconNoOutline.png rename to app/favicon/faviconNoOutline.png diff --git a/LedDisplayController/leddisplaybackend.cpp b/app/leddisplaybackend.cpp similarity index 100% rename from LedDisplayController/leddisplaybackend.cpp rename to app/leddisplaybackend.cpp diff --git a/LedDisplayController/leddisplaybackend.h b/app/leddisplaybackend.h similarity index 100% rename from LedDisplayController/leddisplaybackend.h rename to app/leddisplaybackend.h diff --git a/LedDisplayController/leddisplaytextmodel.cpp b/app/leddisplaytextmodel.cpp similarity index 100% rename from LedDisplayController/leddisplaytextmodel.cpp rename to app/leddisplaytextmodel.cpp diff --git a/LedDisplayController/leddisplaytextmodel.h b/app/leddisplaytextmodel.h similarity index 100% rename from LedDisplayController/leddisplaytextmodel.h rename to app/leddisplaytextmodel.h diff --git a/LedDisplayController/main.cpp b/app/main.cpp similarity index 100% rename from LedDisplayController/main.cpp rename to app/main.cpp diff --git a/LedDisplayController/ressources/qml/Chip.qml b/app/ressources/qml/Chip.qml similarity index 100% rename from LedDisplayController/ressources/qml/Chip.qml rename to app/ressources/qml/Chip.qml diff --git a/LedDisplayController/ressources/qml/ColorPicker.qml b/app/ressources/qml/ColorPicker.qml similarity index 100% rename from LedDisplayController/ressources/qml/ColorPicker.qml rename to app/ressources/qml/ColorPicker.qml diff --git a/LedDisplayController/ressources/qml/ColorPickerDelegate.qml b/app/ressources/qml/ColorPickerDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/ColorPickerDelegate.qml rename to app/ressources/qml/ColorPickerDelegate.qml diff --git a/LedDisplayController/ressources/qml/ComboBoxDelegate.qml b/app/ressources/qml/ComboBoxDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/ComboBoxDelegate.qml rename to app/ressources/qml/ComboBoxDelegate.qml diff --git a/LedDisplayController/ressources/qml/ConnectPage.qml b/app/ressources/qml/ConnectPage.qml similarity index 100% rename from LedDisplayController/ressources/qml/ConnectPage.qml rename to app/ressources/qml/ConnectPage.qml diff --git a/LedDisplayController/ressources/qml/ConnectedPage.qml b/app/ressources/qml/ConnectedPage.qml similarity index 100% rename from LedDisplayController/ressources/qml/ConnectedPage.qml rename to app/ressources/qml/ConnectedPage.qml diff --git a/LedDisplayController/ressources/qml/DisclaimerDialog.qml b/app/ressources/qml/DisclaimerDialog.qml similarity index 100% rename from LedDisplayController/ressources/qml/DisclaimerDialog.qml rename to app/ressources/qml/DisclaimerDialog.qml diff --git a/LedDisplayController/ressources/qml/DisplayEditDialog.qml b/app/ressources/qml/DisplayEditDialog.qml similarity index 100% rename from LedDisplayController/ressources/qml/DisplayEditDialog.qml rename to app/ressources/qml/DisplayEditDialog.qml diff --git a/LedDisplayController/ressources/qml/DisplayTextDelegate.qml b/app/ressources/qml/DisplayTextDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/DisplayTextDelegate.qml rename to app/ressources/qml/DisplayTextDelegate.qml diff --git a/LedDisplayController/ressources/qml/DisplayTextModelListView.qml b/app/ressources/qml/DisplayTextModelListView.qml similarity index 100% rename from LedDisplayController/ressources/qml/DisplayTextModelListView.qml rename to app/ressources/qml/DisplayTextModelListView.qml diff --git a/LedDisplayController/ressources/qml/PasswordInputDelegate.qml b/app/ressources/qml/PasswordInputDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/PasswordInputDelegate.qml rename to app/ressources/qml/PasswordInputDelegate.qml diff --git a/LedDisplayController/ressources/qml/SpinBoxDelegate.qml b/app/ressources/qml/SpinBoxDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/SpinBoxDelegate.qml rename to app/ressources/qml/SpinBoxDelegate.qml diff --git a/LedDisplayController/ressources/qml/TextEditDialog.qml b/app/ressources/qml/TextEditDialog.qml similarity index 100% rename from LedDisplayController/ressources/qml/TextEditDialog.qml rename to app/ressources/qml/TextEditDialog.qml diff --git a/LedDisplayController/ressources/qml/TextInputDelegate.qml b/app/ressources/qml/TextInputDelegate.qml similarity index 100% rename from LedDisplayController/ressources/qml/TextInputDelegate.qml rename to app/ressources/qml/TextInputDelegate.qml diff --git a/LedDisplayController/ressources/qml/main.qml b/app/ressources/qml/main.qml similarity index 100% rename from LedDisplayController/ressources/qml/main.qml rename to app/ressources/qml/main.qml diff --git a/LedDisplayController/ressources/qml/qml.qrc b/app/ressources/qml/qml.qrc similarity index 100% rename from LedDisplayController/ressources/qml/qml.qrc rename to app/ressources/qml/qml.qrc diff --git a/LedDisplayController/ressources/shared/fa5brands.woff b/app/ressources/shared/fa5brands.woff similarity index 100% rename from LedDisplayController/ressources/shared/fa5brands.woff rename to app/ressources/shared/fa5brands.woff diff --git a/LedDisplayController/ressources/shared/fa5solid.woff b/app/ressources/shared/fa5solid.woff similarity index 100% rename from LedDisplayController/ressources/shared/fa5solid.woff rename to app/ressources/shared/fa5solid.woff diff --git a/LedDisplayController/ressources/shared/itsblue.png b/app/ressources/shared/itsblue.png similarity index 100% rename from LedDisplayController/ressources/shared/itsblue.png rename to app/ressources/shared/itsblue.png diff --git a/LedDisplayController/ressources/shared/omobi.png b/app/ressources/shared/omobi.png similarity index 100% rename from LedDisplayController/ressources/shared/omobi.png rename to app/ressources/shared/omobi.png diff --git a/LedDisplayController/ressources/shared/shared.qrc b/app/ressources/shared/shared.qrc similarity index 100% rename from LedDisplayController/ressources/shared/shared.qrc rename to app/ressources/shared/shared.qrc diff --git a/LedDisplayController/ressources/translations/de.qm b/app/ressources/translations/de.qm similarity index 100% rename from LedDisplayController/ressources/translations/de.qm rename to app/ressources/translations/de.qm diff --git a/LedDisplayController/ressources/translations/de.ts b/app/ressources/translations/de.ts similarity index 100% rename from LedDisplayController/ressources/translations/de.ts rename to app/ressources/translations/de.ts diff --git a/LedDisplayController/ressources/translations/translations.qrc b/app/ressources/translations/translations.qrc similarity index 100% rename from LedDisplayController/ressources/translations/translations.qrc rename to app/ressources/translations/translations.qrc diff --git a/LedDisplayController/screenshots/1.jpg b/app/screenshots/1.jpg similarity index 100% rename from LedDisplayController/screenshots/1.jpg rename to app/screenshots/1.jpg diff --git a/LedDisplayController/screenshots/2.jpg b/app/screenshots/2.jpg similarity index 100% rename from LedDisplayController/screenshots/2.jpg rename to app/screenshots/2.jpg diff --git a/LedDisplayController/screenshots/3.jpg b/app/screenshots/3.jpg similarity index 100% rename from LedDisplayController/screenshots/3.jpg rename to app/screenshots/3.jpg diff --git a/LedDisplayController/screenshots/4.jpg b/app/screenshots/4.jpg similarity index 100% rename from LedDisplayController/screenshots/4.jpg rename to app/screenshots/4.jpg diff --git a/firmware/LedDisplay/.gitignore b/firmware/.gitignore similarity index 100% rename from firmware/LedDisplay/.gitignore rename to firmware/.gitignore diff --git a/firmware/LedDisplay/.travis.yml b/firmware/.travis.yml similarity index 100% rename from firmware/LedDisplay/.travis.yml rename to firmware/.travis.yml diff --git a/firmware/LedDisplay/.vscode/extensions.json b/firmware/.vscode/extensions.json similarity index 100% rename from firmware/LedDisplay/.vscode/extensions.json rename to firmware/.vscode/extensions.json diff --git a/firmware/LedDisplay/.vscode/settings.json b/firmware/.vscode/settings.json similarity index 100% rename from firmware/LedDisplay/.vscode/settings.json rename to firmware/.vscode/settings.json diff --git a/firmware/OmobiLEDdisplay/.gitignore b/firmware/OmobiLEDdisplay/.gitignore deleted file mode 100644 index 89cc49c..0000000 --- a/firmware/OmobiLEDdisplay/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.pio -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json -.vscode/ipch diff --git a/firmware/OmobiLEDdisplay/.travis.yml b/firmware/OmobiLEDdisplay/.travis.yml deleted file mode 100644 index a8bbc57..0000000 --- a/firmware/OmobiLEDdisplay/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/firmware/OmobiLEDdisplay/.vscode/extensions.json b/firmware/OmobiLEDdisplay/.vscode/extensions.json deleted file mode 100644 index 0f0d740..0000000 --- a/firmware/OmobiLEDdisplay/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ] -} diff --git a/firmware/OmobiLEDdisplay/.vscode/settings.json b/firmware/OmobiLEDdisplay/.vscode/settings.json deleted file mode 100644 index 9e37c85..0000000 --- a/firmware/OmobiLEDdisplay/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "files.associations": { - "functional": "cpp" - } -} \ No newline at end of file diff --git a/firmware/OmobiLEDdisplay/include/README b/firmware/OmobiLEDdisplay/include/README deleted file mode 100644 index 45496b1..0000000 --- a/firmware/OmobiLEDdisplay/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/firmware/OmobiLEDdisplay/include/omobi_html.h b/firmware/OmobiLEDdisplay/include/omobi_html.h deleted file mode 100644 index 862edf6..0000000 --- a/firmware/OmobiLEDdisplay/include/omobi_html.h +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/firmware/OmobiLEDdisplay/lib/README b/firmware/OmobiLEDdisplay/lib/README deleted file mode 100644 index 8c9c29c..0000000 --- a/firmware/OmobiLEDdisplay/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/firmware/OmobiLEDdisplay/platformio.ini b/firmware/OmobiLEDdisplay/platformio.ini deleted file mode 100644 index d084019..0000000 --- a/firmware/OmobiLEDdisplay/platformio.ini +++ /dev/null @@ -1,21 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:nodemcu] -platform = espressif8266 -board = nodemcuv2 -framework = arduino -lib_deps = - Wire - SPI - adafruit/Adafruit GFX Library@^1.10.1 - adafruit/Adafruit BusIO@1.4.1 - makuna/NeoPixelBus@^2.6.0 - aligator/NeoPixelBusGfx@^1.1.0 diff --git a/firmware/OmobiLEDdisplay/src/index.html b/firmware/OmobiLEDdisplay/src/index.html deleted file mode 100644 index 075a48c..0000000 --- a/firmware/OmobiLEDdisplay/src/index.html +++ /dev/null @@ -1,323 +0,0 @@ -const char index_html[] PROGMEM = R"rawliteral( - - - - - - - - - - -)rawliteral"; \ No newline at end of file diff --git a/firmware/OmobiLEDdisplay/src/main.cpp b/firmware/OmobiLEDdisplay/src/main.cpp deleted file mode 100644 index bd456ee..0000000 --- a/firmware/OmobiLEDdisplay/src/main.cpp +++ /dev/null @@ -1,354 +0,0 @@ -// Adafruit_NeoMatrix example for tiled NeoPixel matrices. Scrolls -// 'Howdy' across three 10x8 NeoPixel grids that were created using -// NeoPixel 60 LEDs per meter flex strip. - -#include -#include -#include -#include -#ifndef PSTR - #define PSTR // Make Arduino Due happy -#endif -#include -#include -#include -#include -#include "omobi_html.h" - -#define PIN D8 - -#include "index.html" - - -Adafruit_NeoMatrix matrix = Adafruit_NeoMatrix(8, 8, 6, 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), matrix.Color(255, 255, 255) }; - -enum text_align_t {TEXTLEFT, TEXTCENTER, TEXTRIGHT}; -enum color_t {RED, GREEN, BLUE, WHITE}; - -const uint16_t text_nr_sets = 5; -const uint16_t MAX_TXT_LENGTH = 256; -typedef struct text_set_t { - const char text[MAX_TXT_LENGTH]; - uint16_t time_ms; - color_t color; - text_align_t align; - bool text_scroll; - uint16_t text_scroll_pass; - bool active; -} text_set_t; - -typedef struct sets_t { - text_set_t sets[text_nr_sets]; - char valid[3]; -} sets_t; - -const int nr_param_names = 7; -const String set_param_name[nr_param_names] = {"text_", "time_", "color_", "align_", "scroll_", "scroll_runs_", "active_"}; -enum set_param_index_t {PTEXT, PTIME, PCOLOR, PALIGN, PSCROLL, PSCROLL_RUNS, PACTIVE}; -const uint16_t DISP_STRUCT_SIZE = sizeof(sets_t); -sets_t text_sets = -{ - { -// TEXT , SHOWTIME, COLOR, ALIGNMENT, SCROLL, SCROLLNR, ACTIVE - {"itsblue",5000, BLUE, TEXTCENTER, false, 0, true}, - {"",0, RED, TEXTCENTER, false, 4, false}, - {"",0, RED, TEXTCENTER, false, 8, false}, - {"",0, RED, TEXTCENTER, false, 1, false}, - {"",0, RED, TEXTCENTER, false, 0, false}, - }, - "OK" -}; - -uint16_t text_curr_nr = 0; -uint32_t text_set_starttime = 0; - -int text_pos = matrix.width(); -unsigned int text_pass = 0; -unsigned int textpixel = 0; - -bool disp_show = false; - - -AsyncWebServer server(80); -const char* ssid = "OmobiLeds"; -const char* password = "OmobiLeds"; - -void notFound(AsyncWebServerRequest *request) { - request->send(404, "text/plain", "URL not found"); -} - -void disp_scroll_text(); -void disp_switch_text(); -void disp_start_set(); -void disp_init(); -void show_matrix(const char* text, int pos, uint16_t color); -String get_paramstring_from_struct(String name); -void set_param_to_struct(String name, String value); -String getset_param_at_struct(String name, String value, bool set); -void storeDisplaySet(); -bool loadDisplaySet(); - -void setup() { - -//ESP.eraseConfig(); -//ESP.reset(); - - Serial.begin(9600); - matrix.begin(); - matrix.setTextWrap(false); - matrix.setBrightness(40); - - loadDisplaySet(); - - Serial.printf("Los\n"); - - WiFi.softAP(ssid, password); - - IPAddress IP = WiFi.softAPIP(); - Serial.print("AP IP address: "); - Serial.println(IP); - - server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/html",index_html); - Serial.println("webpage sent"); - }); - - server.on("/loadcurrent", HTTP_GET, [] (AsyncWebServerRequest *request) { - String message = "nrsets=" + String(text_nr_sets); - for(uint16_t set = 0; set < text_nr_sets; set++) - { - for(uint16_t parm = 0; parm < nr_param_names; parm++ ) - { - message += "&" + get_paramstring_from_struct(set_param_name[parm]+String(set)); - } - } - Serial.printf("Got load currentvalues request.\n"); - request->send(200, "text/plain", message); - }); - - server.on("/setcurrent", HTTP_GET, [] (AsyncWebServerRequest *request) { - int paramsNr = request->params(); - Serial.printf("Got set currentvalues request.\n"); - for(int i=0;igetParam(i); - set_param_to_struct(String(p->name()), String(p->value())); - } - request->send(200, "text/plain", "OK"); - storeDisplaySet(); - disp_init(); - }); - - server.onNotFound(notFound); - - server.begin(); - - disp_init(); - -} - -void loop() { - if(true == disp_show) - { - disp_start_set(); - if(true == text_sets.sets[text_curr_nr].active) - { - if(text_sets.sets[text_curr_nr].text !='\0') - { - if(text_sets.sets[text_curr_nr].text_scroll) - { - disp_scroll_text(); - } - } - } - } -} - -void disp_init() -{ - text_curr_nr = 0; - text_set_starttime = 0; - text_pass = 0; - disp_show = true; -} - -void disp_scroll_text() -{ - matrix.fillScreen(0); - show_matrix(text_sets.sets[text_curr_nr].text, text_pos, text_sets.sets[text_curr_nr].color); - (int)text_pos--; - if(int(text_pos + textpixel) < 0) { - text_pos = matrix.width(); - text_pass++; - Serial.printf("Pass[%d] - set nr %d, Text: '%s' \n", text_pass, text_curr_nr, text_sets.sets[text_curr_nr].text); - } - delay(100); -} - -void disp_start_set() -{ - if( (0 == text_set_starttime) || - (text_sets.sets[text_curr_nr].text =='\0') || text_sets.sets[text_curr_nr].active == false || - ((text_sets.sets[text_curr_nr].text_scroll == false) && (text_sets.sets[text_curr_nr].time_ms > 0) && ((millis() - text_set_starttime ) >= text_sets.sets[text_curr_nr].time_ms)) || - ((text_sets.sets[text_curr_nr].text_scroll == true) && (text_sets.sets[text_curr_nr].text_scroll_pass > 0) && ( text_pass >= text_sets.sets[text_curr_nr].text_scroll_pass)) || - (((text_sets.sets[text_curr_nr].text_scroll_pass == 0) || text_sets.sets[text_curr_nr].text_scroll == false) && (text_sets.sets[text_curr_nr].time_ms == 0) && ((millis() - text_set_starttime ) >= 10000)) - ) - { - //Serial.printf("[%lu] Meet start set condition. Curr set is %d. \n", millis(), text_curr_nr); - if(0 < text_set_starttime || text_sets.sets[text_curr_nr].text =='\0' || text_sets.sets[text_curr_nr].active == false ) text_curr_nr++; - if(text_curr_nr == text_nr_sets) text_curr_nr = 0; - text_pass = 0; - if(text_sets.sets[text_curr_nr].text !='\0' && text_sets.sets[text_curr_nr].active == true) - { - Serial.printf("[%lu] Set %d. Runtime %d. Text:'%s'\n", millis(), text_curr_nr, text_sets.sets[text_curr_nr].time_ms, text_sets.sets[text_curr_nr].text); - matrix.fillScreen(0); - textpixel = 6*strlen(text_sets.sets[text_curr_nr].text); - switch(text_sets.sets[text_curr_nr].align) - { - case TEXTLEFT: - text_pos = 0; - break; - case TEXTRIGHT: - text_pos = matrix.width(); - break; - case TEXTCENTER: - text_pos = matrix.width() - textpixel; - text_pos = text_pos / 2; - break; - } - - show_matrix(text_sets.sets[text_curr_nr].text, text_pos, text_sets.sets[text_curr_nr].color); - text_set_starttime = millis(); - } - } -} - -void show_matrix(const char* text, int pos, uint16_t color) -{ - Serial.printf("TEXT: %s (pos=%d, color=%d)\n", text, pos, color); - matrix.setTextColor(colors[color]); - matrix.setCursor(pos, 0); - matrix.print(text); - matrix.show(); -} - - -void storeDisplaySet() -{ - // write conf to EEPROM - EEPROM.begin(DISP_STRUCT_SIZE); - //for (size_t i = 0 ; i < DISP_STRUCT_SIZE ; i++) - //{ - // EEPROM.write(i, 0); - //} - strncpy( text_sets.valid , "OK", sizeof(text_sets.valid) ); - EEPROM.put(0, text_sets); - EEPROM.commit(); - EEPROM.end(); -} - -bool loadDisplaySet() -{ - bool rc = false; - sets_t buf = {}; - // read conf from EEPROM - EEPROM.begin(DISP_STRUCT_SIZE); - EEPROM.get(0, buf); - EEPROM.end(); - if (strcmp(buf.valid, "OK") == 0) - { - rc = true; - memcpy(&text_sets,&buf,sizeof(text_sets)); - } - else - { - memset(&text_sets,0,sizeof(text_sets)); - } - - return rc; - -} - -String get_paramstring_from_struct(String name) -{ - return(getset_param_at_struct(name, "", false)); -} - -void set_param_to_struct(String name, String value) -{ - getset_param_at_struct(name, value, true); -} - -String getset_param_at_struct(String name, String value, bool set) -{ - String name_value = ""; - int name_setnr_index = name.lastIndexOf("_"); - int name_setnr = -1; - int name_index = -1; - String name_name = "unknown"; - if(name_setnr_index > 0) - { - name_setnr = name.substring(name_setnr_index+1).toInt(); - name_name = name.substring(0, name_setnr_index+1); - - for(int pnr = 0; pnr < nr_param_names; pnr++) - { - if(name_name == set_param_name[pnr]) - { - name_index = pnr; - break; - } - } - //Serial.printf("Param: (name=%s,set=%d, index=%d) %s = %s \n", name_name.c_str(), name_setnr, name_index, name.c_str(), value.c_str()); - if(name_index != -1 && name_setnr != -1 && name_name != "unknown") - { - name_value += name_name + String(name_setnr) + "="; - switch(name_index) - { - case PCOLOR: - if(true == set) - text_sets.sets[name_setnr].color = (color_t)value.toInt(); - name_value += String(text_sets.sets[name_setnr].color); - break; - case PTEXT: - if(true == set) - snprintf((char*)text_sets.sets[name_setnr].text, MAX_TXT_LENGTH, value.c_str()); - name_value += String(text_sets.sets[name_setnr].text); - break; - case PTIME: - if(true == set) - text_sets.sets[name_setnr].time_ms = value.toInt()*1000; - name_value += String(text_sets.sets[name_setnr].time_ms /1000); - break; - case PSCROLL: - if(true == set) - text_sets.sets[name_setnr].text_scroll = (value=="true")?true:false; - name_value += String(text_sets.sets[name_setnr].text_scroll); - break; - case PACTIVE: - if(true == set) - text_sets.sets[name_setnr].active = (value=="true")?true:false; - name_value += String(text_sets.sets[name_setnr].active); - break; - case PALIGN: - if(true == set) - text_sets.sets[name_setnr].align = (text_align_t)value.toInt(); - name_value += String(text_sets.sets[name_setnr].align); - break; - case PSCROLL_RUNS: - if(true == set) - text_sets.sets[name_setnr].text_scroll_pass = value.toInt(); - name_value += String(text_sets.sets[name_setnr].text_scroll_pass); - break; - } - //Serial.printf("get/set %s\n", name_value.c_str()); - } - } - return(name_value); -} - diff --git a/firmware/OmobiLEDdisplay/test/README b/firmware/OmobiLEDdisplay/test/README deleted file mode 100644 index c3b0ed6..0000000 --- a/firmware/OmobiLEDdisplay/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/firmware/LedDisplay/include/BluetoothLeUartServer.h b/firmware/include/BluetoothLeUartServer.h similarity index 100% rename from firmware/LedDisplay/include/BluetoothLeUartServer.h rename to firmware/include/BluetoothLeUartServer.h diff --git a/firmware/LedDisplay/include/EepromManager.h b/firmware/include/EepromManager.h similarity index 100% rename from firmware/LedDisplay/include/EepromManager.h rename to firmware/include/EepromManager.h diff --git a/firmware/LedDisplay/include/LedDisplayController.h b/firmware/include/LedDisplayController.h similarity index 100% rename from firmware/LedDisplay/include/LedDisplayController.h rename to firmware/include/LedDisplayController.h diff --git a/firmware/LedDisplay/include/OmobiLedDisplay.h b/firmware/include/OmobiLedDisplay.h similarity index 100% rename from firmware/LedDisplay/include/OmobiLedDisplay.h rename to firmware/include/OmobiLedDisplay.h diff --git a/firmware/LedDisplay/include/README b/firmware/include/README similarity index 100% rename from firmware/LedDisplay/include/README rename to firmware/include/README diff --git a/firmware/LedDisplay/lib/README b/firmware/lib/README similarity index 100% rename from firmware/LedDisplay/lib/README rename to firmware/lib/README diff --git a/firmware/LedDisplay/platformio.ini b/firmware/platformio.ini similarity index 100% rename from firmware/LedDisplay/platformio.ini rename to firmware/platformio.ini diff --git a/firmware/LedDisplay/src/BluetoothLeUartServer.cpp b/firmware/src/BluetoothLeUartServer.cpp similarity index 100% rename from firmware/LedDisplay/src/BluetoothLeUartServer.cpp rename to firmware/src/BluetoothLeUartServer.cpp diff --git a/firmware/LedDisplay/src/EepromManager.cpp b/firmware/src/EepromManager.cpp similarity index 100% rename from firmware/LedDisplay/src/EepromManager.cpp rename to firmware/src/EepromManager.cpp diff --git a/firmware/LedDisplay/src/LedDisplayController.cpp b/firmware/src/LedDisplayController.cpp similarity index 100% rename from firmware/LedDisplay/src/LedDisplayController.cpp rename to firmware/src/LedDisplayController.cpp diff --git a/firmware/LedDisplay/src/OmobiLedDisplay.cpp b/firmware/src/OmobiLedDisplay.cpp similarity index 100% rename from firmware/LedDisplay/src/OmobiLedDisplay.cpp rename to firmware/src/OmobiLedDisplay.cpp diff --git a/firmware/LedDisplay/src/main.cpp b/firmware/src/main.cpp similarity index 100% rename from firmware/LedDisplay/src/main.cpp rename to firmware/src/main.cpp diff --git a/firmware/LedDisplay/test/README b/firmware/test/README similarity index 100% rename from firmware/LedDisplay/test/README rename to firmware/test/README diff --git a/corel/Sicherungskopie_von_omobidisplay.cdr b/hardware/Sicherungskopie_von_omobidisplay.cdr similarity index 100% rename from corel/Sicherungskopie_von_omobidisplay.cdr rename to hardware/Sicherungskopie_von_omobidisplay.cdr diff --git a/corel/omobidisplay.cdr b/hardware/omobidisplay.cdr similarity index 100% rename from corel/omobidisplay.cdr rename to hardware/omobidisplay.cdr