diff --git a/applications/external/asteroids/application.fam b/applications/external/asteroids/application.fam index 5f70a0e1c..5eb43a6e5 100644 --- a/applications/external/asteroids/application.fam +++ b/applications/external/asteroids/application.fam @@ -8,8 +8,8 @@ App( stack_size=8 * 1024, order=50, fap_icon="appicon.png", - fap_icon_assets="assets", # Image assets to compile for this application fap_category="Games", + fap_icon_assets="assets", # Image assets to compile for this application fap_description="An implementation of the classic arcade game Asteroids", fap_author="antirez, SimplyMinimal", fap_weburl="https://github.com/SimplyMinimal/FlipperZero-Asteroids", diff --git a/applications/external/bpmtapper/img/screenshot.png b/applications/external/bpmtapper/img/screenshot.png deleted file mode 100644 index fbba2aad9..000000000 Binary files a/applications/external/bpmtapper/img/screenshot.png and /dev/null differ diff --git a/applications/external/brainfuck/icons/DolphinCommon_56x48.png b/applications/external/brainfuck/icons/DolphinCommon_56x48.png deleted file mode 100644 index 089aaed83..000000000 Binary files a/applications/external/brainfuck/icons/DolphinCommon_56x48.png and /dev/null differ diff --git a/applications/external/brainfuck/icons/Text_10x10.png b/applications/external/brainfuck/icons/Text_10x10.png deleted file mode 100644 index 8e8a6183d..000000000 Binary files a/applications/external/brainfuck/icons/Text_10x10.png and /dev/null differ diff --git a/applications/external/cli_bridge/internal_defs.h b/applications/external/cli_bridge/internal_defs.h index 9840d008b..09fe6169c 100644 --- a/applications/external/cli_bridge/internal_defs.h +++ b/applications/external/cli_bridge/internal_defs.h @@ -79,8 +79,8 @@ typedef struct { void* view_dispatcher; void* primary_menu; - void* plugins_menu; - void* debug_menu; + // void* plugins_menu; + // void* debug_menu; void* settings_menu; volatile uint8_t lock_count; diff --git a/applications/external/doom/assets/screenshot1.png b/applications/external/doom/assets/screenshot1.png deleted file mode 100644 index 1ecb073a6..000000000 Binary files a/applications/external/doom/assets/screenshot1.png and /dev/null differ diff --git a/applications/external/doom/assets/screenshot2.png b/applications/external/doom/assets/screenshot2.png deleted file mode 100644 index 216b699de..000000000 Binary files a/applications/external/doom/assets/screenshot2.png and /dev/null differ diff --git a/applications/external/doom/assets/screenshot3.png b/applications/external/doom/assets/screenshot3.png deleted file mode 100644 index b5aec03fd..000000000 Binary files a/applications/external/doom/assets/screenshot3.png and /dev/null differ diff --git a/applications/external/geiger/flipper_geiger.c b/applications/external/geiger/flipper_geiger.c index a5503eb90..9c3d0d3fc 100644 --- a/applications/external/geiger/flipper_geiger.c +++ b/applications/external/geiger/flipper_geiger.c @@ -39,33 +39,53 @@ typedef struct { static void draw_callback(Canvas* canvas, void* ctx) { furi_assert(ctx); - mutexStruct displayStruct; - mutexStruct* geigerMutex = ctx; - furi_mutex_acquire(geigerMutex->mutex, FuriWaitForever); - memcpy(&displayStruct, geigerMutex, sizeof(mutexStruct)); - furi_mutex_release(geigerMutex->mutex); + mutexStruct* mutexVal = ctx; + mutexStruct mutexDraw; + furi_mutex_acquire(mutexVal->mutex, FuriWaitForever); + memcpy(&mutexDraw, mutexVal, sizeof(mutexStruct)); + furi_mutex_release(mutexVal->mutex); char buffer[32]; - if(displayStruct.data == 0) - snprintf( - buffer, sizeof(buffer), "%ld cps - %ld cpm", displayStruct.cps, displayStruct.cpm); - else if(displayStruct.data == 1) + if(mutexDraw.data == 0) + snprintf(buffer, sizeof(buffer), "%ld cps - %ld cpm", mutexDraw.cps, mutexDraw.cpm); + else if(mutexDraw.data == 1) snprintf( buffer, sizeof(buffer), "%ld cps - %.2f uSv/h", - displayStruct.cps, - ((double)displayStruct.cpm * (double)CONVERSION_FACTOR)); - else + mutexDraw.cps, + ((double)mutexDraw.cpm * (double)CONVERSION_FACTOR)); + else if(mutexDraw.data == 2) snprintf( buffer, sizeof(buffer), "%ld cps - %.2f mSv/y", - displayStruct.cps, - (((double)displayStruct.cpm * (double)CONVERSION_FACTOR)) * (double)8.76); + mutexDraw.cps, + (((double)mutexDraw.cpm * (double)CONVERSION_FACTOR)) * (double)8.76); + else if(mutexDraw.data == 3) + snprintf( + buffer, + sizeof(buffer), + "%ld cps - %.4f Rad/h", + mutexDraw.cps, + ((double)mutexDraw.cpm * (double)CONVERSION_FACTOR) / (double)10000); + else if(mutexDraw.data == 4) + snprintf( + buffer, + sizeof(buffer), + "%ld cps - %.2f mR/h", + mutexDraw.cps, + ((double)mutexDraw.cpm * (double)CONVERSION_FACTOR) / (double)10); + else + snprintf( + buffer, + sizeof(buffer), + "%ld cps - %.2f uR/h", + mutexDraw.cps, + ((double)mutexDraw.cpm * (double)CONVERSION_FACTOR) * (double)100); for(int i = 0; i < SCREEN_SIZE_X; i += 2) { - float Y = SCREEN_SIZE_Y - (displayStruct.line[i / 2] * displayStruct.coef); + float Y = SCREEN_SIZE_Y - (mutexDraw.line[i / 2] * mutexDraw.coef); canvas_draw_line(canvas, i, Y, i, SCREEN_SIZE_Y); canvas_draw_line(canvas, i + 1, Y, i + 1, SCREEN_SIZE_Y); @@ -103,8 +123,7 @@ static void gpiocallback(void* ctx) { furi_message_queue_put(queue, &event, 0); } -int32_t flipper_geiger_app(void* p) { - UNUSED(p); +int32_t flipper_geiger_app() { EventApp event; FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(EventApp)); @@ -127,7 +146,7 @@ int32_t flipper_geiger_app(void* p) { } ViewPort* view_port = view_port_alloc(); - view_port_draw_callback_set(view_port, draw_callback, &mutexVal); + view_port_draw_callback_set(view_port, draw_callback, &mutexVal.mutex); view_port_input_callback_set(view_port, input_callback, event_queue); furi_hal_gpio_add_int_callback(&gpio_ext_pa7, gpiocallback, event_queue); @@ -167,7 +186,7 @@ int32_t flipper_geiger_app(void* p) { if(mutexVal.data != 0) mutexVal.data--; else - mutexVal.data = 2; + mutexVal.data = 5; screenRefresh = 1; furi_mutex_release(mutexVal.mutex); @@ -175,7 +194,7 @@ int32_t flipper_geiger_app(void* p) { event.input.type == InputTypeShort)) { furi_mutex_acquire(mutexVal.mutex, FuriWaitForever); - if(mutexVal.data != 2) + if(mutexVal.data != 5) mutexVal.data++; else mutexVal.data = 0; diff --git a/applications/external/gpio_reader_a/GPIO_reader.c b/applications/external/gpioreader_a/GPIO_reader.c similarity index 100% rename from applications/external/gpio_reader_a/GPIO_reader.c rename to applications/external/gpioreader_a/GPIO_reader.c diff --git a/applications/external/gpio_reader_a/GPIO_reader_item.c b/applications/external/gpioreader_a/GPIO_reader_item.c similarity index 100% rename from applications/external/gpio_reader_a/GPIO_reader_item.c rename to applications/external/gpioreader_a/GPIO_reader_item.c diff --git a/applications/external/gpio_reader_a/GPIO_reader_item.h b/applications/external/gpioreader_a/GPIO_reader_item.h similarity index 100% rename from applications/external/gpio_reader_a/GPIO_reader_item.h rename to applications/external/gpioreader_a/GPIO_reader_item.h diff --git a/applications/external/gpio_reader_a/application.fam b/applications/external/gpioreader_a/application.fam similarity index 100% rename from applications/external/gpio_reader_a/application.fam rename to applications/external/gpioreader_a/application.fam diff --git a/applications/external/gpio_reader_a/icon.png b/applications/external/gpioreader_a/icon.png similarity index 100% rename from applications/external/gpio_reader_a/icon.png rename to applications/external/gpioreader_a/icon.png diff --git a/applications/external/gpio_reader_b/LICENSE b/applications/external/gpioreader_b/LICENSE similarity index 100% rename from applications/external/gpio_reader_b/LICENSE rename to applications/external/gpioreader_b/LICENSE diff --git a/applications/external/gpio_reader_b/application.fam b/applications/external/gpioreader_b/application.fam similarity index 100% rename from applications/external/gpio_reader_b/application.fam rename to applications/external/gpioreader_b/application.fam diff --git a/applications/external/gpio_reader_b/gpio_app.c b/applications/external/gpioreader_b/gpio_app.c similarity index 100% rename from applications/external/gpio_reader_b/gpio_app.c rename to applications/external/gpioreader_b/gpio_app.c diff --git a/applications/external/gpio_reader_b/gpio_app.h b/applications/external/gpioreader_b/gpio_app.h similarity index 100% rename from applications/external/gpio_reader_b/gpio_app.h rename to applications/external/gpioreader_b/gpio_app.h diff --git a/applications/external/gpio_reader_b/gpio_app_i.h b/applications/external/gpioreader_b/gpio_app_i.h similarity index 100% rename from applications/external/gpio_reader_b/gpio_app_i.h rename to applications/external/gpioreader_b/gpio_app_i.h diff --git a/applications/external/gpio_reader_b/gpio_custom_event.h b/applications/external/gpioreader_b/gpio_custom_event.h similarity index 100% rename from applications/external/gpio_reader_b/gpio_custom_event.h rename to applications/external/gpioreader_b/gpio_custom_event.h diff --git a/applications/external/gpio_reader_b/gpio_item.c b/applications/external/gpioreader_b/gpio_item.c similarity index 100% rename from applications/external/gpio_reader_b/gpio_item.c rename to applications/external/gpioreader_b/gpio_item.c diff --git a/applications/external/gpio_reader_b/gpio_item.h b/applications/external/gpioreader_b/gpio_item.h similarity index 100% rename from applications/external/gpio_reader_b/gpio_item.h rename to applications/external/gpioreader_b/gpio_item.h diff --git a/applications/external/gpio_reader_b/icon.png b/applications/external/gpioreader_b/icon.png similarity index 100% rename from applications/external/gpio_reader_b/icon.png rename to applications/external/gpioreader_b/icon.png diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene.c b/applications/external/gpioreader_b/scenes/gpio_scene.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene.c rename to applications/external/gpioreader_b/scenes/gpio_scene.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene.h b/applications/external/gpioreader_b/scenes/gpio_scene.h similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene.h rename to applications/external/gpioreader_b/scenes/gpio_scene.h diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_config.h b/applications/external/gpioreader_b/scenes/gpio_scene_config.h similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_config.h rename to applications/external/gpioreader_b/scenes/gpio_scene_config.h diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_reader.c b/applications/external/gpioreader_b/scenes/gpio_scene_reader.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_reader.c rename to applications/external/gpioreader_b/scenes/gpio_scene_reader.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_start.c b/applications/external/gpioreader_b/scenes/gpio_scene_start.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_start.c rename to applications/external/gpioreader_b/scenes/gpio_scene_start.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_test.c b/applications/external/gpioreader_b/scenes/gpio_scene_test.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_test.c rename to applications/external/gpioreader_b/scenes/gpio_scene_test.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart.c b/applications/external/gpioreader_b/scenes/gpio_scene_usb_uart.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart.c rename to applications/external/gpioreader_b/scenes/gpio_scene_usb_uart.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart_close_rpc.c b/applications/external/gpioreader_b/scenes/gpio_scene_usb_uart_close_rpc.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart_close_rpc.c rename to applications/external/gpioreader_b/scenes/gpio_scene_usb_uart_close_rpc.c diff --git a/applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart_config.c b/applications/external/gpioreader_b/scenes/gpio_scene_usb_uart_config.c similarity index 100% rename from applications/external/gpio_reader_b/scenes/gpio_scene_usb_uart_config.c rename to applications/external/gpioreader_b/scenes/gpio_scene_usb_uart_config.c diff --git a/applications/external/gpio_reader_b/usb_uart_bridge.c b/applications/external/gpioreader_b/usb_uart_bridge.c similarity index 100% rename from applications/external/gpio_reader_b/usb_uart_bridge.c rename to applications/external/gpioreader_b/usb_uart_bridge.c diff --git a/applications/external/gpio_reader_b/usb_uart_bridge.h b/applications/external/gpioreader_b/usb_uart_bridge.h similarity index 100% rename from applications/external/gpio_reader_b/usb_uart_bridge.h rename to applications/external/gpioreader_b/usb_uart_bridge.h diff --git a/applications/external/gpio_reader_b/views/gpio_reader.c b/applications/external/gpioreader_b/views/gpio_reader.c similarity index 100% rename from applications/external/gpio_reader_b/views/gpio_reader.c rename to applications/external/gpioreader_b/views/gpio_reader.c diff --git a/applications/external/gpio_reader_b/views/gpio_reader.h b/applications/external/gpioreader_b/views/gpio_reader.h similarity index 100% rename from applications/external/gpio_reader_b/views/gpio_reader.h rename to applications/external/gpioreader_b/views/gpio_reader.h diff --git a/applications/external/gpio_reader_b/views/gpio_test.c b/applications/external/gpioreader_b/views/gpio_test.c similarity index 100% rename from applications/external/gpio_reader_b/views/gpio_test.c rename to applications/external/gpioreader_b/views/gpio_test.c diff --git a/applications/external/gpio_reader_b/views/gpio_test.h b/applications/external/gpioreader_b/views/gpio_test.h similarity index 100% rename from applications/external/gpio_reader_b/views/gpio_test.h rename to applications/external/gpioreader_b/views/gpio_test.h diff --git a/applications/external/gpio_reader_b/views/gpio_usb_uart.c b/applications/external/gpioreader_b/views/gpio_usb_uart.c similarity index 98% rename from applications/external/gpio_reader_b/views/gpio_usb_uart.c rename to applications/external/gpioreader_b/views/gpio_usb_uart.c index f71dcccab..14f8c12fe 100644 --- a/applications/external/gpio_reader_b/views/gpio_usb_uart.c +++ b/applications/external/gpioreader_b/views/gpio_usb_uart.c @@ -82,7 +82,7 @@ static void gpio_usb_uart_draw_callback(Canvas* canvas, void* _model) { if(model->rx_active) canvas_draw_icon_ex(canvas, 48, 34, &I_ArrowUpFilled_14x15, IconRotation180); else - canvas_draw_icon_ex(canvas, 48, 34, &I_ArrowUpFilled_14x15, IconRotation180); + canvas_draw_icon_ex(canvas, 48, 34, &I_ArrowUpEmpty_14x15, IconRotation180); } static bool gpio_usb_uart_input_callback(InputEvent* event, void* context) { diff --git a/applications/external/gpio_reader_b/views/gpio_usb_uart.h b/applications/external/gpioreader_b/views/gpio_usb_uart.h similarity index 100% rename from applications/external/gpio_reader_b/views/gpio_usb_uart.h rename to applications/external/gpioreader_b/views/gpio_usb_uart.h diff --git a/applications/external/metronome/img/screenshot.png b/applications/external/metronome/img/screenshot.png deleted file mode 100644 index 7b6916e81..000000000 Binary files a/applications/external/metronome/img/screenshot.png and /dev/null differ diff --git a/applications/external/minesweeper/img/screenshot.png b/applications/external/minesweeper/img/screenshot.png deleted file mode 100644 index 65b307c55..000000000 Binary files a/applications/external/minesweeper/img/screenshot.png and /dev/null differ diff --git a/applications/external/musictracker/application.fam b/applications/external/music_tracker/application.fam similarity index 90% rename from applications/external/musictracker/application.fam rename to applications/external/music_tracker/application.fam index fe4355e86..f3bac02c2 100644 --- a/applications/external/musictracker/application.fam +++ b/applications/external/music_tracker/application.fam @@ -10,4 +10,5 @@ App( order=20, fap_icon="zero_tracker.png", fap_category="Music", + fap_icon_assets="icons", ) diff --git a/applications/external/musictracker/tracker_engine/speaker_hal.c b/applications/external/music_tracker/tracker_engine/speaker_hal.c similarity index 91% rename from applications/external/musictracker/tracker_engine/speaker_hal.c rename to applications/external/music_tracker/tracker_engine/speaker_hal.c index 94489f1b6..208fee04c 100644 --- a/applications/external/musictracker/tracker_engine/speaker_hal.c +++ b/applications/external/music_tracker/tracker_engine/speaker_hal.c @@ -40,17 +40,12 @@ void tracker_speaker_stop() { } void tracker_speaker_init() { - if(furi_hal_speaker_is_mine() || furi_hal_speaker_acquire(1000)) { - furi_hal_speaker_start(200.0f, 0.01f); - tracker_speaker_stop(); - } + furi_hal_speaker_start(200.0f, 0.01f); + tracker_speaker_stop(); } void tracker_speaker_deinit() { - if(furi_hal_speaker_is_mine()) { - furi_hal_speaker_stop(); - furi_hal_speaker_release(); - } + furi_hal_speaker_stop(); } static FuriHalInterruptISR tracker_isr; diff --git a/applications/external/musictracker/tracker_engine/speaker_hal.h b/applications/external/music_tracker/tracker_engine/speaker_hal.h similarity index 100% rename from applications/external/musictracker/tracker_engine/speaker_hal.h rename to applications/external/music_tracker/tracker_engine/speaker_hal.h diff --git a/applications/external/musictracker/tracker_engine/tracker.c b/applications/external/music_tracker/tracker_engine/tracker.c similarity index 100% rename from applications/external/musictracker/tracker_engine/tracker.c rename to applications/external/music_tracker/tracker_engine/tracker.c diff --git a/applications/external/musictracker/tracker_engine/tracker.h b/applications/external/music_tracker/tracker_engine/tracker.h similarity index 100% rename from applications/external/musictracker/tracker_engine/tracker.h rename to applications/external/music_tracker/tracker_engine/tracker.h diff --git a/applications/external/musictracker/tracker_engine/tracker_notes.h b/applications/external/music_tracker/tracker_engine/tracker_notes.h similarity index 100% rename from applications/external/musictracker/tracker_engine/tracker_notes.h rename to applications/external/music_tracker/tracker_engine/tracker_notes.h diff --git a/applications/external/musictracker/tracker_engine/tracker_song.h b/applications/external/music_tracker/tracker_engine/tracker_song.h similarity index 100% rename from applications/external/musictracker/tracker_engine/tracker_song.h rename to applications/external/music_tracker/tracker_engine/tracker_song.h diff --git a/applications/external/musictracker/view/tracker_view.c b/applications/external/music_tracker/view/tracker_view.c similarity index 100% rename from applications/external/musictracker/view/tracker_view.c rename to applications/external/music_tracker/view/tracker_view.c diff --git a/applications/external/musictracker/view/tracker_view.h b/applications/external/music_tracker/view/tracker_view.h similarity index 100% rename from applications/external/musictracker/view/tracker_view.h rename to applications/external/music_tracker/view/tracker_view.h diff --git a/applications/external/musictracker/zero_tracker.c b/applications/external/music_tracker/zero_tracker.c similarity index 100% rename from applications/external/musictracker/zero_tracker.c rename to applications/external/music_tracker/zero_tracker.c diff --git a/applications/external/musictracker/zero_tracker.h b/applications/external/music_tracker/zero_tracker.h similarity index 100% rename from applications/external/musictracker/zero_tracker.h rename to applications/external/music_tracker/zero_tracker.h diff --git a/applications/external/musictracker/zero_tracker.png b/applications/external/music_tracker/zero_tracker.png similarity index 100% rename from applications/external/musictracker/zero_tracker.png rename to applications/external/music_tracker/zero_tracker.png diff --git a/applications/external/nightstand_clock/application.fam b/applications/external/nightstand/application.fam similarity index 100% rename from applications/external/nightstand_clock/application.fam rename to applications/external/nightstand/application.fam diff --git a/applications/external/nightstand_clock/clock.png b/applications/external/nightstand/clock.png similarity index 100% rename from applications/external/nightstand_clock/clock.png rename to applications/external/nightstand/clock.png diff --git a/applications/external/nightstand_clock/clock_app.c b/applications/external/nightstand/clock_app.c similarity index 100% rename from applications/external/nightstand_clock/clock_app.c rename to applications/external/nightstand/clock_app.c diff --git a/applications/external/nightstand_clock/clock_app.h b/applications/external/nightstand/clock_app.h similarity index 100% rename from applications/external/nightstand_clock/clock_app.h rename to applications/external/nightstand/clock_app.h diff --git a/applications/external/pomodoro/flipp_pomodoro_app.c b/applications/external/pomodoro/flipp_pomodoro_app.c index 5adca1edb..2ddf8cf68 100644 --- a/applications/external/pomodoro/flipp_pomodoro_app.c +++ b/applications/external/pomodoro/flipp_pomodoro_app.c @@ -78,6 +78,7 @@ void flipp_pomodoro_app_free(FlippPomodoroApp* app) { view_dispatcher_free(app->view_dispatcher); scene_manager_free(app->scene_manager); flipp_pomodoro_view_timer_free(app->timer_view); + flipp_pomodoro__destroy(app->state); free(app); furi_record_close(RECORD_GUI); furi_record_close(RECORD_NOTIFICATION); diff --git a/applications/external/pomodoro/modules/flipp_pomodoro.c b/applications/external/pomodoro/modules/flipp_pomodoro.c index 161e862f8..9915025fb 100644 --- a/applications/external/pomodoro/modules/flipp_pomodoro.c +++ b/applications/external/pomodoro/modules/flipp_pomodoro.c @@ -55,6 +55,11 @@ char* flipp_pomodoro__next_stage_label(FlippPomodoroState* state) { return next_stage_label[flipp_pomodoro__stage_by_index(state->current_stage_index + 1)]; }; +void flipp_pomodoro__destroy(FlippPomodoroState* state) { + furi_assert(state); + free(state); +}; + uint32_t flipp_pomodoro__current_stage_total_duration(FlippPomodoroState* state) { const int32_t stage_duration_seconds_map[] = { [FlippPomodoroStageFocus] = 25 * TIME_SECONDS_IN_MINUTE, diff --git a/applications/external/pong/flipper_pong.c b/applications/external/pong/flipper_pong.c index 55b371ad5..53c6a7e27 100644 --- a/applications/external/pong/flipper_pong.c +++ b/applications/external/pong/flipper_pong.c @@ -15,8 +15,7 @@ #define PAD_SIZE_X 3 #define PAD_SIZE_Y 8 -#define PLAYER1_PAD_SPEED 4 - +#define PLAYER1_PAD_SPEED 2 #define PLAYER2_PAD_SPEED 2 #define BALL_SIZE 4 @@ -39,29 +38,22 @@ typedef struct Players { static void draw_callback(Canvas* canvas, void* ctx) { furi_assert(ctx); - Players* playersMutex = ctx; - furi_mutex_acquire(playersMutex->mutex, FuriWaitForever); + Players* players = ctx; + furi_mutex_acquire(players->mutex, FuriWaitForever); canvas_draw_frame(canvas, 0, 0, 128, 64); - canvas_draw_box( - canvas, playersMutex->player1_X, playersMutex->player1_Y, PAD_SIZE_X, PAD_SIZE_Y); - canvas_draw_box( - canvas, playersMutex->player2_X, playersMutex->player2_Y, PAD_SIZE_X, PAD_SIZE_Y); - canvas_draw_box(canvas, playersMutex->ball_X, playersMutex->ball_Y, BALL_SIZE, BALL_SIZE); + canvas_draw_box(canvas, players->player1_X, players->player1_Y, PAD_SIZE_X, PAD_SIZE_Y); + canvas_draw_box(canvas, players->player2_X, players->player2_Y, PAD_SIZE_X, PAD_SIZE_Y); + canvas_draw_box(canvas, players->ball_X, players->ball_Y, BALL_SIZE, BALL_SIZE); canvas_set_font(canvas, FontPrimary); canvas_set_font_direction(canvas, CanvasDirectionBottomToTop); char buffer[16]; - snprintf( - buffer, - sizeof(buffer), - "%u - %u", - playersMutex->player1_score, - playersMutex->player2_score); + snprintf(buffer, sizeof(buffer), "%u - %u", players->player1_score, players->player2_score); canvas_draw_str_aligned( canvas, SCREEN_SIZE_X / 2 + 15, SCREEN_SIZE_Y / 2 + 2, AlignCenter, AlignTop, buffer); - furi_mutex_release(playersMutex->mutex); + furi_mutex_release(players->mutex); } static void input_callback(InputEvent* input_event, void* ctx) { @@ -101,8 +93,7 @@ uint8_t changeDirection() { return randomuint8[0]; } -int32_t flipper_pong_app(void* p) { - UNUSED(p); +int32_t flipper_pong_app() { EventApp event; FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(EventApp)); @@ -129,7 +120,7 @@ int32_t flipper_pong_app(void* p) { } ViewPort* view_port = view_port_alloc(); - view_port_draw_callback_set(view_port, draw_callback, &players); + view_port_draw_callback_set(view_port, draw_callback, &players.mutex); view_port_input_callback_set(view_port, input_callback, event_queue); Gui* gui = furi_record_open(RECORD_GUI); @@ -152,7 +143,6 @@ int32_t flipper_pong_app(void* p) { if(event.type == EventTypeInput) { if(event.input.key == InputKeyBack) { furi_mutex_release(players.mutex); - notification_message(notification, &sequence_set_only_green_255); break; } else if(event.input.key == InputKeyUp) { if(players.player1_Y >= 1 + PLAYER1_PAD_SPEED) diff --git a/applications/external/rc2014_coleco/coleco.c b/applications/external/rc2014_coleco/coleco.c index 311b0ceac..f0a4c6188 100644 --- a/applications/external/rc2014_coleco/coleco.c +++ b/applications/external/rc2014_coleco/coleco.c @@ -40,15 +40,14 @@ typedef struct { } PluginEvent; typedef struct { - FuriMutex* mutex; bool dpad; int row; int column; + FuriMutex* mutex; } Coleco; static void render_callback(Canvas* const canvas, void* context) { - furi_assert(context); - Coleco* coleco = context; + Coleco* coleco = (Coleco*)context; furi_mutex_acquire(coleco->mutex, FuriWaitForever); if(coleco->dpad) { @@ -175,12 +174,20 @@ static Coleco* coleco_alloc() { coleco->row = 0; coleco->column = 1; + coleco->mutex = furi_mutex_alloc(FuriMutexTypeNormal); + if(!coleco->mutex) { + FURI_LOG_E("Coleco", "cannot create mutex\r\n"); + free(coleco); + return NULL; + } + return coleco; } static void coleco_free(Coleco* coleco) { furi_assert(coleco); + furi_mutex_free(coleco->mutex); free(coleco); } @@ -190,11 +197,7 @@ int32_t coleco_app(void* p) { FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent)); Coleco* coleco = coleco_alloc(); - - coleco->mutex = furi_mutex_alloc(FuriMutexTypeNormal); - if(!coleco->mutex) { - FURI_LOG_E("Coleco", "cannot create mutex\r\n"); - coleco_free(coleco); + if(coleco == NULL) { return 255; } @@ -346,6 +349,8 @@ int32_t coleco_app(void* p) { view_port_update(view_port); } + } else { + FURI_LOG_D("Coleco", "FuriMessageQueue: event timeout"); } furi_mutex_release(coleco->mutex); @@ -358,7 +363,6 @@ int32_t coleco_app(void* p) { furi_record_close("gui"); view_port_free(view_port); furi_message_queue_free(event_queue); - furi_mutex_free(coleco->mutex); coleco_free(coleco); return 0; } diff --git a/applications/external/rubiks_cube_scrambler/rubiks_cube_scrambler.c b/applications/external/rubiks_cube_scrambler/rubiks_cube_scrambler.c index 4c845b883..17e48473a 100644 --- a/applications/external/rubiks_cube_scrambler/rubiks_cube_scrambler.c +++ b/applications/external/rubiks_cube_scrambler/rubiks_cube_scrambler.c @@ -8,11 +8,11 @@ #include "scrambler.h" #include "furi_hal_random.h" -int scrambleStarted = 0; +bool scrambleStarted = false; char scramble_str[100] = {0}; char scramble_start[100] = {0}; char scramble_end[100] = {0}; -int notifications_enabled = 0; +bool notifications_enabled = false; static void success_vibration() { furi_hal_vibro_on(false); @@ -22,12 +22,12 @@ static void success_vibration() { return; } void split_array(char original[], int size, char first[], char second[]) { - int mid = size / 2; + int32_t mid = size / 2; if(size % 2 != 0) { mid++; } - int first_index = 0, second_index = 0; - for(int i = 0; i < size; i++) { + int32_t first_index = 0, second_index = 0; + for(int32_t i = 0; i < size; i++) { if(i < mid) { first[first_index++] = original[i]; } else { @@ -40,23 +40,17 @@ void split_array(char original[], int size, char first[], char second[]) { first[first_index] = '\0'; second[second_index] = '\0'; } +void genScramble() { + scrambleReplace(); + strcpy(scramble_str, printData()); + split_array(scramble_str, strlen(scramble_str), scramble_start, scramble_end); +} static void draw_callback(Canvas* canvas, void* ctx) { UNUSED(ctx); canvas_clear(canvas); canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 4, 13, "Rubik's Cube Scrambler"); - - if(scrambleStarted) { - genScramble(); - scrambleReplace(); - strcpy(scramble_str, printData()); - if(notifications_enabled) { - success_vibration(); - } - split_array(scramble_str, strlen(scramble_str), scramble_start, scramble_end); - scrambleStarted = 0; - } canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 28, AlignCenter, AlignCenter, scramble_start); canvas_draw_str_aligned(canvas, 64, 38, AlignCenter, AlignCenter, scramble_end); @@ -90,13 +84,16 @@ int32_t rubiks_cube_scrambler_main(void* p) { furi_check(furi_message_queue_get(event_queue, &event, FuriWaitForever) == FuriStatusOk); if(event.key == InputKeyOk && event.type == InputTypeShort) { - scrambleStarted = 1; + genScramble(); + if(notifications_enabled) { + success_vibration(); + } } if(event.key == InputKeyLeft && event.type == InputTypeShort) { if(notifications_enabled) { - notifications_enabled = 0; + notifications_enabled = false; } else { - notifications_enabled = 1; + notifications_enabled = true; success_vibration(); } } diff --git a/applications/external/rubiks_cube_scrambler/scrambler.c b/applications/external/rubiks_cube_scrambler/scrambler.c index ea5291940..b97a67400 100644 --- a/applications/external/rubiks_cube_scrambler/scrambler.c +++ b/applications/external/rubiks_cube_scrambler/scrambler.c @@ -12,66 +12,37 @@ Authors: Tanish Bhongade and RaZe // 6 moves along with direction char moves[6] = {'R', 'U', 'F', 'B', 'L', 'D'}; -char dir[4] = {' ', '\'', '2'}; -const int SLEN = 20; +char dir[4] = {'\'', '2'}; +const int32_t SLEN = 20; #define RESULT_SIZE 100 -// Structure which holds main scramble + struct GetScramble { char mainScramble[25][3]; }; -struct GetScramble a; // Its object - -// Function prototypes to avoid bugs -void scrambleReplace(); -void genScramble(); -void valid(); -int getRand(int upr, int lwr); -char* printData(); -void writeToFile(); - -// Main function -/* int main(){ - genScramble ();//Calling genScramble - scrambleReplace();//Calling scrambleReplace - valid();//Calling valid to validate the scramble - printData ();//Printing the final scramble - //writeToFile();//If you want to write to a file, please uncomment this - - return 0; -} */ - -void genScramble() { - // Stage 1 - for(int i = 0; i < SLEN; i++) { - strcpy(a.mainScramble[i], "00"); - } - // This makes array like this 00 00 00....... -} +struct GetScramble a; void scrambleReplace() { - // Stage 2 - // Actual process begins here - // Initialize the mainScramble array with all the possible moves - for(int i = 0; i < SLEN; i++) { + for(int32_t i = 0; i < SLEN; i++) { a.mainScramble[i][0] = moves[furi_hal_random_get() % 6]; a.mainScramble[i][1] = dir[furi_hal_random_get() % 3]; } - // Perform the Fisher-Yates shuffle - for(int i = 6 - 1; i > 0; i--) { - int j = rand() % (i + 1); + /* // Perform the Fisher-Yates shuffle + for (int32_t i = 6 - 1; i > 0; i--) + { + int32_t j = rand() % (i + 1); char temp[3]; strcpy(temp, a.mainScramble[i]); strcpy(a.mainScramble[i], a.mainScramble[j]); strcpy(a.mainScramble[j], temp); - } + } */ - // Select the first 10 elements as the scramble, using only the first three elements of the dir array - for(int i = 0; i < SLEN; i++) { + // Select the first 10 elements as the scramble, using only the first two elements of the dir array + for(int32_t i = 0; i < SLEN; i++) { a.mainScramble[i][1] = dir[furi_hal_random_get() % 3]; } - for(int i = 1; i < SLEN; i++) { + for(int32_t i = 1; i < SLEN; i++) { while(a.mainScramble[i][0] == a.mainScramble[i - 2][0] || a.mainScramble[i][0] == a.mainScramble[i - 1][0]) { a.mainScramble[i][0] = moves[furi_hal_random_get() % 5]; @@ -79,24 +50,11 @@ void scrambleReplace() { } } -// Let this function be here for now till I find out what is causing the extra space bug in the scrambles -void remove_double_spaces(char* str) { - int i, j; - int len = strlen(str); - for(i = 0, j = 0; i < len; i++, j++) { - if(str[i] == ' ' && str[i + 1] == ' ') { - i++; - } - str[j] = str[i]; - } - str[j] = '\0'; -} char* printData() { static char result[RESULT_SIZE]; - int offset = 0; - for(int loop = 0; loop < SLEN; loop++) { + int32_t offset = 0; + for(int32_t loop = 0; loop < SLEN; loop++) { offset += snprintf(result + offset, RESULT_SIZE - offset, "%s ", a.mainScramble[loop]); } - remove_double_spaces(result); return result; -} +} \ No newline at end of file diff --git a/applications/external/rubiks_cube_scrambler/scrambler.h b/applications/external/rubiks_cube_scrambler/scrambler.h index 4b56c565d..557ef20ae 100644 --- a/applications/external/rubiks_cube_scrambler/scrambler.h +++ b/applications/external/rubiks_cube_scrambler/scrambler.h @@ -1,3 +1,2 @@ void scrambleReplace(); -void genScramble(); char* printData(); diff --git a/applications/external/timelapse/icons/ButtonDownHollow_7x4.png b/applications/external/timelapse/icons/ButtonDownHollow_7x4.png new file mode 100644 index 000000000..2b87c4364 Binary files /dev/null and b/applications/external/timelapse/icons/ButtonDownHollow_7x4.png differ diff --git a/applications/external/timelapse/icons/ButtonLeftHollow_4x7.png b/applications/external/timelapse/icons/ButtonLeftHollow_4x7.png new file mode 100644 index 000000000..374dc7d1a Binary files /dev/null and b/applications/external/timelapse/icons/ButtonLeftHollow_4x7.png differ diff --git a/applications/external/timelapse/icons/ButtonRightHollow_4x7.png b/applications/external/timelapse/icons/ButtonRightHollow_4x7.png new file mode 100644 index 000000000..acbb08592 Binary files /dev/null and b/applications/external/timelapse/icons/ButtonRightHollow_4x7.png differ diff --git a/applications/external/timelapse/icons/ButtonUpHollow_7x4.png b/applications/external/timelapse/icons/ButtonUpHollow_7x4.png new file mode 100644 index 000000000..e88ee3322 Binary files /dev/null and b/applications/external/timelapse/icons/ButtonUpHollow_7x4.png differ diff --git a/applications/external/timelapse/zeitraffer.c b/applications/external/timelapse/zeitraffer.c index cbae4fa44..73ea4424a 100644 --- a/applications/external/timelapse/zeitraffer.c +++ b/applications/external/timelapse/zeitraffer.c @@ -69,16 +69,18 @@ static void draw_callback(Canvas* canvas, void* ctx) { canvas_draw_str(canvas, 13, 55, "AUTO"); } - //canvas_draw_icon(canvas, 90, 17, &I_ButtonUp_7x4); - //canvas_draw_icon(canvas, 100, 17, &I_ButtonDown_7x4); - //canvas_draw_icon(canvas, 27, 17, &I_ButtonLeftSmall_3x5); - //canvas_draw_icon(canvas, 37, 17, &I_ButtonRightSmall_3x5); - //canvas_draw_icon(canvas, 3, 48, &I_Pin_star_7x7); + if(Work) { + canvas_draw_icon(canvas, 85, 41, &I_ButtonUpHollow_7x4); + canvas_draw_icon(canvas, 85, 57, &I_ButtonDownHollow_7x4); + canvas_draw_icon(canvas, 59, 48, &I_ButtonLeftHollow_4x7); + canvas_draw_icon(canvas, 72, 48, &I_ButtonRightHollow_4x7); + } else { + canvas_draw_icon(canvas, 85, 41, &I_ButtonUp_7x4); + canvas_draw_icon(canvas, 85, 57, &I_ButtonDown_7x4); + canvas_draw_icon(canvas, 59, 48, &I_ButtonLeft_4x7); + canvas_draw_icon(canvas, 72, 48, &I_ButtonRight_4x7); + } - canvas_draw_icon(canvas, 85, 41, &I_ButtonUp_7x4); - canvas_draw_icon(canvas, 85, 57, &I_ButtonDown_7x4); - canvas_draw_icon(canvas, 59, 48, &I_ButtonLeft_4x7); - canvas_draw_icon(canvas, 72, 48, &I_ButtonRight_4x7); canvas_draw_icon(canvas, 3, 48, &I_Pin_star_7x7); canvas_set_font(canvas, FontPrimary); @@ -87,8 +89,8 @@ static void draw_callback(Canvas* canvas, void* ctx) { canvas_set_font(canvas, FontPrimary); canvas_draw_str(canvas, 85, 55, "S"); - canvas_draw_icon(canvas, 59, 48, &I_ButtonLeft_4x7); - canvas_draw_icon(canvas, 72, 48, &I_ButtonRight_4x7); + //canvas_draw_icon(canvas, 59, 48, &I_ButtonLeft_4x7); + //canvas_draw_icon(canvas, 72, 48, &I_ButtonRight_4x7); if(Work) { canvas_draw_icon(canvas, 106, 46, &I_loading_10px); @@ -151,6 +153,10 @@ int32_t zeitraffer_app(void* p) { FlipperFormat* load = flipper_format_file_alloc(storage); do { + if(!storage_simply_mkdir(storage, CONFIG_FILE_DIRECTORY_PATH)) { + notification_message(notifications, &sequence_error); + break; + } if(!flipper_format_file_open_existing(load, CONFIG_FILE_PATH)) { notification_message(notifications, &sequence_error); break; @@ -247,6 +253,8 @@ int32_t zeitraffer_app(void* p) { if(WorkTime == 0) WorkTime = Delay; + if(Count == 1) WorkTime = Time; + if(Count == 0) { InfiniteShot = true; WorkCount = 1; @@ -390,7 +398,7 @@ int32_t zeitraffer_app(void* p) { } if(!flipper_format_write_comment_cstr( save, - "Zeitraffer app settings: n of frames, interval time, backlight type, Delay")) { + "Zeitraffer app settings: № of frames, interval time, backlight type, Delay")) { notification_message(notifications, &sequence_error); break; } diff --git a/applications/external/wii_ec_anal/LICENSE b/applications/external/wiiec/LICENSE similarity index 100% rename from applications/external/wii_ec_anal/LICENSE rename to applications/external/wiiec/LICENSE diff --git a/applications/external/wii_ec_anal/WiiEC.png b/applications/external/wiiec/WiiEC.png similarity index 100% rename from applications/external/wii_ec_anal/WiiEC.png rename to applications/external/wiiec/WiiEC.png diff --git a/applications/external/wii_ec_anal/_image_tool/LICENSE b/applications/external/wiiec/_image_tool/LICENSE similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/LICENSE rename to applications/external/wiiec/_image_tool/LICENSE diff --git a/applications/external/wii_ec_anal/_image_tool/README b/applications/external/wiiec/_image_tool/README similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/README rename to applications/external/wiiec/_image_tool/README diff --git a/applications/external/wii_ec_anal/_image_tool/_convert.c b/applications/external/wiiec/_image_tool/_convert.c similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/_convert.c rename to applications/external/wiiec/_image_tool/_convert.c diff --git a/applications/external/wii_ec_anal/_image_tool/_convert.sh b/applications/external/wiiec/_image_tool/_convert.sh similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/_convert.sh rename to applications/external/wiiec/_image_tool/_convert.sh diff --git a/applications/external/wii_ec_anal/_image_tool/_convert_images.c b/applications/external/wiiec/_image_tool/_convert_images.c similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/_convert_images.c rename to applications/external/wiiec/_image_tool/_convert_images.c diff --git a/applications/external/wii_ec_anal/_image_tool/_convert_images.h b/applications/external/wiiec/_image_tool/_convert_images.h similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/_convert_images.h rename to applications/external/wiiec/_image_tool/_convert_images.h diff --git a/applications/external/wii_ec_anal/_image_tool/_convert_test.c b/applications/external/wiiec/_image_tool/_convert_test.c similarity index 100% rename from applications/external/wii_ec_anal/_image_tool/_convert_test.c rename to applications/external/wiiec/_image_tool/_convert_test.c diff --git a/applications/external/wii_ec_anal/application.fam b/applications/external/wiiec/application.fam similarity index 100% rename from applications/external/wii_ec_anal/application.fam rename to applications/external/wiiec/application.fam diff --git a/applications/external/wii_ec_anal/bc_logging.h b/applications/external/wiiec/bc_logging.h similarity index 100% rename from applications/external/wii_ec_anal/bc_logging.h rename to applications/external/wiiec/bc_logging.h diff --git a/applications/external/wii_ec_anal/err.h b/applications/external/wiiec/err.h similarity index 100% rename from applications/external/wii_ec_anal/err.h rename to applications/external/wiiec/err.h diff --git a/applications/external/wii_ec_anal/gfx/images.c b/applications/external/wiiec/gfx/images.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/images.c rename to applications/external/wiiec/gfx/images.c diff --git a/applications/external/wii_ec_anal/gfx/images.h b/applications/external/wiiec/gfx/images.h similarity index 100% rename from applications/external/wii_ec_anal/gfx/images.h rename to applications/external/wiiec/gfx/images.h diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_0.c b/applications/external/wiiec/gfx/img_3x5_0.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_0.c rename to applications/external/wiiec/gfx/img_3x5_0.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_1.c b/applications/external/wiiec/gfx/img_3x5_1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_1.c rename to applications/external/wiiec/gfx/img_3x5_1.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_2.c b/applications/external/wiiec/gfx/img_3x5_2.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_2.c rename to applications/external/wiiec/gfx/img_3x5_2.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_3.c b/applications/external/wiiec/gfx/img_3x5_3.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_3.c rename to applications/external/wiiec/gfx/img_3x5_3.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_4.c b/applications/external/wiiec/gfx/img_3x5_4.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_4.c rename to applications/external/wiiec/gfx/img_3x5_4.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_5.c b/applications/external/wiiec/gfx/img_3x5_5.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_5.c rename to applications/external/wiiec/gfx/img_3x5_5.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_6.c b/applications/external/wiiec/gfx/img_3x5_6.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_6.c rename to applications/external/wiiec/gfx/img_3x5_6.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_7.c b/applications/external/wiiec/gfx/img_3x5_7.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_7.c rename to applications/external/wiiec/gfx/img_3x5_7.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_8.c b/applications/external/wiiec/gfx/img_3x5_8.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_8.c rename to applications/external/wiiec/gfx/img_3x5_8.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_9.c b/applications/external/wiiec/gfx/img_3x5_9.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_9.c rename to applications/external/wiiec/gfx/img_3x5_9.c diff --git a/applications/external/wii_ec_anal/gfx/img_3x5_v.c b/applications/external/wiiec/gfx/img_3x5_v.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_3x5_v.c rename to applications/external/wiiec/gfx/img_3x5_v.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_0.c b/applications/external/wiiec/gfx/img_5x7_0.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_0.c rename to applications/external/wiiec/gfx/img_5x7_0.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_1.c b/applications/external/wiiec/gfx/img_5x7_1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_1.c rename to applications/external/wiiec/gfx/img_5x7_1.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_2.c b/applications/external/wiiec/gfx/img_5x7_2.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_2.c rename to applications/external/wiiec/gfx/img_5x7_2.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_3.c b/applications/external/wiiec/gfx/img_5x7_3.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_3.c rename to applications/external/wiiec/gfx/img_5x7_3.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_4.c b/applications/external/wiiec/gfx/img_5x7_4.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_4.c rename to applications/external/wiiec/gfx/img_5x7_4.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_5.c b/applications/external/wiiec/gfx/img_5x7_5.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_5.c rename to applications/external/wiiec/gfx/img_5x7_5.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_6.c b/applications/external/wiiec/gfx/img_5x7_6.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_6.c rename to applications/external/wiiec/gfx/img_5x7_6.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_7.c b/applications/external/wiiec/gfx/img_5x7_7.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_7.c rename to applications/external/wiiec/gfx/img_5x7_7.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_8.c b/applications/external/wiiec/gfx/img_5x7_8.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_8.c rename to applications/external/wiiec/gfx/img_5x7_8.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_9.c b/applications/external/wiiec/gfx/img_5x7_9.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_9.c rename to applications/external/wiiec/gfx/img_5x7_9.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_A.c b/applications/external/wiiec/gfx/img_5x7_A.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_A.c rename to applications/external/wiiec/gfx/img_5x7_A.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_B.c b/applications/external/wiiec/gfx/img_5x7_B.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_B.c rename to applications/external/wiiec/gfx/img_5x7_B.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_C.c b/applications/external/wiiec/gfx/img_5x7_C.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_C.c rename to applications/external/wiiec/gfx/img_5x7_C.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_D.c b/applications/external/wiiec/gfx/img_5x7_D.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_D.c rename to applications/external/wiiec/gfx/img_5x7_D.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_E.c b/applications/external/wiiec/gfx/img_5x7_E.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_E.c rename to applications/external/wiiec/gfx/img_5x7_E.c diff --git a/applications/external/wii_ec_anal/gfx/img_5x7_F.c b/applications/external/wiiec/gfx/img_5x7_F.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_5x7_F.c rename to applications/external/wiiec/gfx/img_5x7_F.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_0.c b/applications/external/wiiec/gfx/img_6x8_0.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_0.c rename to applications/external/wiiec/gfx/img_6x8_0.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_1.c b/applications/external/wiiec/gfx/img_6x8_1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_1.c rename to applications/external/wiiec/gfx/img_6x8_1.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_2.c b/applications/external/wiiec/gfx/img_6x8_2.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_2.c rename to applications/external/wiiec/gfx/img_6x8_2.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_3.c b/applications/external/wiiec/gfx/img_6x8_3.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_3.c rename to applications/external/wiiec/gfx/img_6x8_3.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_4.c b/applications/external/wiiec/gfx/img_6x8_4.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_4.c rename to applications/external/wiiec/gfx/img_6x8_4.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_5.c b/applications/external/wiiec/gfx/img_6x8_5.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_5.c rename to applications/external/wiiec/gfx/img_6x8_5.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_6.c b/applications/external/wiiec/gfx/img_6x8_6.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_6.c rename to applications/external/wiiec/gfx/img_6x8_6.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_7.c b/applications/external/wiiec/gfx/img_6x8_7.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_7.c rename to applications/external/wiiec/gfx/img_6x8_7.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_8.c b/applications/external/wiiec/gfx/img_6x8_8.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_8.c rename to applications/external/wiiec/gfx/img_6x8_8.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_9.c b/applications/external/wiiec/gfx/img_6x8_9.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_9.c rename to applications/external/wiiec/gfx/img_6x8_9.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_A.c b/applications/external/wiiec/gfx/img_6x8_A.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_A.c rename to applications/external/wiiec/gfx/img_6x8_A.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_B.c b/applications/external/wiiec/gfx/img_6x8_B.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_B.c rename to applications/external/wiiec/gfx/img_6x8_B.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_C.c b/applications/external/wiiec/gfx/img_6x8_C.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_C.c rename to applications/external/wiiec/gfx/img_6x8_C.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_D.c b/applications/external/wiiec/gfx/img_6x8_D.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_D.c rename to applications/external/wiiec/gfx/img_6x8_D.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_E.c b/applications/external/wiiec/gfx/img_6x8_E.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_E.c rename to applications/external/wiiec/gfx/img_6x8_E.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_F.c b/applications/external/wiiec/gfx/img_6x8_F.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_F.c rename to applications/external/wiiec/gfx/img_6x8_F.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_G.c b/applications/external/wiiec/gfx/img_6x8_G.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_G.c rename to applications/external/wiiec/gfx/img_6x8_G.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_X.c b/applications/external/wiiec/gfx/img_6x8_X.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_X.c rename to applications/external/wiiec/gfx/img_6x8_X.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_Y.c b/applications/external/wiiec/gfx/img_6x8_Y.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_Y.c rename to applications/external/wiiec/gfx/img_6x8_Y.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_Z.c b/applications/external/wiiec/gfx/img_6x8_Z.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_Z.c rename to applications/external/wiiec/gfx/img_6x8_Z.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_d_.c b/applications/external/wiiec/gfx/img_6x8_d_.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_d_.c rename to applications/external/wiiec/gfx/img_6x8_d_.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_n_.c b/applications/external/wiiec/gfx/img_6x8_n_.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_n_.c rename to applications/external/wiiec/gfx/img_6x8_n_.c diff --git a/applications/external/wii_ec_anal/gfx/img_6x8_v_.c b/applications/external/wiiec/gfx/img_6x8_v_.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_6x8_v_.c rename to applications/external/wiiec/gfx/img_6x8_v_.c diff --git a/applications/external/wii_ec_anal/gfx/img_RIP.c b/applications/external/wiiec/gfx/img_RIP.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_RIP.c rename to applications/external/wiiec/gfx/img_RIP.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_Cable.c b/applications/external/wiiec/gfx/img_cc_Cable.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_Cable.c rename to applications/external/wiiec/gfx/img_cc_Cable.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_Joy.c b/applications/external/wiiec/gfx/img_cc_Joy.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_Joy.c rename to applications/external/wiiec/gfx/img_cc_Joy.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_Main.c b/applications/external/wiiec/gfx/img_cc_Main.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_Main.c rename to applications/external/wiiec/gfx/img_cc_Main.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_btn_A1.c b/applications/external/wiiec/gfx/img_cc_btn_A1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_btn_A1.c rename to applications/external/wiiec/gfx/img_cc_btn_A1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_btn_B1.c b/applications/external/wiiec/gfx/img_cc_btn_B1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_btn_B1.c rename to applications/external/wiiec/gfx/img_cc_btn_B1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_btn_X1.c b/applications/external/wiiec/gfx/img_cc_btn_X1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_btn_X1.c rename to applications/external/wiiec/gfx/img_cc_btn_X1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_btn_Y1.c b/applications/external/wiiec/gfx/img_cc_btn_Y1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_btn_Y1.c rename to applications/external/wiiec/gfx/img_cc_btn_Y1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_pad_LR1.c b/applications/external/wiiec/gfx/img_cc_pad_LR1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_pad_LR1.c rename to applications/external/wiiec/gfx/img_cc_pad_LR1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_pad_UD1.c b/applications/external/wiiec/gfx/img_cc_pad_UD1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_pad_UD1.c rename to applications/external/wiiec/gfx/img_cc_pad_UD1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_L1.c b/applications/external/wiiec/gfx/img_cc_trg_L1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_L1.c rename to applications/external/wiiec/gfx/img_cc_trg_L1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_L2.c b/applications/external/wiiec/gfx/img_cc_trg_L2.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_L2.c rename to applications/external/wiiec/gfx/img_cc_trg_L2.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_L3.c b/applications/external/wiiec/gfx/img_cc_trg_L3.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_L3.c rename to applications/external/wiiec/gfx/img_cc_trg_L3.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_L4.c b/applications/external/wiiec/gfx/img_cc_trg_L4.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_L4.c rename to applications/external/wiiec/gfx/img_cc_trg_L4.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_R1.c b/applications/external/wiiec/gfx/img_cc_trg_R1.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_R1.c rename to applications/external/wiiec/gfx/img_cc_trg_R1.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_R2.c b/applications/external/wiiec/gfx/img_cc_trg_R2.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_R2.c rename to applications/external/wiiec/gfx/img_cc_trg_R2.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_R3.c b/applications/external/wiiec/gfx/img_cc_trg_R3.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_R3.c rename to applications/external/wiiec/gfx/img_cc_trg_R3.c diff --git a/applications/external/wii_ec_anal/gfx/img_cc_trg_R4.c b/applications/external/wiiec/gfx/img_cc_trg_R4.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_cc_trg_R4.c rename to applications/external/wiiec/gfx/img_cc_trg_R4.c diff --git a/applications/external/wii_ec_anal/gfx/img_csLogo_FULL.c b/applications/external/wiiec/gfx/img_csLogo_FULL.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_csLogo_FULL.c rename to applications/external/wiiec/gfx/img_csLogo_FULL.c diff --git a/applications/external/wii_ec_anal/gfx/img_csLogo_Small.c b/applications/external/wiiec/gfx/img_csLogo_Small.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_csLogo_Small.c rename to applications/external/wiiec/gfx/img_csLogo_Small.c diff --git a/applications/external/wii_ec_anal/gfx/img_ecp_SCL.c b/applications/external/wiiec/gfx/img_ecp_SCL.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_ecp_SCL.c rename to applications/external/wiiec/gfx/img_ecp_SCL.c diff --git a/applications/external/wii_ec_anal/gfx/img_ecp_SDA.c b/applications/external/wiiec/gfx/img_ecp_SDA.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_ecp_SDA.c rename to applications/external/wiiec/gfx/img_ecp_SDA.c diff --git a/applications/external/wii_ec_anal/gfx/img_ecp_port.c b/applications/external/wiiec/gfx/img_ecp_port.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_ecp_port.c rename to applications/external/wiiec/gfx/img_ecp_port.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_Back.c b/applications/external/wiiec/gfx/img_key_Back.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_Back.c rename to applications/external/wiiec/gfx/img_key_Back.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_D.c b/applications/external/wiiec/gfx/img_key_D.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_D.c rename to applications/external/wiiec/gfx/img_key_D.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_L.c b/applications/external/wiiec/gfx/img_key_L.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_L.c rename to applications/external/wiiec/gfx/img_key_L.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_OK.c b/applications/external/wiiec/gfx/img_key_OK.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_OK.c rename to applications/external/wiiec/gfx/img_key_OK.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_OKi.c b/applications/external/wiiec/gfx/img_key_OKi.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_OKi.c rename to applications/external/wiiec/gfx/img_key_OKi.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_R.c b/applications/external/wiiec/gfx/img_key_R.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_R.c rename to applications/external/wiiec/gfx/img_key_R.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_U.c b/applications/external/wiiec/gfx/img_key_U.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_U.c rename to applications/external/wiiec/gfx/img_key_U.c diff --git a/applications/external/wii_ec_anal/gfx/img_key_Ui.c b/applications/external/wiiec/gfx/img_key_Ui.c similarity index 100% rename from applications/external/wii_ec_anal/gfx/img_key_Ui.c rename to applications/external/wiiec/gfx/img_key_Ui.c diff --git a/applications/external/wii_ec_anal/i2c_workaround.h b/applications/external/wiiec/i2c_workaround.h similarity index 100% rename from applications/external/wii_ec_anal/i2c_workaround.h rename to applications/external/wiiec/i2c_workaround.h diff --git a/applications/external/wii_ec_anal/info.sh b/applications/external/wiiec/info.sh similarity index 100% rename from applications/external/wii_ec_anal/info.sh rename to applications/external/wiiec/info.sh diff --git a/applications/external/wii_ec_anal/wii_anal.c b/applications/external/wiiec/wii_anal.c similarity index 96% rename from applications/external/wii_ec_anal/wii_anal.c rename to applications/external/wiiec/wii_anal.c index 34b4f318b..e3bb21f0f 100644 --- a/applications/external/wii_ec_anal/wii_anal.c +++ b/applications/external/wiiec/wii_anal.c @@ -80,6 +80,8 @@ static void showVer(Canvas* const canvas) { show(canvas, 4, 59, VER_MAJ, SHOW_SET_BLK); canvas_draw_frame(canvas, 8, 62, 2, 2); show(canvas, 11, 59, VER_MIN, SHOW_SET_BLK); + canvas_draw_frame(canvas, 15, 62, 2, 2); + show(canvas, 18, 59, VER_SUB, SHOW_SET_BLK); } //+============================================================================ @@ -94,9 +96,10 @@ static void cbDraw(Canvas* const canvas, void* ctx) { furi_assert(canvas); furi_assert(ctx); - // Try to acquire the mutex for the plugin state variables, timeout = 25mS state_t* state = ctx; - furi_mutex_acquire(state->mutex, FuriWaitForever); + + // Try to acquire the mutex for the plugin state variables, timeout = 25mS + if(furi_mutex_acquire(state->mutex, 25) != FuriStatusOk) return; switch(state->scene) { //--------------------------------------------------------------------- @@ -344,8 +347,7 @@ int32_t wii_ec_anal(void) { goto bail; } // 5. Create a mutex for (reading/writing) the plugin state variables - state->mutex = furi_mutex_alloc(FuriMutexTypeNormal); - if(!state->mutex) { + if(!(state->mutex = furi_mutex_alloc(FuriMutexTypeNormal))) { ERROR(wii_errs[(error = ERR_NO_MUTEX)]); goto bail; } @@ -434,7 +436,10 @@ int32_t wii_ec_anal(void) { // Read successful // *** Try to lock the plugin state variables *** - furi_mutex_acquire(state->mutex, FuriWaitForever); + if(furi_mutex_acquire(state->mutex, FuriWaitForever) != FuriStatusOk) { + ERROR(wii_errs[(error = ERR_MUTEX_BLOCK)]); + goto bail; + } // *** Handle events *** switch(msg.id) { @@ -472,7 +477,10 @@ int32_t wii_ec_anal(void) { if(redraw) view_port_update(vpp); // *** Try to release the plugin state variables *** - furi_mutex_release(state->mutex); + if(furi_mutex_release(state->mutex) != FuriStatusOk) { + ERROR(wii_errs[(error = ERR_MUTEX_RELEASE)]); + goto bail; + } } while(state->run); // ===== Game Over ===== @@ -507,7 +515,10 @@ bail: } // 5. Free the mutex - furi_mutex_free(state->mutex); + if(state->mutex) { + furi_mutex_free(state->mutex); + state->mutex = NULL; + } // 4. Free up state pointer(s) // none diff --git a/applications/external/wii_ec_anal/wii_anal.h b/applications/external/wiiec/wii_anal.h similarity index 98% rename from applications/external/wii_ec_anal/wii_anal.h rename to applications/external/wiiec/wii_anal.h index d8997b030..3be398a54 100644 --- a/applications/external/wii_ec_anal/wii_anal.h +++ b/applications/external/wiiec/wii_anal.h @@ -56,7 +56,8 @@ typedef struct eventMsg { // Access to this memory is controlled by mutex // typedef struct state { - FuriMutex* mutex; + FuriMutex* mutex; // mutex for using this struct + bool run; // true : plugin is running bool timerEn; // controller scanning enabled diff --git a/applications/external/wii_ec_anal/wii_anal_ec.c b/applications/external/wiiec/wii_anal_ec.c similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_ec.c rename to applications/external/wiiec/wii_anal_ec.c diff --git a/applications/external/wii_ec_anal/wii_anal_ec.h b/applications/external/wiiec/wii_anal_ec.h similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_ec.h rename to applications/external/wiiec/wii_anal_ec.h diff --git a/applications/external/wii_ec_anal/wii_anal_keys.c b/applications/external/wiiec/wii_anal_keys.c similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_keys.c rename to applications/external/wiiec/wii_anal_keys.c diff --git a/applications/external/wii_ec_anal/wii_anal_keys.h b/applications/external/wiiec/wii_anal_keys.h similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_keys.h rename to applications/external/wiiec/wii_anal_keys.h diff --git a/applications/external/wii_ec_anal/wii_anal_lcd.c b/applications/external/wiiec/wii_anal_lcd.c similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_lcd.c rename to applications/external/wiiec/wii_anal_lcd.c diff --git a/applications/external/wii_ec_anal/wii_anal_lcd.h b/applications/external/wiiec/wii_anal_lcd.h similarity index 100% rename from applications/external/wii_ec_anal/wii_anal_lcd.h rename to applications/external/wiiec/wii_anal_lcd.h diff --git a/applications/external/wii_ec_anal/wii_anal_ver.h b/applications/external/wiiec/wii_anal_ver.h similarity index 85% rename from applications/external/wii_ec_anal/wii_anal_ver.h rename to applications/external/wiiec/wii_anal_ver.h index 3f2c8c0e6..df2659d57 100644 --- a/applications/external/wii_ec_anal/wii_anal_ver.h +++ b/applications/external/wiiec/wii_anal_ver.h @@ -5,5 +5,6 @@ #define VER_MAJ &img_3x5_1 #define VER_MIN &img_3x5_0 +#define VER_SUB &img_3x5_1 #endif //WII_ANAL_VER_H_ diff --git a/applications/external/wii_ec_anal/wii_ec.c b/applications/external/wiiec/wii_ec.c similarity index 100% rename from applications/external/wii_ec_anal/wii_ec.c rename to applications/external/wiiec/wii_ec.c diff --git a/applications/external/wii_ec_anal/wii_ec.h b/applications/external/wiiec/wii_ec.h similarity index 100% rename from applications/external/wii_ec_anal/wii_ec.h rename to applications/external/wiiec/wii_ec.h diff --git a/applications/external/wii_ec_anal/wii_ec_classic.c b/applications/external/wiiec/wii_ec_classic.c similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_classic.c rename to applications/external/wiiec/wii_ec_classic.c diff --git a/applications/external/wii_ec_anal/wii_ec_classic.h b/applications/external/wiiec/wii_ec_classic.h similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_classic.h rename to applications/external/wiiec/wii_ec_classic.h diff --git a/applications/external/wii_ec_anal/wii_ec_macros.h b/applications/external/wiiec/wii_ec_macros.h similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_macros.h rename to applications/external/wiiec/wii_ec_macros.h diff --git a/applications/external/wii_ec_anal/wii_ec_nunchuck.c b/applications/external/wiiec/wii_ec_nunchuck.c similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_nunchuck.c rename to applications/external/wiiec/wii_ec_nunchuck.c diff --git a/applications/external/wii_ec_anal/wii_ec_nunchuck.h b/applications/external/wiiec/wii_ec_nunchuck.h similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_nunchuck.h rename to applications/external/wiiec/wii_ec_nunchuck.h diff --git a/applications/external/wii_ec_anal/wii_ec_udraw.c b/applications/external/wiiec/wii_ec_udraw.c similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_udraw.c rename to applications/external/wiiec/wii_ec_udraw.c diff --git a/applications/external/wii_ec_anal/wii_ec_udraw.h b/applications/external/wiiec/wii_ec_udraw.h similarity index 100% rename from applications/external/wii_ec_anal/wii_ec_udraw.h rename to applications/external/wiiec/wii_ec_udraw.h diff --git a/applications/external/wii_ec_anal/wii_i2c.c b/applications/external/wiiec/wii_i2c.c similarity index 100% rename from applications/external/wii_ec_anal/wii_i2c.c rename to applications/external/wiiec/wii_i2c.c diff --git a/applications/external/wii_ec_anal/wii_i2c.h b/applications/external/wiiec/wii_i2c.h similarity index 100% rename from applications/external/wii_ec_anal/wii_i2c.h rename to applications/external/wiiec/wii_i2c.h