Refactor for more readable code and more C++ #100

boerge1 · 2021-11-01T15:02:33Z

Ich habe ein paar Stunden verbracht und die DEV Version umgeschrieben.
Der Code ist jetzt lesbarer und C++ hat Einzug gehalten.
Ich habe mich bemüht, das alte Verhalten nicht zu ändern, außer dass nach dem Startup und nach dem Karte auflegen als Feedback ein kurzer Ton kommt.

Folgende Issues oder neue Features wurden implementiert:

komplettes Refaktoring
Zurückspulen im Partymodus von-bis von Track 1 keine Wiedergabe #95
Formatierungsfehler? Else-Clause nicht umklammert, dafür sinnlose Klammern hinter dem ungeklammerten Else-Statement. #90
handleNext() des aktiven modifiers kann bei einem Liedwechsel mehrfach aufgerufen werden #76
Fehlende disableStandbyTimer() aufrufe. #75
Possible memory leak in function readCard #43
Rückwärtsspulen im Spezialmodus (Album) #37
Neues Feature: neuer Mode: Hörbuch einzeln (nur ein Titel wird gespielt und Fortschritt gespeichert
Neues Feature: Pause, wenn Karte entfernt wird (lässt sich per Einstellungen steuern)

* Refactor all into classes * use enums for better readable code * remove global variables * fix issue xfjx#37 (Rückwärtsspulen im Spezialmodus (Album)) * fix issue xfjx#87 (mute because 3 button pressed when adminmenü locked) * fix issue xfjx#70 (Don't leak memory when removing modifiers) * add startup jingle

* restore old modifier codes * renaming and improvements in buttons * fix resetting EEPROM for addresses > 0xff * do not repeatSingle after admin menue

* if the same card is used after removing: the track is continued

* fix bug: no pause if card is removed before track was started * add settings (EEPROM) for this feature

New feature: pause on card removed

new mode Hoerbuch einzeln

xfjx · 2021-11-29T18:30:06Z

Hallo boerge,

das sieht tatsächlich sehr gut aus ;)

Könntest du mir wohl deine Kontaktdaten per Mail zukommen lassen? Ich arbeite aktuell auch an einem kompletten Rewrite, eventuell magst du da auch mal drüber schauen und ggf. unterstützen? Ziel wäre dabei, dass ganze noch deutlich modularer und erweiterbar zu machen.

Am besten einfach eine Mail an Thorsten@voss.earth

Danke

* fix bug: writing card not possible (introduced by pause if card removed feature)

* put all constants into new file constants.hpp * make activeHigh/Low for pins configurable * refactor logging (with severity) * do increase/decrease volume by setvolume() * fix bug: no delete of modifier * fix bug: no play after pause - up/down - pause

* refactor handling chip card (do more in class Chip_card)

* change some loggings to save program space

* simplify logging (use constexpr function)

* fix buttons in voice menu (if !settings.invertVolumeButtons)

* first draft version

* improvements and fixes

* remove remaining delays

* Change version and Readme

* this can be used for ShortCuts as well as for cards * fix bug not storing

phschoen · 2022-03-10T10:01:09Z

is there any update if this pr can be integrated soon? just asking since there the last pr/commit is 2 years ago.

State machine

boerge1 · 2022-03-16T18:06:48Z

@phschoen
I think this PR will be never merged as no other PR is merged. But of course you can use my DEV branch. I made many improvements, the main is using a state machine instead of "spaghetti code" and waits.

boerge1 · 2022-03-16T18:21:04Z

Ich habe noch weiter entwickelt und diesen PR erweitert:

völlig neues Logging
es lassen sich viele Sachen in der Datei const.hpp konfigurieren
Implementierung einer State Machine
alle Tracks werden beim Auflegen der Karte in eine Queue geschrieben und nicht erst beim nextTrack ermittelt
neuer Mode für Short Cut und Karte: wiederhole die letzte Karte
ein Short Cut lässt sich jetzt löschen (nach Auswahl des Short Cuts einfach das Admin Menü abbrechen)
Konfigurationsdateien für VS Code + plattformio

Achtung: es ist jetzt c++17 erforderlich. Wer nicht plattformio verwendet, muss die Datei platform.txt editieren
compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++17 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -Wno-error=narrowing -MMD -flto

phschoen · 2022-03-17T08:24:37Z

