Skip to content

Commit

Permalink
Latest Release RM1227-1725-0.93.9-e4c18d2 on PATREON - NEW RELEASE
Browse files Browse the repository at this point in the history
  • Loading branch information
@RogueMaster
RogueMaster committed Dec 27, 2023
2 parents bebf770 + e879ad9 commit 85e1c00
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 64 deletions.
10 changes: 5 additions & 5 deletions ReadMe.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ This software is for experimental purposes only and is not meant for any illegal

<a name="latest">

## Latest Updates - [PATREON: Latest Release RM1226-1142-0.93.9-e59f801](https://www.patreon.com/RogueMaster?filters[tag]=Latest%20Release)
## Latest Updates - [PATREON: Latest Release RM1227-1725-0.93.9-e4c18d2](https://www.patreon.com/RogueMaster?filters[tag]=Latest%20Release)

- Last Synced/Checked OFW, changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2023-12-27 01:10 EST`
- Last Synced/Checked Unleashed, changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2023-12-27 01:10 EST`
- Last Synced/Checked OFW, changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2023-12-27 17:25 EST`
- Last Synced/Checked Unleashed, changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2023-12-27 17:25 EST`
- OFW PR: NFC: [Update mf_classic_dict.nfc #3314 (By ry4000)](https://github.com/flipperdevices/flipperzero-firmware/pull/3314) - For Bandai Namco Passport / Sega Aime Card (Already part of key dictionairy lines 1918-1952.)
- Added: [Smack My Dolphin Up! (By siberianbot)](https://github.com/siberianbot/smack-my-dolphin-up)
- OFW: [About: cn,tw,mx certification information #3318 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/3318)
- Updated: [Programmer Calculator v0.8 (By armixz)](https://github.com/armixz/Flipper-Zero-Programmer-Calculator)
- UL: [SubGHz: Temp fix for subghz keyboard lock display issue (furi_timer is not working properly) (By xMasterX)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/5c00a403f6477fc7f0b2c6f82689983bbc284410)
- UL: [SubGHz: Added new option to delete old signals on full memory (By xMasterX)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/b84f14386c9f2c111811b031a18a6914f71a3e74)
- Updated: [Dab Timer v1.6 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-dabtimer)
- Updated: [Dab Timer v1.7 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-dabtimer)

## IN THIS BRANCH:

Expand Down Expand Up @@ -430,7 +430,7 @@ $ ./fbt dolphin_ext
- [Count Down Timer v1.2 (By 0w0mewo)](https://github.com/0w0mewo/fpz_cntdown_timer)
- [Counter v1.2 (By Krulknul)](https://github.com/Krulknul/dolphin-counter) [Improved (By plasticuproject)](https://github.com/plasticuproject/dolphin-better-counter)
- [Cross Remote v1.0 (By leedave)](https://github.com/leedave/flipper-zero-cross-remote)
- [Dab Timer v1.6 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-dabtimer)
- [Dab Timer v1.7 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-dabtimer)
- [DAP Link v1.1 (By DrZlo13)-OFW](https://github.com/flipperdevices/flipperzero-firmware/pull/1897)
- [DCF77 Transmitter v1.1 (By arha)](https://github.com/arha/flipper-dcf77)
- [Deauther PWNDTOOLS V2.6.0 (By HEX0DAYS)](https://github.com/HEX0DAYS/FlipperZero-PWNDTOOLS) `Req: ESP8266` [Original](https://github.com/SpacehuhnTech/esp8266_deauther)
Expand Down
4 changes: 2 additions & 2 deletions applications/external/dab_timer/application.fam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ App(
fap_category="Main",
fap_icon="dab_timer_icon_10px.png",
fap_icon_assets="icons",
fap_author="RogueMaster", # WITH REFACTORING/REMAKE HELP FROM GMMAN FOR CLOCK FUNCTIONALITY (See README)
fap_author="RogueMaster", # WITH REFACTORING/REMAKE HELP FROM GMMAN FOR CLOCK FUNCTIONALITY (See README)
fap_weburl="https://github.com/RogueMaster/flipperzero-dabtimer",
fap_version=(1, 6),
fap_version=(1, 7),
fap_description="A clock with stopwatch and 80 seconds alarm. 80 second alarm can be changed at 5 second intervals and so can the sound options.",
)
93 changes: 47 additions & 46 deletions applications/external/dab_timer/dab_timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
char alertTime[4];
snprintf(alertTime, sizeof(alertTime), "%d", alert_time);
furi_mutex_release(plugin_state->mutex);
if(plugin_state->faceType == 0 || plugin_state->faceType == 5) {
if(plugin_state->faceType == 5) {
if(plugin_state->faceType == FaceStylePwn || plugin_state->faceType == FaceStylePwnInverted) {
if(plugin_state->faceType == FaceStylePwnInverted) {
canvas_draw_icon(canvas, 0, 0, &I_black);
if(timer_start_timestamp != 0) {
elements_button_left(canvas, "Reset");
Expand Down Expand Up @@ -207,9 +207,9 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
if(plugin_state->time_format == LocaleTimeFormat12h)
canvas_draw_str_aligned(canvas, 117, 4, AlignCenter, AlignCenter, meridian_string);
canvas_draw_str_aligned(canvas, 96, 20, AlignCenter, AlignTop, date_string); // DRAW DATE
} else if(plugin_state->faceType == 1 || plugin_state->faceType == 6) {
} else if(plugin_state->faceType == FaceStyleOriginal || plugin_state->faceType == FaceStyleOriginalInverted) {
canvas_set_font(canvas, FontSecondary);
if(plugin_state->faceType == 6) {
if(plugin_state->faceType == FaceStyleOriginalInverted) {
canvas_draw_icon(canvas, 0, 0, &I_black);
if(timer_start_timestamp != 0) {
elements_button_left(canvas, "Reset");
Expand Down Expand Up @@ -275,8 +275,8 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
canvas, 64, 38, AlignCenter, AlignTop, date_string); // DRAW DATE
canvas_set_font(canvas, FontSecondary);
}
} else if(plugin_state->faceType == 2 || plugin_state->faceType == 7) {
if(plugin_state->faceType == 7) {
} else if(plugin_state->faceType == FaceStyleOriginalSmall || plugin_state->faceType == FaceStyleOriginalSmallInverted) {
if(plugin_state->faceType == FaceStyleOriginalSmallInverted) {
canvas_draw_icon(canvas, 0, 0, &I_black);
if(timer_start_timestamp != 0) {
elements_button_left(canvas, "Reset");
Expand Down Expand Up @@ -310,8 +310,8 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
canvas_draw_str_aligned(
canvas, 64, 38, AlignCenter, AlignTop, date_string); // DRAW DATE
canvas_set_font(canvas, FontSecondary);
} else if(plugin_state->faceType == 3 || plugin_state->faceType == 8) {
if(plugin_state->faceType == 8) {
} else if(plugin_state->faceType == FaceStyleCircle || plugin_state->faceType == FaceStyleCircleInverted) {
if(plugin_state->faceType == FaceStyleCircleInverted) {
canvas_draw_icon(canvas, 0, 0, &I_black);
if(timer_start_timestamp != 0) {
// elements_button_left(canvas, "Reset");
Expand Down Expand Up @@ -364,7 +364,7 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
}
furi_string_free(str);
} else {
if(plugin_state->faceType == 9) {
if(plugin_state->faceType == FaceStyleBinaryInverted) {
canvas_draw_icon(canvas, 0, 0, &I_black);
if(timer_start_timestamp != 0) {
// elements_button_left(canvas, "Reset");
Expand Down Expand Up @@ -400,14 +400,14 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
dab_timer_render_binary_face(canvas, curr_dt.second, 38, timer_start_timestamp);
}
}
if(plugin_state->faceType >= 5) {
if(plugin_state->faceType >= FaceStylePwnInverted) {
canvas_set_color(canvas, ColorBlack);
}
if(plugin_state->faceType < 5) {
if(plugin_state->faceType < FaceStylePwnInverted) {
canvas_set_color(canvas, ColorWhite);
}
if(plugin_state->faceType != 3 && plugin_state->faceType != 4 && plugin_state->faceType != 8 &&
plugin_state->faceType != 9) {
if(plugin_state->faceType != FaceStyleCircle && plugin_state->faceType != FaceStyleBinary && plugin_state->faceType != FaceStyleCircleInverted &&
plugin_state->faceType != FaceStyleBinaryInverted) {
if(!plugin_state->desktop_settings->is_dumbmode && !plugin_state->w_test) {
if(timer_running) {
elements_button_center(canvas, "Stop");
Expand All @@ -416,13 +416,13 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {
}
}
if(timer_running && !plugin_state->w_test) {
if(songSelect == 0) {
if(songSelect == SoundAlertOff) {
elements_button_right(canvas, "S:OFF");
} else if(songSelect == 1) {
} else if(songSelect == SoundAlertGoGoPoRa) {
elements_button_right(canvas, "S:PoRa");
} else if(songSelect == 2) {
} else if(songSelect == SoundAlertMario) {
elements_button_right(canvas, "S:Mario");
} else if(songSelect == 3) {
} else if(songSelect == SoundAlertByMin) {
elements_button_right(canvas, "S:ByMin");
}
}
Expand All @@ -434,27 +434,27 @@ static void dab_timer_render_callback(Canvas* const canvas, void* ctx) {

static void dab_timer_state_init(DabTimerState* const plugin_state) {
memset(plugin_state, 0, sizeof(DabTimerState));
plugin_state->songSelect = 2;
plugin_state->alert_time = 80;
plugin_state->date_format = locale_get_date_format();
plugin_state->desktop_settings = malloc(sizeof(DesktopSettings));
plugin_state->curEmotiveFace = 0;
plugin_state->codeSequence = 0;
plugin_state->faceType = FaceStylePwn;
plugin_state->lastexp_timestamp = 0;
plugin_state->songSelect = SoundAlertMario;
plugin_state->time_format = locale_get_time_format();
plugin_state->timer_start_timestamp = 0;
plugin_state->timer_stopped_seconds = 0;
plugin_state->timerSecs = 0;
plugin_state->faceType = 0;
plugin_state->curEmotiveFace = 0;
plugin_state->alert_time = 80;
plugin_state->desktop_settings = malloc(sizeof(DesktopSettings));
plugin_state->w_test = false;
plugin_state->time_format = locale_get_time_format();
plugin_state->date_format = locale_get_date_format();
}

void dab_timer_free(DabTimerState* plugin_state) {
furi_record_close(RECORD_NOTIFICATION);
furi_record_close(RECORD_GUI);
furi_record_close(RECORD_NOTIFICATION);
free(plugin_state->desktop_settings);
furi_message_queue_free(plugin_state->event_queue);
furi_mutex_free(plugin_state->mutex);
free(plugin_state->desktop_settings);
free(plugin_state);
}

Expand Down Expand Up @@ -544,7 +544,7 @@ int32_t dab_timer_app(void* p) {
}
} else {
plugin_state->codeSequence = 0;
if(plugin_state->songSelect <= 2) {
if(plugin_state->songSelect < SoundAlertCount - 1) {
plugin_state->songSelect = plugin_state->songSelect + 1;
} else {
plugin_state->songSelect = 0;
Expand All @@ -564,7 +564,7 @@ int32_t dab_timer_app(void* p) {
plugin_state->timer_stopped_seconds = 0;
plugin_state->timerSecs = 0;
} else {
if(plugin_state->faceType <= 8) {
if(plugin_state->faceType < FaceStyleCount - 1) {
plugin_state->faceType = plugin_state->faceType + 1;
} else {
plugin_state->faceType = 0;
Expand All @@ -578,10 +578,10 @@ int32_t dab_timer_app(void* p) {
} else {
plugin_state->codeSequence = 0;
if(!plugin_state->desktop_settings->is_dumbmode) {
if(plugin_state->songSelect == 1 ||
plugin_state->songSelect == 2 ||
plugin_state->songSelect == 3) {
notification_message(notification, &clock_alert_startStop);
if(plugin_state->songSelect == SoundAlertMario ||
plugin_state->songSelect == SoundAlertGoGoPoRa ||
plugin_state->songSelect == SoundAlertByMin) {
notification_message(notification, &dab_timer_alert_startStop);
}
// START/STOP TIMER
FuriHalRtcDateTime curr_dt;
Expand Down Expand Up @@ -624,8 +624,9 @@ int32_t dab_timer_app(void* p) {
plugin_state->desktop_settings->is_dumbmode =
true; // MAKE SURE IT'S ON SO IT GETS TURNED OFF
dab_timer_dumbmode_changed(plugin_state->desktop_settings);
if(plugin_state->songSelect == 1 || plugin_state->songSelect == 2 ||
plugin_state->songSelect == 3) {
if(plugin_state->songSelect == SoundAlertMario ||
plugin_state->songSelect == SoundAlertGoGoPoRa ||
plugin_state->songSelect == SoundAlertByMin) {
notification_message(notification, &sequence_success);
notification_message(notification, &sequence_rainbow);
notification_message(notification, &sequence_rainbow);
Expand Down Expand Up @@ -656,12 +657,12 @@ int32_t dab_timer_app(void* p) {
if(plugin_state->curEmotiveFace == 25) plugin_state->curEmotiveFace = 0;
}
if(plugin_state->timerSecs % 60 == 0 && plugin_state->timerSecs != 0 &&
plugin_state->songSelect != 0 &&
plugin_state->songSelect != SoundAlertOff &&
(plugin_state->timerSecs < plugin_state->alert_time ||
plugin_state->songSelect == 3)) {
notification_message(notification, &clock_alert_perMin);
plugin_state->songSelect == SoundAlertByMin)) {
notification_message(notification, &dab_timer_alert_perMin);
}
if(plugin_state->songSelect == 1) {
if(plugin_state->songSelect == SoundAlertGoGoPoRa) {
if(plugin_state->timerSecs == plugin_state->alert_time) {
FuriHalRtcDateTime curr_dt;
furi_hal_rtc_get_datetime(&curr_dt);
Expand All @@ -671,17 +672,17 @@ int32_t dab_timer_app(void* p) {
plugin_state->lastexp_timestamp = curr_ts;
dolphin_deed(getRandomDeed());
}
notification_message(notification, &clock_alert_pr1);
notification_message(notification, &dab_timer_alert_pr1);
}
if(plugin_state->timerSecs == plugin_state->alert_time + 1) {
notification_message(notification, &clock_alert_pr2);
notification_message(notification, &dab_timer_alert_pr2);
}
if(plugin_state->timerSecs == plugin_state->alert_time + 2) {
notification_message(notification, &clock_alert_pr3);
notification_message(notification, &dab_timer_alert_pr3);
notification_message(notification, &sequence_rainbow);
notification_message(notification, &sequence_rainbow);
}
} else if(plugin_state->songSelect == 2) {
} else if(plugin_state->songSelect == SoundAlertMario) {
if(plugin_state->timerSecs == plugin_state->alert_time) {
FuriHalRtcDateTime curr_dt;
furi_hal_rtc_get_datetime(&curr_dt);
Expand All @@ -691,13 +692,13 @@ int32_t dab_timer_app(void* p) {
plugin_state->lastexp_timestamp = curr_ts;
dolphin_deed(getRandomDeed());
}
notification_message(notification, &clock_alert_mario1);
notification_message(notification, &dab_timer_alert_mario1);
}
if(plugin_state->timerSecs == plugin_state->alert_time + 1) {
notification_message(notification, &clock_alert_mario2);
notification_message(notification, &dab_timer_alert_mario2);
}
if(plugin_state->timerSecs == plugin_state->alert_time + 2) {
notification_message(notification, &clock_alert_mario3);
notification_message(notification, &dab_timer_alert_mario3);
notification_message(notification, &sequence_rainbow);
notification_message(notification, &sequence_rainbow);
}
Expand All @@ -711,7 +712,7 @@ int32_t dab_timer_app(void* p) {
plugin_state->lastexp_timestamp = curr_ts;
dolphin_deed(getRandomDeed());
}
notification_message(notification, &clock_alert_silent);
notification_message(notification, &dab_timer_alert_silent);
notification_message(notification, &sequence_rainbow);
notification_message(notification, &sequence_rainbow);
}
Expand Down
Loading

0 comments on commit 85e1c00

Please sign in to comment.