diff --git a/assets/0003HackingStationMuhvella.mp3 b/assets/0003HackingStationMuhvella.mp3 index e9f1861..abe5e3a 100644 --- a/assets/0003HackingStationMuhvella.mp3 +++ b/assets/0003HackingStationMuhvella.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5fc464f5809f594a3b9ab8994017de1dbc8b99c5ec78f59a253641f3454e5f0 +oid sha256:69febc15f9893be142276849afa471331d9823e76fcf320cb45b6a22f597bb1a size 401280 diff --git a/assets/0008ObjektvonderNebenstationentfernt.mp3 b/assets/0008DONTUSEDOESNOTWORK.mp3 similarity index 100% rename from assets/0008ObjektvonderNebenstationentfernt.mp3 rename to assets/0008DONTUSEDOESNOTWORK.mp3 diff --git a/assets/0009HackingBicola.mp3 b/assets/0009HackingBicola.mp3 new file mode 100644 index 0000000..f856f57 --- /dev/null +++ b/assets/0009HackingBicola.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6972d6fe940dcf817972cbc26e157251f48dd6d93c832147c5ec5a38f1642b3d +size 591840 diff --git a/assets/0009HackingStationBicola.mp3 b/assets/0009HackingStationBicola.mp3 deleted file mode 100644 index 601b40e..0000000 --- a/assets/0009HackingStationBicola.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af7c1d630d6949c577cfeffccb91169080da5be83328e116b4d7a61700094c76 -size 588480 diff --git a/assets/0010PickupBicola.mp3 b/assets/0010PickupBicola.mp3 new file mode 100644 index 0000000..0cf7b7a --- /dev/null +++ b/assets/0010PickupBicola.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cec0c449f1cf58e6b5b69491783071d5085246d103a5b384886fa6ee014ac923 +size 1161600 diff --git a/assets/0010PickupStationBicola.mp3 b/assets/0010PickupStationBicola.mp3 deleted file mode 100644 index 8428882..0000000 --- a/assets/0010PickupStationBicola.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3544ff936304b0e53af972d146c7cb9e9f8b77c992f0fe5ccb5d2c463e78bb88 -size 1271520 diff --git a/assets/0011AfterBicola.mp3 b/assets/0011AfterBicola.mp3 new file mode 100644 index 0000000..6015ab1 --- /dev/null +++ b/assets/0011AfterBicola.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49a43802e9040975492b13422a74810a5dbda88925f48909f60c2389e2f71da1 +size 521760 diff --git a/assets/0011AfterStationBicola.mp3 b/assets/0011AfterStationBicola.mp3 deleted file mode 100644 index 323a23a..0000000 --- a/assets/0011AfterStationBicola.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f71d507d83a59ac45bee44b5e8849507c80136edec61724770d7936f308cd8e2 -size 511680 diff --git a/assets/0012HackingStationTobione.mp3 b/assets/0012HackingStationTobione.mp3 deleted file mode 100644 index 422720e..0000000 --- a/assets/0012HackingStationTobione.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0974c1d83bf05487c95360542ab9573713397c0d7bc83adfbf1efd055df3819a -size 791520 diff --git a/assets/0012HackingTobione.mp3 b/assets/0012HackingTobione.mp3 new file mode 100644 index 0000000..bd9154a --- /dev/null +++ b/assets/0012HackingTobione.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64ab0f541e5fe67b9f3663b0fc87ad77ddd217df05dc31bf546138fc0a2e5e9e +size 791520 diff --git a/assets/0013PickupStationTobione.mp3 b/assets/0013PickupStationTobione.mp3 deleted file mode 100644 index f299b45..0000000 --- a/assets/0013PickupStationTobione.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25b07721ba9e5f27ba728a1f7f05075af1ff95ed315345a4a3d0b61f60f102fb -size 1421760 diff --git a/assets/0013PickupTobione.mp3 b/assets/0013PickupTobione.mp3 new file mode 100644 index 0000000..88d0b7d --- /dev/null +++ b/assets/0013PickupTobione.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173dbe32eeccba13fa27cd8880bca34f22db63029401f529fc01f66cddd5ab3d +size 1161600 diff --git a/assets/0014AfterTobione.mp3 b/assets/0014AfterTobione.mp3 index 1358d34..7203f8a 100644 --- a/assets/0014AfterTobione.mp3 +++ b/assets/0014AfterTobione.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:278d81deba822df2df47b773c7a01529beae7ebb492df8dbc1eb9a24ecfb92d3 +oid sha256:3d89019ca9477457555209104e2def1d2a6cf5b87625ecbac5f429f8c912d236 size 441600 diff --git a/assets/0015End.mp3 b/assets/0015End.mp3 index 11dedcd..b317e7d 100644 --- a/assets/0015End.mp3 +++ b/assets/0015End.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1db9be7221cb13fe7451b854b9853c18fc001c93ac463db08a1585dcb3da8f4 -size 741600 +oid sha256:e04c9d52e55708c65ceb13d5aefda2a23c53186e33b9740c4f38abe8c23acdc8 +size 921600 diff --git a/assets/0017AfterStationMagie.mp3 b/assets/0016AfterStationMagie.mp3 similarity index 100% rename from assets/0017AfterStationMagie.mp3 rename to assets/0016AfterStationMagie.mp3 diff --git a/assets/0016WrongStation.mp3 b/assets/0016WrongStation.mp3 deleted file mode 100644 index fbcc67a..0000000 --- a/assets/0016WrongStation.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8b3f3890eec7ce0a9e2984e9fc205e4d5daa62953a00d7fe719227e8cb81ae4 -size 772805 diff --git a/assets/0017WrongStation.mp3 b/assets/0017WrongStation.mp3 new file mode 100644 index 0000000..f8086ed --- /dev/null +++ b/assets/0017WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb59118f9918a030f911fa60e144cf2982366a8632ac2540a9e4b69bd181b7ad +size 45312 diff --git a/assets/0018WrongStation.mp3 b/assets/0018WrongStation.mp3 new file mode 100644 index 0000000..0e2d04d --- /dev/null +++ b/assets/0018WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed1b9d93e941b6c17aec2a4316ea4a7b8642ae43794eac5a76786f09b6d07f7c +size 53376 diff --git a/assets/0019WrongStation.mp3 b/assets/0019WrongStation.mp3 new file mode 100644 index 0000000..a5adfcd --- /dev/null +++ b/assets/0019WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9170b58d7bf75ba8927a6eee31e83890987b8b3940fe404a5f27450e7020a4d +size 24192 diff --git a/assets/0020WrongStation.mp3 b/assets/0020WrongStation.mp3 new file mode 100644 index 0000000..7c2863a --- /dev/null +++ b/assets/0020WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3bff3e23c0e914546442a3b7d9ea75feb10c44718ec1a06c8733f59b97765fc +size 31872 diff --git a/assets/0021WrongStation.mp3 b/assets/0021WrongStation.mp3 new file mode 100644 index 0000000..9e47f5b --- /dev/null +++ b/assets/0021WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d0ee396011b9cf8380f9df60cd606a66797aa9410e5f033697b78f855fd46b3 +size 30720 diff --git a/assets/0022WrongStation.mp3 b/assets/0022WrongStation.mp3 new file mode 100644 index 0000000..3245619 --- /dev/null +++ b/assets/0022WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34394dc039e62d781bbe1cee10b948748a3d1aaa0a90015737e9fdf0ade12837 +size 67968 diff --git a/assets/0023WrongStation.mp3 b/assets/0023WrongStation.mp3 new file mode 100644 index 0000000..caf134f --- /dev/null +++ b/assets/0023WrongStation.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6af150d5a38f17e8e18b614752974170b499e428ea1042b8fcee47d2390f6c93 +size 50688 diff --git a/assets/0024PutMeBack.mp3 b/assets/0024PutMeBack.mp3 new file mode 100644 index 0000000..7d747a6 --- /dev/null +++ b/assets/0024PutMeBack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3b1e420cdc424fb8c57537f59b5d385d4e3ba917fd18d9ed99479c82470f4fa +size 70656 diff --git a/assets/0025PutMeBack.mp3 b/assets/0025PutMeBack.mp3 new file mode 100644 index 0000000..9117927 --- /dev/null +++ b/assets/0025PutMeBack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb6b21eba6b65dbaee9b1661f99da1a61ab65bbe9e7492556a731492ac6cd4c3 +size 45312 diff --git a/assets/0026PutMeBack.mp3 b/assets/0026PutMeBack.mp3 new file mode 100644 index 0000000..3caf488 --- /dev/null +++ b/assets/0026PutMeBack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6b81f5b59afac770b88924bb011977d5b58c44cdd2264ebdb7dc041ebcd9345 +size 50688 diff --git a/assets/0027PutMeBack.mp3 b/assets/0027PutMeBack.mp3 new file mode 100644 index 0000000..ea9ba54 --- /dev/null +++ b/assets/0027PutMeBack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f12a1fb1728525df4d87f98c9019d0486188452aadb3667e01e477139528123c +size 77184 diff --git a/assets/0028PutMeBack.mp3 b/assets/0028PutMeBack.mp3 new file mode 100644 index 0000000..f7fa1ac --- /dev/null +++ b/assets/0028PutMeBack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1fa605420a37ab0d18fd571f9be13bcac42401b9de7add097ada89f37515dae +size 51840 diff --git a/copyFiles.py b/copyFiles.py new file mode 100644 index 0000000..80d028e --- /dev/null +++ b/copyFiles.py @@ -0,0 +1,30 @@ +import os +import shutil + +def copy_files_to_root(src_folder, dest_root): + # Check if source folder exists + if not os.path.exists(src_folder): + print(f"Source folder '{src_folder}' does not exist.") + return + + # Create destination root folder if it does not exist + if not os.path.exists(dest_root): + os.makedirs(dest_root) + + # Copy files + for item in os.listdir(src_folder): + src_path = os.path.join(src_folder, item) + dest_path = os.path.join(dest_root, item) + + if os.path.isfile(src_path): + shutil.copy2(src_path, dest_path) + print(f"Copied '{src_path}' to '{dest_path}'") + else: + print(f"Skipped '{src_path}' as it is not a file") + +# Define source folder and destination root +src_folder = 'C:/Users/Marcel/CLionProjects/BuenzliIO/assets' +dest_root = 'D:/' + +# Execute the copy function +copy_files_to_root(src_folder, dest_root) \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 678b1ed..4bb6e47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -157,7 +157,7 @@ void loop(void) void setup(void) { - + randomSeed(analogRead(0)); Serial.begin(9600); // Serial.println(ON_MAIN_STATION.getEntryAtIndex(0)->isAudio); @@ -182,5 +182,5 @@ void setup(void) } } - dfPlayer.volume(15); + dfPlayer.volume(25); } diff --git a/src/sounds.h b/src/sounds.h index 638dcb3..cb7c3c9 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -10,7 +10,7 @@ #define HACKING_STATION_MAGIE 6 #define PICKUP_STATION_MAGIE 7 -#define AFTER_MAGIE 17 // weird hack because file 8 does not seem to work... +#define AFTER_MAGIE 16 // weird hack because file 8 does not seem to work... #define HACKING_STATION_BICOLA 9 #define PICKUP_STATION_BICOLA 10 @@ -21,4 +21,7 @@ #define AFTER_TOBIONE 14 #define END 15 -#define WRONG_STATION 16 +#define WRONG_STATION_START 17 +#define WRONG_STATION_END 23 +#define PUT_ME_BACK_START 24 +#define PUT_ME_BACK_END 28 diff --git a/src/states.cpp b/src/states.cpp index 6106eb0..d79f733 100644 --- a/src/states.cpp +++ b/src/states.cpp @@ -166,7 +166,7 @@ String IncorrectStation::updateDisplay(const Context& context) void IncorrectStation::activated(const Context context) { - context.dfPlayer->play(WRONG_STATION); + context.dfPlayer->play(random(WRONG_STATION_START, WRONG_STATION_END + 1)); } @@ -275,8 +275,9 @@ String Complain::updateDisplay(const Context& context) return COMPLAIN_TEXT; } -void Complain::activated(Context context) +void Complain::activated(const Context context) { + context.dfPlayer->play(random(PUT_ME_BACK_START, PUT_ME_BACK_END + 1)); }