@boerge1 danke fürs update. ich bin mittlerweile auch auf deinem dev branch. 👍
@xfjx schade das es keine Updates mehr gibt vielleicht überlegst du dir eine community github Organisation/branch mit mehreren Review Leuten zu eröffnen, sodass die Arbeit nicht an nur einem hängt.

* framework for additional command sources * implement serial input as additional command source

Command sources

boerge1 · 2022-11-03T14:34:02Z

Wird fortgesetzt im Projekt https://github.com/tonuino/TonUINO-TNG

bernd and others added 9 commits October 30, 2021 16:39

Play jingel at the end of admin menu after writing settings

512e13d

Some improvements and bug fixes

4c62aa2

* restore old modifier codes * renaming and improvements in buttons * fix resetting EEPROM for addresses > 0xff * do not repeatSingle after admin menue

new mode Hoerbuch einzeln

70586dd

New feature: pause on card removed

f6950cd

New feature: pause on card removed

0e188f4

* if the same card is used after removing: the track is continued

New feature: pause on card removed

233c34d

* fix bug: no pause if card is removed before track was started * add settings (EEPROM) for this feature

Merge pull request #2 from boerge1/pause_if_card_removed

5fb4324

New feature: pause on card removed

Merge pull request #1 from boerge1/new_mode_hoerbuch1

cd7c05f

new mode Hoerbuch einzeln

boerge1 added 19 commits December 9, 2021 19:34

fix writing card

58cdd54

* fix bug: writing card not possible (introduced by pause if card removed feature)

Improvements

64cb654

* put all constants into new file constants.hpp * make activeHigh/Low for pins configurable * refactor logging (with severity) * do increase/decrease volume by setvolume() * fix bug: no delete of modifier * fix bug: no play after pause - up/down - pause

Improvements

212121a

* refactor handling chip card (do more in class Chip_card)

Improvements

2f18600

* change some loggings to save program space

Improvements

8710122

* simplify logging (use constexpr function)

Improvements

3f6df35

* fix buttons in voice menu (if !settings.invertVolumeButtons)

new state machine

8317942

* first draft version

new state machine

13d5dc4

* improvements and fixes

new state machine

f4b7294

* improvements and fixes

new state machine

1910368

* remove remaining delays

new state machine

0591b15

* Change version and Readme

queue all track and improvements

806831f

change .gitignore

c526f77

Support for vs code and platformio

0dacbed

Minor improvements to reduce program memory

1eb498e

Normalize mp3

ce09b1c

New Feature: repeat last card

cf39605

* this can be used for ShortCuts as well as for cards * fix bug not storing

Bug Fix: possibility to choose 99 folder, not only 10

f1d019c

Improvements for program size

541e7ed

boerge1 and others added 2 commits March 16, 2022 18:41

Delete Shortcut + play after start if card is on

f4bcff3

Merge pull request #4 from boerge1/state_machine

b574f98

State machine

boerge1 and others added 5 commits April 9, 2022 15:50

Command sources

fa05e70

* framework for additional command sources * implement serial input as additional command source

add hint for using -std=gnu++17 in Readme

50726ef

Disable serial input as command source for save memory

a37540d

Merge pull request #5 from boerge1/command_sources

9e85b7d

Command sources

Fix Readme

a007005

Update README.md

fdccc96

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor for more readable code and more C++ #100

Refactor for more readable code and more C++ #100

boerge1 commented Nov 1, 2021 •

edited

Loading

xfjx commented Nov 29, 2021

phschoen commented Mar 10, 2022

boerge1 commented Mar 16, 2022

boerge1 commented Mar 16, 2022 •

edited

Loading

phschoen commented Mar 17, 2022

boerge1 commented Nov 3, 2022

Refactor for more readable code and more C++ #100

Are you sure you want to change the base?

Refactor for more readable code and more C++ #100

Conversation

boerge1 commented Nov 1, 2021 • edited Loading

xfjx commented Nov 29, 2021

phschoen commented Mar 10, 2022

boerge1 commented Mar 16, 2022

boerge1 commented Mar 16, 2022 • edited Loading

phschoen commented Mar 17, 2022

boerge1 commented Nov 3, 2022

boerge1 commented Nov 1, 2021 •

edited

Loading

boerge1 commented Mar 16, 2022 •

edited

Loading