Latest RM0702-0437-0.103.2-e54074a on PATREON - UPD DOLPHIN TIMERS

RogueMaster · Jul 3, 2024 · db56d6b · db56d6b
2 parents 50c82e9 + 8669013
commit db56d6b
Show file tree

Hide file tree

Showing 10 changed files with 233 additions and 175 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -42,6 +42,7 @@ This software is for experimental purposes only and is not meant for any illegal
 - OFW: [updater: slightly smaller image #3740 (By hedger)](https://github.com/flipperdevices/flipperzero-firmware/pull/3740)
 - Updated: [ESP32 Camera Suite v1.8 (By CodyTolene)](https://github.com/CodyTolene/Flipper-Zero-Camera-Suite)
 - Updater: [15% faster resource extract (By Willy-JL)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/2f889313657d444c85a5dcfe2559d44f475f7a98)
+- Updated: [Dolphin Trainer v1.3 (By nymda)](https://github.com/nymda/FlipperAntidepressants)
 
 <a name="release">
 
@@ -382,7 +383,7 @@ $ ./fbt dolphin_ext
 - [Digimon F-Com v1.4 (By TylerWilley)](https://github.com/TylerWilley/flipper-f-com)
 - [Distance Sensor v1.2 (By privet971)](https://github.com/privet971/FlipperZeroApps/tree/main/usping) `Req: Parallax (3 wires) SKU 28015`
 - [Distance Sensor v1.1 (By Sanqui)](https://github.com/Sanqui/flipperzero-firmware/tree/hc_sr04) `Req: HC-SR04`
-- [Dolphin Trainer v1.2 (By nymda)](https://github.com/nymda/FlipperAntidepressants)
+- [Dolphin Trainer v1.3 (By nymda)](https://github.com/nymda/FlipperAntidepressants)
 - [DSTIKE Deauther v1.1 (By SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module/tree/FlipperZero-Module-v2/FlipperZeroModule/FlipperZero-ESP8266-Deauth-App) `Req: ESP8266`
 - [DTMF Dolphin v1.3 (By litui)](https://github.com/litui/dtmf_dolphin)
 - [EM4100 Key Generator v1.1 (By Milk-Cool)](https://github.com/Milk-Cool/fz-em4100-generator)

diff --git a/applications/external/dolphintrainer/application.fam b/applications/external/dolphintrainer/application.fam
@@ -10,7 +10,7 @@ App(
     fap_icon_assets="icons",
     fap_author="nymda",
     fap_weburl="https://github.com/nymda/FlipperAntidepressants",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_description="App to change the level, experience and mood/butthurt of your dolphin pet, EXP adjusted for Rogue Master Custom Firmware.",
     #  [Level Changer (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/96b67d9d53b5a70e85f8bdd81dcbc602f90d46cd)
 )
diff --git a/applications/external/dolphintrainer/dolphintrainer.c b/applications/external/dolphintrainer/dolphintrainer.c
@@ -27,16 +27,17 @@ char strLevel[10];
 int btnIndex = 0;
 uint32_t curLevel = 0;
 
-const int DOLPHIN_LEVELS[DOLPHIN_LEVEL_COUNT] = {500,    1250,   2250,   3500,   5000,  6750,
+const uint32_t DOLPHIN_LEVELS[] = {500,    1250,   2250,   3500,   5000,  6750,
                                                  8750,   11000,  13500,  16250,  19250, 22500,
                                                  26000,  29750,  33750,  38000,  42500, 47250,
                                                  52250,  58250,  65250,  73250,  82250, 92250,
                                                  103250, 115250, 128250, 142250, 157250};
+const size_t DOLPHIN_LEVEL_COUNT = COUNT_OF(DOLPHIN_LEVELS);
 
 #define NUM(a) (sizeof(a) / sizeof(*a))
 
-uint8_t dolphin_get_mylevel(int icounter) {
-    for(int i = 0; i < DOLPHIN_LEVEL_COUNT; ++i) {
+uint8_t dolphin_get_mylevel(uint32_t icounter) {
+    for(size_t i = 0; i < DOLPHIN_LEVEL_COUNT; ++i) {
         if(icounter <= DOLPHIN_LEVELS[i]) {
             return i + 1;
         }