Skip to content

Commit 9cf6a78

Browse files
committed
Squashed 'applications/external/' changes from bf3e463b688..51063afd567
51063afd567 VGM Tool: Add new RGB firmware d2432a59496 Merge totp from https://github.com/akopachov/flipper-zero_authenticator d1616805dcb Merge picopass from https://gitlab.com/bettse/picopass be1902125f9 Merge metronome from https://github.com/ezod/flipperzero-metronome 6b28f54d1fe Merge meal_pager from https://github.com/leedave/flipper-zero-meal-pager b9e28170586 Merge gps_nmea from https://github.com/ezod/flipperzero-gps 122854ecfd2 Merge bpmtapper from https://github.com/ezod/flipperzero-bpm-tapper cfecf81528e Fix for API change, wrap message queue in container. 068b44d Fix for API change, wrap message queue in container. 25fe22c Merge pull request #31 from ezod/wrap-message-queue 965dcbe Fix for API change, wrap message queue in container. 9bdc6ab Merge pull request #29 from leedave/feature/refactors 98e83eb Format 90f40dd9853 chore: Updated version 514a494cf94 fix: `totp export` command uses the wrong format to print url-encoded symbol. 9ab8760 Refactors from xMasterX & WillyJL e81e67e acknowledgements git-subtree-dir: applications/external git-subtree-split: 51063afd5679030b7c0d967459b1c007cc79cfff
1 parent 8cbe034 commit 9cf6a78

File tree

15 files changed

+83
-17
lines changed

15 files changed

+83
-17
lines changed

bpmtapper/bpm.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ static void show_hello() {
122122
// END HELLO DIALOG
123123
}
124124

