Add new modes for TonUINO TNG 3.1

As requested in https://discourse.voss.earth/t/android-app-um-tonuino-karten-zu-beschreiben/2151/192 Values and texts taken from https://github.com/tonuino/TonUINO-TNG/blob/4bcf964818093b264e04c2cb56384a970f14177e/src/chip_card.hpp#L10-L35 https://github.com/tonuino/TonUINO-TNG/blob/main/audio_messages_de.txt#L12-L22
marc136 · Jan 2, 2024 · e8e8d18 · e8e8d18
1 parent 9dbf995
commit e8e8d18
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -125,7 +125,23 @@ All have a folder value of 0
 | KindergartenMode | 5 | - | Previous and back buttons are locked. Adding a new card will not stop the current track but will schedule it as next track |
 | RepeatSingleModifier | 6 | - | Repeat current track |
 | FeedbackModifier | 7 | - | Will e.g. tell volume before changing it |
+## Tonuino TNG 3.1.x
+[Repository](https://github.com/tonuino/TonUINO-TNG#version-31-13102022)
 
+Is a full rewrite of the original TonUINO software in C++ 
+
+**Different Modes**  
+It supports all modes of TonUINO 2.1 and adds these
+
+| #  | title           | description                                               | next | previous                              |
+|----|-----------------|-----------------------------------------------------------|------|---------------------------------------|
+| 10 | Hörbuch Einzeln | Play the next file from the folder and store the progress | stop | start title again from the beginning  |
+| 11 | Repeat last     | Repeat the last card or shortcut                          | ??   | ??                                    |
+
+Wiederhole Karte Modus: die letzte Karte oder der letzte Shortcut wird wiederholt.
+
+#### Modifier Tags (aka admin tags)
+Same as TonUINO 2.1 but removed the `FeedbackModifier` card with value `7`.
 
 ## NFC Host Card Emulation
 It would be great if the app also can act as an NFC tag to simulate TonUINO tags, some links to this:

diff --git a/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt b/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt
@@ -31,6 +31,11 @@ enum class Format2Mode(val value: Int) {
     Party2(9)
 }
 
+enum class Format3Mode(val value: Int) {
+    AudioBookSingle(10),
+    RepeatLast(11),
+}
+
 enum class Format2ModifierMode(val value: Int) {
     Admin(0), SleepTimer(1), FreezeDance(2), Locked(3),
     Toddler(4), Kindergarten(5), RepeatSingle(6), Feedback(7)

diff --git a/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt b/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt
@@ -15,6 +15,7 @@ import de.mw136.tonuino.setByteIfChanged
 import de.mw136.tonuino.ui.Format1Mode
 import de.mw136.tonuino.ui.Format2Mode
 import de.mw136.tonuino.ui.Format2ModifierMode
+import de.mw136.tonuino.ui.Format3Mode
 import de.mw136.tonuino.ui.Tonuino
 
 private const val VERSION_MAX = 2
@@ -29,7 +30,7 @@ class EnterSimple : Fragment() {
         get() {
             return when (savedModeView) {
                 ModeView.V1 -> 6
-                ModeView.V2 -> 9
+                ModeView.V2 -> 11
                 ModeView.V2_MODIFIER -> 7
                 ModeView.INITIAL -> 0
             }
@@ -248,7 +249,9 @@ class EnterSimple : Fragment() {
             Format1Mode.AudioBookRandom.value,
             Format1Mode.AudioBookMultiple.value,
             Format1Mode.Album.value,
-            Format1Mode.Party.value
+            Format1Mode.Party.value,
+            Format3Mode.AudioBookSingle.value,
+            Format3Mode.RepeatLast.value
             -> {
                 specialRow.visibility = View.GONE
                 specialLabel.text = getString(R.string.edit_hidden_label)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -53,6 +53,8 @@
         <item>Hörspiel von-bis</item>
         <item>Album von-bis</item>
         <item>Party von-bis</item>
+        <item>Hörbuch einzeln</item>
+        <item>Wiederhole Karte</item>
     </string-array>
     <string-array name="edit_mode_description">
         <item>Ein zufälliger Titel aus dem gewählten Ordner wird abgespielt.</item>
@@ -66,6 +68,8 @@
         <item>Ein zufälliger Titel im gewählten Ordner zwischen von und bis wird abgespielt.</item>
         <item>Spielt alle Titel des Ordners zwischen von und bis in numerischer Reihenfolge.</item>
         <item>Spielt zufällige Titel des Ordners zwischen von und bis in Endlosschleife.</item>
+        <item>Den nächsten Titel im Ordner wiedergeben und den Fortschritt speichern.</item>
+        <item>Die letzte Karte oder der letzte Shortcut wird wiederholt.</item>
     </string-array>
     <string name="edit_mode_unknown">Der Modus \'%d\' ist unbekannt.</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -45,16 +45,16 @@
     <string name="edit_special_label_from">From</string>
     <string name="edit_special2_label">Extra 2</string>
     <string name="edit_special2_label_to">To</string>
-    <string name="edit_version_1">Format 1: For Tonuino 2.0.x ("master" branch)</string>
-    <string name="edit_version_2">Format 2: For Tonuino 2.1 ("DEV" branch)</string>
+    <string name="edit_version_1">Format 1: For Tonuino 2.0.x</string>
+    <string name="edit_version_2">Format 2: For Tonuino 2.1 and Tonuino TNG 3.1</string>
 
     <string name="edit_hidden_label">hidden</string>
     <string name="edit_unknown_value">Value \'%s\' is unknown.</string>
     <string name="edit_limit_numeric_value" tools:ignore="PluralsCandidate">Please enter a number between %d and %d.</string>
 
     <string-array name="edit_version">
         <item>Tonuino 2.0.x</item>
-        <item>Tonuino 2.1.x</item>
+        <item>Tonuino 2.1.x and Tonuino TNG</item>
     </string-array>
     <string-array name="edit_mode">
         <item>Audio book (single file)</item>
@@ -66,6 +66,8 @@
         <item>Audio book from-to (single file)</item>
         <item>Album from-to</item>
         <item>Party from-to</item>
+        <item>Audio book series (single files)</item>
+        <item>Repeat last</item>
     </string-array>
     <string-array name="edit_mode_description">
         <item>A random file from the chosen folder will be played.</item>
@@ -79,6 +81,8 @@
         <item>A random file from the chosen folder between the selected minimum and maximum will be played.</item>
         <item>Plays all files inside the folder between the selected minimum and maximum in numerical order.</item>
         <item>Plays random files inside the folder between the selected minimum and maximum.</item>
+        <item>Plays the next file from the folder and store the progress.</item>
+        <item>Repeat the last card or shortcut.</item>
     </string-array>
     <string name="edit_mode_unknown">Mode \'%d\' is unknown.</string>