Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 36 commits into
base: DEV
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
17f7254
Refactor and bug fixes
Oct 30, 2021
512e13d
Play jingel at the end of admin menu after writing settings
Oct 30, 2021
4c62aa2
Some improvements and bug fixes
Nov 1, 2021
70586dd
new mode Hoerbuch einzeln
Nov 10, 2021
f6950cd
New feature: pause on card removed
Nov 15, 2021
0e188f4
New feature: pause on card removed
Nov 15, 2021
233c34d
New feature: pause on card removed
Nov 16, 2021
5fb4324
Merge pull request #2 from boerge1/pause_if_card_removed
boerge1 Nov 29, 2021
cd7c05f
Merge pull request #1 from boerge1/new_mode_hoerbuch1
boerge1 Nov 29, 2021
58cdd54
fix writing card
Dec 9, 2021
64cb654
Improvements
Dec 18, 2021
212121a
Improvements
Dec 19, 2021
2f18600
Improvements
Dec 19, 2021
8710122
Improvements
Dec 21, 2021
3f6df35
Improvements
Dec 22, 2021
8317942
new state machine
Jan 9, 2022
13d5dc4
new state machine
Jan 26, 2022
f4b7294
new state machine
Jan 30, 2022
1910368
new state machine
Jan 30, 2022
0591b15
new state machine
Jan 30, 2022
806831f
queue all track and improvements
Feb 21, 2022
c526f77
change .gitignore
Feb 23, 2022
0dacbed
Support for vs code and platformio
Feb 23, 2022
1eb498e
Minor improvements to reduce program memory
Mar 3, 2022
ce09b1c
Normalize mp3
Mar 8, 2022
cf39605
New Feature: repeat last card
Mar 8, 2022
f1d019c
Bug Fix: possibility to choose 99 folder, not only 10
Mar 8, 2022
541e7ed
Improvements for program size
Mar 8, 2022
f4bcff3
Delete Shortcut + play after start if card is on
Mar 16, 2022
b574f98
Merge pull request #4 from boerge1/state_machine
boerge1 Mar 16, 2022
fa05e70
Command sources
Apr 9, 2022
50726ef
add hint for using -std=gnu++17 in Readme
May 5, 2022
a37540d
Disable serial input as command source for save memory
May 5, 2022
9e85b7d
Merge pull request #5 from boerge1/command_sources
boerge1 May 5, 2022
a007005
Fix Readme
May 5, 2022
fdccc96
Update README.md
boerge1 Nov 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,21 @@ Temporary Items

# TonUINO
/tools/*.pyc
/Release/
/sc-card_priv/

# Eclipse Sloeber plugin for Arduino
/sloeber.ino.cpp
/spec.d
/.cproject
/.project
/.pydevproject
/.sproject
/.settings

# VS code
.pio
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch
10 changes: 10 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
],
"unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
# Achtung
wird fortgesetzt im Projekt https://github.com/tonuino/TonUINO-TNG

# TonUINO
Die DIY Musikbox (nicht nur) für Kinder


# Change Log

## Version 3.0 (xx.xx.xxxx) noch WIP
- vollständiges Refactoring mit State Machine
- Die Main-Loop läuft jetzt stabil mit 50 ms
- 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)
- Das Admin Menü wir nach einer Einstellung nicht verlassen (kann in der Software leicht geändert werden)
- Das Admin Menü kann an jeder Stelle abgebrochen werden
- Außer den Buttons können andere Command Sources hinzugefügt werden (Bsp.: Serial Input)
- Viele weitere Verbesserungen und Bug Fixes

**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 ...`

## Version 2.1 (xx.xx.xxxx) noch WIP
- Partymodus hat nun eine Queue -> jedes Lied kommt nur genau 1x vorkommt
- Neue Wiedergabe-Modi "Spezialmodus Von-Bis" - Hörspiel, Album und Party -> erlaubt z.B. verschiedene Alben in einem Ordner zu haben und je mit einer Karte zu verknüpfen
Expand Down
Loading