125-
static void input_callback(InputEvent* input_event, void* ctx) {
126-
FuriMessageQueue* event_queue = ctx;
127-
furi_assert(event_queue);
125+
static void input_callback(InputEvent* input_event, void* context) {
126+
furi_assert(context);
127+
FuriMessageQueue* event_queue = context;
128128

129129
PluginEvent event = {.type = EventTypeKey, .input = *input_event};
130130
furi_message_queue_put(event_queue, &event, FuriWaitForever);

gps_nmea/gps.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ static void render_callback(Canvas* const canvas, void* context) {
123123
furi_mutex_release(gps_uart->mutex);
124124
}
125125

126-
static void input_callback(InputEvent* input_event, void* ctx) {
127-
FuriMessageQueue* event_queue = ctx;
128-
furi_assert(event_queue);
126+
static void input_callback(InputEvent* input_event, void* context) {
127+
furi_assert(context);
128+
FuriMessageQueue* event_queue = context;
129129

130130
PluginEvent event = {.type = EventTypeKey, .input = *input_event};
131131
furi_message_queue_put(event_queue, &event, FuriWaitForever);

meal_pager/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Appart from that, most pagers support 8191 Stations. Triggering ~30 Pagers per s
5252
Also your Flipper Zero will crash in that time, as the generated signals use RAM which is limited in the device. There may be ways to work around this, but I think its better to have such a limitation.
5353

5454
## Does this even work
55-
I don't know. It's based on intel collected from other people. The Flipper sends data, I checked that with a second flipper. But if the data actually triggers something is not sure.
55+
I don't know. It's based on intel collected from other people. The Flipper sends data, I checked that with a second flipper. I've also heard rumors that it works in Australia. I'm sure it doesn't work in the US, as they use different frequencies.
5656

5757
Then run the command:
5858
```
@@ -63,4 +63,5 @@ The application will be compiled and copied onto your device.
6363
## Thank you notes
6464
- [Moeker](https://github.com/moeker) and his awesome [pagger tool](https://github.com/meoker/pagger), couldn't have done this without
6565
- [xb8](https://github.com/xb8/t119bruteforcer) for the useful data collected
66-
- [Xenobyte, ShotokanZH](https://twitter.com/xenobyte_/status/1558123251276070912) for their super interesting research
66+
- [Xenobyte, ShotokanZH](https://twitter.com/xenobyte_/status/1558123251276070912) for their super interesting research
67+
- [WillyJL](https://github.com/Willy-JL) and [xMasterX](https://github.com/xMasterX) for code contributions/corrections

meal_pager/application.fam

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ App(
77
fap_icon="icons/meal_pager_10px.png",
88
fap_icon_assets="icons",
99
fap_category="Sub-GHz",
10-
fap_version="1.6",
10+
fap_version="1.7",
1111
fap_author="leedave",
1212
fap_weburl="https://github.com/leedave/flipper-zero-meal-pager",
1313
fap_description="This app triggers restaurant pagers in a brute force manner, useful to test if devices are still functional.",

meal_pager/docs/changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.7
2+
- Added code refactors from xMasterX and WillyJL
3+
- Minor update of Readme
4+
15
## v1.6
26
- Fix crashes on exit on fw 0.100.3
37

meal_pager/meal_pager_i.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#define SUBGHZ_APP_EXTENSION ".sub"
2727
#define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
28-
#define MEAL_PAGER_VERSION "1.6"
28+
#define MEAL_PAGER_VERSION "1.7"
2929

3030
typedef struct Meal_PagerTransmit Meal_PagerTransmit;
3131
typedef struct SubGhz SubGhz;

metronome/metronome.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ static void render_callback(Canvas* const canvas, void* ctx) {
136136
furi_mutex_release(metronome_state->mutex);
137137
}
138138

139-
static void input_callback(InputEvent* input_event, void* ctx) {
140-
FuriMessageQueue* event_queue = ctx;
141-
furi_assert(event_queue);
139+
static void input_callback(InputEvent* input_event, void* context) {
140+
furi_assert(context);
141+
FuriMessageQueue* event_queue = context;
142142

143143
PluginEvent event = {.type = EventTypeKey, .input = *input_event};
144144
furi_message_queue_put(event_queue, &event, FuriWaitForever);

picopass/acknowledgements.h

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
const char* acknowledgements_text =
2+
"The developers of Picopass would like to humbly acknowledge the work of those who came before and made this possible.\nWe stand on the shoulders of giants.\nFlavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and Milosch Meriac for their research on iClass. Martin HS (holiman) for their work on the loclass library. Iceman and the Proxmark3 community.";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#include "../picopass_i.h"
2+
#include <dolphin/dolphin.h>
3+
#include "../acknowledgements.h"
4+
5+
void picopass_scene_acknowledgements_widget_callback(
6+
GuiButtonType result,
7+
InputType type,
8+
void* context) {
9+
Picopass* picopass = context;
10+
if(type == InputTypeShort) {
11+
view_dispatcher_send_custom_event(picopass->view_dispatcher, result);
12+
}
13+
}
14+
15+
void picopass_scene_acknowledgements_on_enter(void* context) {
16+
Picopass* picopass = context;
17+
18+
furi_string_reset(picopass->text_box_store);
19+
20+
FuriString* str = picopass->text_box_store;
21+
furi_string_cat_printf(str, "%s\n", acknowledgements_text);
22+
23+
text_box_set_font(picopass->text_box, TextBoxFontText);
24+
text_box_set_text(picopass->text_box, furi_string_get_cstr(picopass->text_box_store));
25+
view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewTextBox);
26+
}
27+
28+
bool picopass_scene_acknowledgements_on_event(void* context, SceneManagerEvent event) {
29+
Picopass* picopass = context;
30+
bool consumed = false;
31+
32+
if(event.type == SceneManagerEventTypeCustom) {
33+
if(event.event == GuiButtonTypeLeft) {
34+
consumed = scene_manager_previous_scene(picopass->scene_manager);
35+
}
36+
} else if(event.type == SceneManagerEventTypeBack) {
37+
consumed = scene_manager_previous_scene(picopass->scene_manager);
38+
}
39+
return consumed;
40+
}
41+
42+
void picopass_scene_acknowledgements_on_exit(void* context) {
43+
Picopass* picopass = context;
44+
45+
// Clear views
46+
text_box_reset(picopass->text_box);
47+
}

picopass/scenes/picopass_scene_config.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ ADD_SCENE(picopass, key_input, KeyInput)
2222
ADD_SCENE(picopass, nr_mac_saved, NrMacSaved)
2323
ADD_SCENE(picopass, more_info, MoreInfo)
2424
ADD_SCENE(picopass, formats, Formats)
25+
ADD_SCENE(picopass, acknowledgements, Acknowledgements)

picopass/scenes/picopass_scene_start.c

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ enum SubmenuIndex {
33
SubmenuIndexRead,
44
SubmenuIndexSaved,
55
SubmenuIndexLoclass,
6+
SubmenuIndexAcknowledgements,
67
};
78

89
void picopass_scene_start_submenu_callback(void* context, uint32_t index) {
@@ -17,9 +18,14 @@ void picopass_scene_start_on_enter(void* context) {
1718
submenu, "Read Card", SubmenuIndexRead, picopass_scene_start_submenu_callback, picopass);
1819
submenu_add_item(
1920
submenu, "Saved", SubmenuIndexSaved, picopass_scene_start_submenu_callback, picopass);
20-
2121
submenu_add_item(
2222
submenu, "Loclass", SubmenuIndexLoclass, picopass_scene_start_submenu_callback, picopass);
23+
submenu_add_item(
24+
submenu,
25+
"Acknowledgements",
26+
SubmenuIndexAcknowledgements,
27+
picopass_scene_start_submenu_callback,
28+
picopass);
2329

2430
submenu_set_selected_item(
2531
submenu, scene_manager_get_scene_state(picopass->scene_manager, PicopassSceneStart));
@@ -49,6 +55,11 @@ bool picopass_scene_start_on_event(void* context, SceneManagerEvent event) {
4955
picopass->scene_manager, PicopassSceneStart, PicopassSceneLoclass);
5056
scene_manager_next_scene(picopass->scene_manager, PicopassSceneLoclass);
5157
consumed = true;
58+
} else if(event.event == SubmenuIndexAcknowledgements) {
59+
scene_manager_set_scene_state(
60+
picopass->scene_manager, PicopassSceneStart, PicopassSceneAcknowledgements);
61+
scene_manager_next_scene(picopass->scene_manager, PicopassSceneAcknowledgements);
62+
consumed = true;
5263
}
5364
}
5465

totp/application.fam

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ App(
77
requires=["gui", "cli", "dialogs", "storage", "input", "notification", "bt"],
88
stack_size=2 * 1024,
99
order=20,
10-
fap_version="5.140",
10+
fap_version="5.141",
1111
fap_author="Alexander Kopachov (@akopachov)",
1212
fap_description="Software-based TOTP/HOTP authenticator for Flipper Zero device",
1313
fap_weburl="https://github.com/akopachov/flipper-zero_authenticator",

totp/cli/plugins/export/export.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static void print_uri_component(const char* data, size_t length) {
4141
c == '-' || c == '_') {
4242
putchar(c);
4343
} else {
44-
printf("%%%x", c);
44+
printf("%%%02x", c);
4545
}
4646
c_ptr++;
4747
}

totp/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
#define TOTP_APP_VERSION_MAJOR (5)
44
#define TOTP_APP_VERSION_MINOR (14)
5-
#define TOTP_APP_VERSION_PATCH (0)
5+
#define TOTP_APP_VERSION_PATCH (1)
64 KB
Binary file not shown.

0 commit comments

Comments
 (0)