Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-25 01:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '420' into MoreFAPs

Browse Source
This commit is contained in:
RogueMaster
2022-11-02 19:25:50 -04:00
parent ed330c432a b2f0be3dc7
commit 5525d3ad46
20 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/barcode_generator/barcode_generator.c
+2 -2
View File
@@ -346,8 +346,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
case 9:
number_9(canvas, isOnRight, editingMarkerPosition[index]);
break;
default:
break;
default:
break;
}
}
applications/plugins/blackjack/blackjack.c
+2 -2
View File
@@ -599,8 +599,8 @@ int32_t blackjack_app(void* p) {
case InputKeyOk:
localstate->selectDirection = Select;
break;
default:
break;
default:
break;
}
}
} else if(event.type == EventTypeTick) {
applications/plugins/bpmtapper/bpm.c
+2 -2
View File
@@ -236,8 +236,8 @@ int32_t bpm_tapper_app(void* p) {
// Exit the plugin
processing = false;
break;
default:
break;
default:
break;
}
}
}
applications/plugins/dice/dice.c
+1 -1
View File
@@ -556,7 +556,7 @@ int32_t dice_app(void* p) {
processing = false;
break;
default:
break;
break;
}
}
} else if(event.type == EventTypeTick) {
applications/plugins/doom/doom.c
+5 -6
View File
@@ -155,9 +155,9 @@ void spawnEntity(uint8_t type, uint8_t x, uint8_t y, PluginState* const plugin_s
plugin_state->entity[plugin_state->num_entities] = create_medikit(x, y);
plugin_state->num_entities++;
break;
default:
break;
default:
break;
}
}
@@ -462,9 +462,8 @@ void updateEntities(const uint8_t level[], Canvas* const canvas, PluginState* co
break;
}
default:
break;
default:
break;
}
i++;
applications/plugins/flashlight/flashlight.c
+1 -1
View File
@@ -109,7 +109,7 @@ int32_t flashlight_app() {
processing = false;
break;
default:
break;
break;
}
}
}
applications/plugins/flipfrid/flipfrid.c
+10 -10
View File
@@ -33,8 +33,8 @@ static void flipfrid_draw_callback(Canvas* const canvas, void* ctx) {
case SceneLoadCustomUids:
flipfrid_scene_load_custom_uids_on_draw(canvas, flipfrid_state);
break;
default:
break;
default:
break;
}
release_mutex((ValueMutex*)ctx, flipfrid_state);
@@ -178,8 +178,8 @@ int32_t flipfrid_start(void* p) {
case SceneLoadCustomUids:
flipfrid_scene_load_custom_uids_on_event(event, flipfrid_state);
break;
default:
break;
default:
break;
}
} else if(event.evt_type == EventTypeTick) {
@@ -204,8 +204,8 @@ int32_t flipfrid_start(void* p) {
break;
case NoneScene:
break;
default:
break;
default:
break;
}
// Trigger Entry Scene
@@ -226,8 +226,8 @@ int32_t flipfrid_start(void* p) {
case SceneLoadCustomUids:
flipfrid_scene_load_custom_uids_on_enter(flipfrid_state);
break;
default:
break;
default:
break;
}
flipfrid_state->previous_scene = flipfrid_state->current_scene;
}
@@ -250,8 +250,8 @@ int32_t flipfrid_start(void* p) {
case SceneLoadCustomUids:
flipfrid_scene_load_custom_uids_on_tick(flipfrid_state);
break;
default:
break;
default:
break;
}
view_port_update(view_port);
}
applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c
+2 -2
View File
@@ -486,8 +486,8 @@ void flipfrid_scene_run_attack_on_tick(FlipFridState* context) {
context->payload[i] = (uint8_t)strtol(temp_str, NULL, 16);
}
break;
default:
break;
default:
break;
}
}
}
applications/plugins/game2048/game_2048.c
+2 -2
View File
@@ -466,8 +466,8 @@ int32_t game_2048_app(void* p) {
case InputKeyBack:
loop = false;
break;
default:
break;
default:
break;
}
} else if(event.type == InputTypeLong) {
if(event.key == InputKeyOk) {
applications/plugins/mandelbrot/mandelbrot.c
+2 -2
View File
@@ -149,8 +149,8 @@ int32_t mandelbrot_app(void* p) {
case InputKeyBack:
processing = false;
break;
default:
break;
default:
break;
}
}
}
applications/plugins/metronome/metronome.c
+6 -6
View File
@@ -158,8 +158,8 @@ static void timer_callback(void* ctx) {
break;
case Silent:
break;
default:
break;
default:
break;
}
} else {
// unpronounced beat
@@ -173,8 +173,8 @@ static void timer_callback(void* ctx) {
break;
case Silent:
break;
default:
break;
default:
break;
}
};
@@ -196,8 +196,8 @@ static void timer_callback(void* ctx) {
break;
case Silent:
break;
default:
break;
default:
break;
}
notification_message(metronome_state->notifications, &sequence_reset_rgb);
applications/plugins/montyhall/monteyhall.c
+2 -2
View File
@@ -422,8 +422,8 @@ int32_t montyhall_game_app(void* p) {
case InputKeyBack:
loop = false;
break;
default:
break;
default:
break;
}
}
} else if(event.type == InputTypeLong) {
applications/plugins/ocarina/ocarina.c
+2 -2
View File
@@ -102,8 +102,8 @@ int32_t ocarina_app(void* p) {
case InputKeyBack:
processing = false;
break;
default:
break;
default:
break;
}
} else if(event.type == InputTypeRelease) {
furi_hal_speaker_stop();
applications/plugins/playlist/playlist.c
+2 -2
View File
@@ -591,8 +591,8 @@ static void render_callback(Canvas* canvas, void* ctx) {
}
}
break;
default:
break;
default:
break;
}
furi_string_free(temp_str);
applications/plugins/scorched_tanks/scorched_tanks_game_app.c
+2 -2
View File
@@ -515,8 +515,8 @@ int32_t scorched_tanks_game_app(void* p) {
case InputKeyBack:
processing = false;
break;
default:
break;
default:
break;
}
}
} else if(event.type == EventTypeTick) {
applications/plugins/tanksgame/tanks_game.c
+12 -12
View File
@@ -550,8 +550,8 @@ unsigned char* tanks_game_serialize(const TanksState* const tanks_state) {
case DirectionLeft:
cell = CellEnemyLeft;
break;
default:
break;
default:
break;
}
tanks_game_write_cell(
@@ -579,8 +579,8 @@ unsigned char* tanks_game_serialize(const TanksState* const tanks_state) {
case DirectionLeft:
cell = CellProjectileLeft;
break;
default:
break;
default:
break;
}
tanks_game_write_cell(
@@ -607,8 +607,8 @@ unsigned char* tanks_game_serialize(const TanksState* const tanks_state) {
case DirectionLeft:
cell = CellTankLeft;
break;
default:
break;
default:
break;
}
tanks_game_write_cell(
@@ -631,8 +631,8 @@ unsigned char* tanks_game_serialize(const TanksState* const tanks_state) {
case DirectionLeft:
cell = CellTankLeft;
break;
default:
break;
default:
break;
}
tanks_game_write_cell(
@@ -1251,8 +1251,8 @@ static Point tanks_game_get_next_step(Point coordinates, Direction direction) {
case DirectionLeft:
next_step.x--;
break;
default:
break;
default:
break;
}
return next_step;
}
@@ -1709,8 +1709,8 @@ int32_t tanks_game_app(void* p) {
case InputKeyBack:
processing = false;
break;
default:
break;
default:
break;
}
}
} else if(event.type == EventTypeTick) {
applications/plugins/trex_runner/trexrunner.c
+2 -2
View File
@@ -126,8 +126,8 @@ int32_t trexrunner_app(void* p) {
// Exit the app
processing = false;
break;
default:
break;
default:
break;
}
}
}
applications/plugins/tuning_fork/tuning_fork.c
+6 -6
View File
@@ -288,8 +288,8 @@ int32_t tuning_fork_app() {
tuning_fork_state->page = Tunings;
}
break;
default:
break;
default:
break;
}
} else if(event.input.type == InputTypeLong) {
// hold events
@@ -332,8 +332,8 @@ int32_t tuning_fork_app() {
tuning_fork_state->current_tuning_note_index = 0;
}
break;
default:
break;
default:
break;
}
} else if(event.input.type == InputTypeRepeat) {
// repeat events
@@ -376,8 +376,8 @@ int32_t tuning_fork_app() {
tuning_fork_state->current_tuning_note_index = 0;
}
break;
default:
break;
default:
break;
}
}
}
applications/plugins/unirfremix/unirfremix_app.c
+4 -4
View File
@@ -788,8 +788,8 @@ static void render_callback(Canvas* canvas, void* ctx) {
canvas_draw_icon(canvas, 113, 15, &I_Pin_cell_13x13);
canvas_draw_icon(canvas, 116, 18, &I_Pin_star_7x7);
break;
default:
break;
default:
break;
}
//Repeat indicator
@@ -1096,8 +1096,8 @@ int32_t unirfremix_app(void* p) {
case 5:
app->send_status_c = 5;
break;
default:
break;
default:
break;
}
app->processing = 2;
applications/plugins/videopoker/poker.c
+2 -2
View File
@@ -806,8 +806,8 @@ int32_t video_poker_app(void* p) {
/* if game is not over, we should store the game state. */
processing = false;
break;
default:
break;
default:
break;
}
}
}