Merge pull request #4 from RogueMaster/dev

Merge changes
RogueMaster · May 17, 2022 · 917ca55 · 917ca55
2 parents 1583e1a + 2c2d373
commit 917ca55
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -5,15 +5,15 @@ Latest Updates:
 - Merged new updates from main.
 
 **Special Instructions:**
-- Download these files to place into subghz/assets folder on your SD card. Change the two _map files to contain the location of your specific subghz files.
-- - assets/resources/subghz/assets/universal_rf_map
-- - assets/resources/subghz/assets/touchtunes_map
-- - assets/resources/subghz/assets/setting_user
-- - assets/resources/subghz/assets/setting_frequency_analyzer_user
-- Download this file to place into nfc/assets folder on your SD card. 
-- - assets/resources/nfc/assets/mf_classic_dict.nfc
-- Add a folder to SD card for 'wav_player' (for 8bit 2ch unsigned wav files) 
-- Add a folder to SD card for 'music_player' (fmf and rtttl files)
+- Download these files into the subghz/assets folder on your SD card. Edit the two `_map` files to contain your specific subghz (.SUB) files.
+- - [assets/resources/subghz/assets/universal_rf_map](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/dev/assets/resources/subghz/assets/universal_rf_map)
+- - [assets/resources/subghz/assets/touchtunes_map](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/dev/assets/resources/subghz/assets/touchtunes_map)
+- - [assets/resources/subghz/assets/setting_user](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/dev/assets/resources/subghz/assets/setting_user)
+- - [assets/resources/subghz/assets/setting_frequency_analyzer_user](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/dev/assets/resources/subghz/assets/setting_frequency_analyzer_user)
+- Download this file into the nfc/assets folder on your SD card. 
+- - [assets/resources/nfc/assets/mf_classic_dict.nfc](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/dev/assets/resources/nfc/assets/mf_classic_dict.nfc)
+- Add a folder to SD card named `wav_player` (for 8bit 2ch unsigned wav files) 
+- Add a folder to SD card named `music_player` (FMF and RTTTL/TXT files)
 
 Plugins:
 - [Clock/Stopwatch (By CompaqDisc, Stopwatch & sound alert by me)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)

diff --git a/applications/clock_app/clock_app.c b/applications/clock_app/clock_app.c
@@ -64,6 +64,8 @@ static void clock_render_callback(Canvas* const canvas, void* ctx) {
         elements_button_right(canvas, "S:PoRa");
     } else if(songSelect==2) {
         elements_button_right(canvas, "S:Mario");
+    } else if(songSelect==3) {
+        elements_button_right(canvas, "S:ByMin");
     }
 }
 
@@ -140,7 +142,7 @@ static void clock_tick(void* ctx) {
     PluginEvent event = {.type = EventTypeTick};
     if(timerStarted) {
         timerSecs=timerSecs+1;
-        if(timerSecs%60==0) {
+        if(timerSecs%60==0 && songSelect!=0) {
             NotificationApp* notification = furi_record_open("notification");
             notification_message(notification, &clock_alert_perMin);
             furi_record_close("notification");
@@ -233,14 +235,16 @@ int32_t clock_app(void* p) {
                             songSelect=1;
                         } else if(songSelect==1)  {
                             songSelect=2;
+                        } else if(songSelect==2)  {
+                            songSelect=3;
                         } else {
                             songSelect=0;
                         }
                         break;
                     case InputKeyLeft:
                         break;
                     case InputKeyOk: 
-                        if(songSelect==1 || songSelect==2)  {
+                        if(songSelect==1 || songSelect==2 || songSelect==3)  {
                             NotificationApp* notification = furi_record_open("notification");
                             notification_message(notification, &clock_alert_startStop);
                             furi_record_close("notification");