diff --git a/ReadMe.md b/ReadMe.md index 5ae24a2e4..6b9b16e0f 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -22,6 +22,9 @@ Thank you to all the supporters! - Added: [Count Down Timer (By 0w0mewo)](https://github.com/0w0mewo/fpz_cntdown_timer) - Added: [GPIO Reader (Aurelilc) (By aureli1c)](https://github.com/aureli1c/flipperzero_GPIO_read) - Added: [Dolphin: add new animation #2139 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/2139) +- Updated: [Count Down Timer (By 0w0mewo)](https://github.com/0w0mewo/fpz_cntdown_timer) +- Updated: [Yatzee (By emfleak)](https://github.com/emfleak/flipperzero-yatzee) +- Updated: [Orgasmotron (By qqmajikpp)](https://github.com/qqmajikpp/flipperzero-firmware-wPlugins) ## Install from Release FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE! @@ -176,6 +179,7 @@ $ ./fbt resources icons dolphin_ext - [Tetris (By jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game) - [Tic Tac Toe (By gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins) - [Video Poker (By PixlEmly)](https://github.com/PixlEmly/flipperzero-firmware-testing/blob/420/applications/VideoPoker/poker.c) +- [Yatzee (By emfleak)](https://github.com/emfleak/flipperzero-yatzee) - [Zombiez (Reworked By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/240) [(Original By Dooskington)](https://github.com/Dooskington/flipperzero-zombiez) ## Plugins @@ -220,6 +224,7 @@ $ ./fbt resources icons dolphin_ext - [NRF Sniff (By mothball187)](https://github.com/mothball187/flipperzero-nrf24/tree/main/nrfsniff) ([Pin Out](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/tree/420/applications/nrfsniff) from nocomp/Frog/UberGuidoZ) `Req: NRF24` - [NRF24 Scanner v1.8 (By vad7)](https://github.com/vad7/nrf24scan) - [Ocarina (By invalidna-me)](https://github.com/invalidna-me/flipperzero-ocarina) [Here are the LOTZ Songs](https://www.zeldadungeon.net/wiki/Ocarina_of_Time_Songs) +- [Orgasmotron (By qqmajikpp)](https://github.com/qqmajikpp/flipperzero-firmware-wPlugins) - [Paint (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e) - [Password Generator (By anakod)](https://github.com/anakod/flipper_passgen) - [PicoPass Reader (By Bettse)](https://github.com/flipperdevices/flipperzero-firmware/pull/1366) diff --git a/applications/plugins/cntdown_timer/app.c b/applications/plugins/cntdown_timer/app.c index 7202ec29e..5c03ea246 100644 --- a/applications/plugins/cntdown_timer/app.c +++ b/applications/plugins/cntdown_timer/app.c @@ -36,7 +36,7 @@ CountDownTimerApp* countdown_app_new(void) { // 2.3 attach views to the dispatcher // helloworld view - app->helloworld_view = helloworld_view_new(); + app->helloworld_view = countdown_timer_view_new(); register_view(app->view_dispatcher, countdown_timer_view_get_view(app->helloworld_view), 0xff); // 2.5 switch to default view diff --git a/applications/plugins/cntdown_timer/utils/utils.c b/applications/plugins/cntdown_timer/utils/utils.c index f6690b5ca..8ce82f1c6 100644 --- a/applications/plugins/cntdown_timer/utils/utils.c +++ b/applications/plugins/cntdown_timer/utils/utils.c @@ -1,23 +1,6 @@ +#include #include "utils.h" -static const NotificationSequence sequence_finish = { - &message_display_backlight_on, - &message_blue_255, - &message_vibro_on, - &message_note_c5, - &message_delay_250, - &message_note_c5, - &message_delay_500, - &message_note_c5, - &message_delay_100, - &message_note_c5, - &message_delay_500, - &message_sound_off, - &message_vibro_off, - &message_delay_250, - NULL, -}; - static const NotificationSequence sequence_beep = { &message_blue_255, &message_note_d5, @@ -37,5 +20,15 @@ void notification_off() { } void notification_timeup() { - notification_message(furi_record_open(RECORD_NOTIFICATION), &sequence_finish); + notification_message(furi_record_open(RECORD_NOTIFICATION), &sequence_audiovisual_alert); +} + +void parse_sec_to_time_str(char* buffer, size_t len, int32_t sec) { + snprintf( + buffer, + len, + "%02ld:%02ld:%02ld", + (sec % (60 * 60 * 24)) / (60 * 60), // hour + (sec % (60 * 60)) / 60, // minute + sec % 60); // second } diff --git a/applications/plugins/cntdown_timer/utils/utils.h b/applications/plugins/cntdown_timer/utils/utils.h index c3e7993b9..814e16222 100644 --- a/applications/plugins/cntdown_timer/utils/utils.h +++ b/applications/plugins/cntdown_timer/utils/utils.h @@ -7,4 +7,6 @@ void notification_beep_once(); void notification_off(); void notification_timeup(); +void parse_sec_to_time_str(char* buffer, size_t len, int32_t sec); + #endif // __UTILS_H__ \ No newline at end of file diff --git a/applications/plugins/cntdown_timer/views/countdown_view.c b/applications/plugins/cntdown_timer/views/countdown_view.c index 6c8fdaafa..97e8cb248 100644 --- a/applications/plugins/cntdown_timer/views/countdown_view.c +++ b/applications/plugins/cntdown_timer/views/countdown_view.c @@ -2,75 +2,87 @@ #include "../utils/utils.h" // internal -static void handle_cmd(CountDownTimView* hw, CountDownViewCmd cmd); -static void handle_time_setting_updown(CountDownTimView* hwv, CountDownViewCmd cmd); -static void handle_time_setting_select(InputKey key, CountDownTimView* hwv); +static void handle_misc_cmd(CountDownTimView* hw, CountDownViewCmd cmd); +static void handle_time_setting_updown(CountDownTimView* cdv, CountDownViewCmd cmd); +static void handle_time_setting_select(InputKey key, CountDownTimView* cdv); static void draw_selection(Canvas* canvas, CountDownViewSelect selection); +static void countdown_timer_start_counting(CountDownTimView* cdv); +static void countdown_timer_pause_counting(CountDownTimView* cdv); + // callbacks static void countdown_timer_view_on_enter(void* ctx); static void countdown_timer_view_on_draw(Canvas* canvas, void* ctx); static bool countdown_timer_view_on_input(InputEvent* event, void* ctx); static void timer_cb(void* ctx); -CountDownTimView* helloworld_view_new() { - CountDownTimView* hwv = (CountDownTimView*)(malloc(sizeof(CountDownTimView))); +CountDownTimView* countdown_timer_view_new() { + CountDownTimView* cdv = (CountDownTimView*)(malloc(sizeof(CountDownTimView))); - hwv->view = view_alloc(); + cdv->view = view_alloc(); - hwv->timer = furi_timer_alloc(timer_cb, FuriTimerTypePeriodic, hwv); + cdv->timer = furi_timer_alloc(timer_cb, FuriTimerTypePeriodic, cdv); - hwv->counting = false; + cdv->counting = false; - view_set_context(hwv->view, hwv); + view_set_context(cdv->view, cdv); - view_allocate_model(hwv->view, ViewModelTypeLocking, sizeof(CountDownModel)); + view_allocate_model(cdv->view, ViewModelTypeLocking, sizeof(CountDownModel)); - view_set_draw_callback(hwv->view, countdown_timer_view_on_draw); - view_set_input_callback(hwv->view, countdown_timer_view_on_input); - view_set_enter_callback(hwv->view, countdown_timer_view_on_enter); + view_set_draw_callback(cdv->view, countdown_timer_view_on_draw); + view_set_input_callback(cdv->view, countdown_timer_view_on_input); + view_set_enter_callback(cdv->view, countdown_timer_view_on_enter); - return hwv; + return cdv; } -void countdown_timer_view_delete(CountDownTimView* hwv) { - furi_assert(hwv); +void countdown_timer_view_delete(CountDownTimView* cdv) { + furi_assert(cdv); - view_free(hwv->view); - furi_timer_stop(hwv->timer); - furi_timer_free(hwv->timer); + view_free(cdv->view); + furi_timer_stop(cdv->timer); + furi_timer_free(cdv->timer); - free(hwv); + free(cdv); } -View* countdown_timer_view_get_view(CountDownTimView* hwv) { - return hwv->view; +View* countdown_timer_view_get_view(CountDownTimView* cdv) { + return cdv->view; } -void countdown_timer_view_state_reset(CountDownTimView* hwv) { - hwv->counting = false; +void countdown_timer_view_state_reset(CountDownTimView* cdv) { + cdv->counting = false; + with_view_model( - hwv->view, CountDownModel * model, { model->sec_expected = 10; }, true); + cdv->view, CountDownModel * model, { model->count = model->saved_count_setting; }, true) } -void countdown_timer_state_toggle(CountDownTimView* hwv) { - bool on = hwv->counting; +void countdown_timer_state_toggle(CountDownTimView* cdv) { + bool on = cdv->counting; if(!on) { - furi_timer_start(hwv->timer, furi_kernel_get_tick_frequency() * 1); // 1s + countdown_timer_start_counting(cdv); } else { - furi_timer_stop(hwv->timer); - notification_off(); + countdown_timer_pause_counting(cdv); } - hwv->counting = !on; + cdv->counting = !on; } // on enter callback, CountDownTimView as ctx static void countdown_timer_view_on_enter(void* ctx) { furi_assert(ctx); - CountDownTimView* hwv = (CountDownTimView*)ctx; - countdown_timer_view_state_reset(hwv); + CountDownTimView* cdv = (CountDownTimView*)ctx; + + // set current count to a initial value + with_view_model( + cdv->view, + CountDownModel * model, + { + model->count = INIT_COUNT; + model->saved_count_setting = INIT_COUNT; + }, + true); } // view draw callback, CountDownModel as ctx @@ -80,23 +92,21 @@ static void countdown_timer_view_on_draw(Canvas* canvas, void* ctx) { char buffer[64]; - int32_t sec = model->sec_expected; + int32_t count = model->count; + int32_t expected_count = model->saved_count_setting; + CountDownViewSelect select = model->select; - elements_frame(canvas, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + // elements_frame(canvas, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); canvas_set_font(canvas, FontBigNumbers); draw_selection(canvas, select); - snprintf( - buffer, - sizeof(buffer), - "%02ld:%02ld:%02ld", - (sec % (60 * 60 * 24)) / (60 * 60), // hour - (sec % (60 * 60)) / 60, // minute - sec % 60); // second + parse_sec_to_time_str(buffer, sizeof(buffer), count); canvas_draw_str_aligned( canvas, SCREEN_CENTER_X, SCREEN_CENTER_Y, AlignCenter, AlignCenter, buffer); + + elements_progress_bar(canvas, 0, 0, SCREEN_WIDTH, (1.0 * count / expected_count)); } // keys input event callback, CountDownTimView as ctx @@ -116,7 +126,7 @@ static bool countdown_timer_view_on_input(InputEvent* event, void* ctx) { case InputKeyOk: if(event->type == InputTypeShort) { - handle_cmd(hw, CountDownTimerToggleCounting); + handle_misc_cmd(hw, CountDownTimerToggleCounting); } break; @@ -130,7 +140,7 @@ static bool countdown_timer_view_on_input(InputEvent* event, void* ctx) { if(event->type == InputTypeLong) { switch(event->key) { case InputKeyOk: - handle_cmd(hw, CountDownTimerReset); + handle_misc_cmd(hw, CountDownTimerReset); break; case InputKeyBack: @@ -150,75 +160,79 @@ static bool countdown_timer_view_on_input(InputEvent* event, void* ctx) { static void timer_cb(void* ctx) { furi_assert(ctx); - CountDownTimView* hwv = (CountDownTimView*)ctx; + CountDownTimView* cdv = (CountDownTimView*)ctx; - int32_t sec; + int32_t count; bool timeup = false; // decrement counter with_view_model( - hwv->view, + cdv->view, CountDownModel * model, { - sec = model->sec_expected; - sec--; + count = model->count; + count--; // check timeup - if(sec <= 0) { - sec = 0; + if(count <= 0) { + count = 0; timeup = true; } - model->sec_expected = sec; + model->count = count; }, true); if(timeup) { - handle_cmd(hwv, CountDownTimerTimeUp); + handle_misc_cmd(cdv, CountDownTimerTimeUp); } } -static void handle_time_setting_updown(CountDownTimView* hwv, CountDownViewCmd cmd) { - int32_t sec_expected; +static void handle_time_setting_updown(CountDownTimView* cdv, CountDownViewCmd cmd) { + int32_t count; with_view_model( - hwv->view, + cdv->view, CountDownModel * model, { - sec_expected = model->sec_expected; + count = model->count; switch(cmd) { case CountDownTimerMinuteUp: - sec_expected += 60; + count += 60; break; case CountDownTimerMinuteDown: - sec_expected -= 60; + count -= 60; break; case CountDownTimerHourDown: - sec_expected -= 3600; + count -= 3600; break; case CountDownTimerHourUp: - sec_expected += 3600; + count += 3600; break; case CountDownTimerSecUp: - sec_expected++; + count++; break; case CountDownTimerSecDown: - sec_expected--; + count--; break; default: break; } - if(sec_expected < 0) { - sec_expected = 0; + if(count < 0) { + count = 0; } - model->sec_expected = sec_expected; + // update count state + model->count = count; + + // save the count time setting + model->saved_count_setting = count; }, true); } -static void handle_cmd(CountDownTimView* hw, CountDownViewCmd cmd) { +static void handle_misc_cmd(CountDownTimView* hw, CountDownViewCmd cmd) { switch(cmd) { case CountDownTimerTimeUp: notification_timeup(); @@ -242,8 +256,8 @@ static void handle_cmd(CountDownTimView* hw, CountDownViewCmd cmd) { return; } -static void handle_time_setting_select(InputKey key, CountDownTimView* hwv) { - bool counting = hwv->counting; +static void handle_time_setting_select(InputKey key, CountDownTimView* cdv) { + bool counting = cdv->counting; CountDownViewCmd setting_cmd = CountDownTimerSecUp; CountDownViewSelect selection; @@ -253,7 +267,7 @@ static void handle_time_setting_select(InputKey key, CountDownTimView* hwv) { // load current selection from model context with_view_model( - hwv->view, CountDownModel * model, { selection = model->select; }, false); + cdv->view, CountDownModel * model, { selection = model->select; }, false); // select switch(key) { @@ -270,7 +284,7 @@ static void handle_time_setting_select(InputKey key, CountDownTimView* hwv) { break; } - handle_time_setting_updown(hwv, setting_cmd); + handle_time_setting_updown(cdv, setting_cmd); break; case InputKeyDown: @@ -286,7 +300,7 @@ static void handle_time_setting_select(InputKey key, CountDownTimView* hwv) { break; } - handle_time_setting_updown(hwv, setting_cmd); + handle_time_setting_updown(cdv, setting_cmd); break; case InputKeyRight: @@ -305,19 +319,28 @@ static void handle_time_setting_select(InputKey key, CountDownTimView* hwv) { // save selection to model context with_view_model( - hwv->view, CountDownModel * model, { model->select = selection; }, false); + cdv->view, CountDownModel * model, { model->select = selection; }, false); } static void draw_selection(Canvas* canvas, CountDownViewSelect selection) { switch(selection) { case CountDownTimerSelectSec: - elements_slightly_rounded_box(canvas, SCREEN_CENTER_X + 25, SCREEN_CENTER_Y + 11, 21, 2); + elements_slightly_rounded_box(canvas, SCREEN_CENTER_X + 25, SCREEN_CENTER_Y + 11, 24, 2); break; case CountDownTimerSelectMinute: elements_slightly_rounded_box(canvas, SCREEN_CENTER_X - 10, SCREEN_CENTER_Y + 11, 21, 2); break; case CountDownTimerSelectHour: - elements_slightly_rounded_box(canvas, SCREEN_CENTER_X - 47, SCREEN_CENTER_Y + 11, 21, 2); + elements_slightly_rounded_box(canvas, SCREEN_CENTER_X - 47, SCREEN_CENTER_Y + 11, 24, 2); break; } +} + +static void countdown_timer_start_counting(CountDownTimView* cdv) { + furi_timer_start(cdv->timer, furi_kernel_get_tick_frequency() * 1); // 1s +} + +static void countdown_timer_pause_counting(CountDownTimView* cdv) { + furi_timer_stop(cdv->timer); + notification_off(); } \ No newline at end of file diff --git a/applications/plugins/cntdown_timer/views/countdown_view.h b/applications/plugins/cntdown_timer/views/countdown_view.h index 2c35fc67c..ed8114f8e 100644 --- a/applications/plugins/cntdown_timer/views/countdown_view.h +++ b/applications/plugins/cntdown_timer/views/countdown_view.h @@ -11,9 +11,7 @@ #define SCREEN_CENTER_X (SCREEN_WIDTH / 2) #define SCREEN_CENTER_Y (SCREEN_HEIGHT / 2) -#define MAX_SCALE 80 -#define MAX_MOVE_STEP 16 -#define MIN_MOVE_STEP 2 +#define INIT_COUNT 10 typedef enum { CountDownTimerMinuteUp, @@ -34,8 +32,9 @@ typedef enum { } CountDownViewSelect; typedef struct { - int32_t sec_expected; - uint8_t select; // setting + int32_t count; + int32_t saved_count_setting; + CountDownViewSelect select; // setting } CountDownModel; typedef struct { @@ -47,14 +46,14 @@ typedef struct { // functions // allocate helloworld view -CountDownTimView* helloworld_view_new(); +CountDownTimView* countdown_timer_view_new(); // delete helloworld view -void countdown_timer_view_delete(CountDownTimView* hwv); +void countdown_timer_view_delete(CountDownTimView* cdv); // return view -View* countdown_timer_view_get_view(CountDownTimView* hwv); +View* countdown_timer_view_get_view(CountDownTimView* cdv); -void countdown_timer_view_state_reset(CountDownTimView* hwv); // set initial state -void countdown_timer_state_toggle(CountDownTimView* hwv); +void countdown_timer_view_state_reset(CountDownTimView* cdv); // set initial state +void countdown_timer_state_toggle(CountDownTimView* cdv); #endif // __COUNTDOWN_VIEW_H__ \ No newline at end of file diff --git a/applications/plugins/gpioreader2/GPIO_reader.c b/applications/plugins/gpioreader2/GPIO_reader.c index 144147b67..be333cd7e 100644 --- a/applications/plugins/gpioreader2/GPIO_reader.c +++ b/applications/plugins/gpioreader2/GPIO_reader.c @@ -19,29 +19,49 @@ typedef struct { int pullMode; } PluginState; - static void render_callback(Canvas* const canvas, void* ctx) { const PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25); - + canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10, AlignCenter, AlignCenter, "GPIO reader"); + canvas_draw_str_aligned( + canvas, + canvas_width(canvas) / 2, + canvas_height(canvas) / 10, + AlignCenter, + AlignCenter, + "GPIO reader"); canvas_set_font(canvas, FontSecondary); - canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 3, AlignCenter, AlignCenter, - gpio_item_get_pin_name(plugin_state->pin)); + canvas_draw_str_aligned( + canvas, + canvas_width(canvas) / 2, + canvas_height(canvas) / 10 * 3, + AlignCenter, + AlignCenter, + gpio_item_get_pin_name(plugin_state->pin)); - canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 5, AlignCenter, AlignCenter, - gpio_item_get_pull_mode(plugin_state->pullMode)); + canvas_draw_str_aligned( + canvas, + canvas_width(canvas) / 2, + canvas_height(canvas) / 10 * 5, + AlignCenter, + AlignCenter, + gpio_item_get_pull_mode(plugin_state->pullMode)); canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 8, AlignCenter, AlignCenter, - gpio_item_get_pin_level(plugin_state->pin)); + canvas_draw_str_aligned( + canvas, + canvas_width(canvas) / 2, + canvas_height(canvas) / 10 * 8, + AlignCenter, + AlignCenter, + gpio_item_get_pin_level(plugin_state->pin)); release_mutex((ValueMutex*)ctx, plugin_state); } static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) { - furi_assert(event_queue); + furi_assert(event_queue); PluginEvent event = {.type = EventTypeKey, .input = *input_event}; furi_message_queue_put(event_queue, &event, FuriWaitForever); @@ -51,33 +71,32 @@ static void GPIO_reader_state_init(PluginState* const plugin_state) { plugin_state->pin = 0; plugin_state->pullMode = 0; gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); -} +} int32_t GPIO_reader_app(void* p) { UNUSED(p); FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent)); - + PluginState* plugin_state = malloc(sizeof(PluginState)); GPIO_reader_state_init(plugin_state); - ValueMutex state_mutex; - if (!init_mutex(&state_mutex, plugin_state, sizeof(PluginState))) { + ValueMutex state_mutex; + if(!init_mutex(&state_mutex, plugin_state, sizeof(PluginState))) { FURI_LOG_E("GPIO_reader", "cannot create mutex\r\n"); - free(plugin_state); + free(plugin_state); return 255; } // Set system callbacks - ViewPort* view_port = view_port_alloc(); + ViewPort* view_port = view_port_alloc(); view_port_draw_callback_set(view_port, render_callback, &state_mutex); view_port_input_callback_set(view_port, input_callback, event_queue); - - // Open GUI and register view_port - Gui* gui = furi_record_open("gui"); - gui_add_view_port(gui, view_port, GuiLayerFullscreen); - - PluginEvent event; - for(bool processing = true; processing;) { + // Open GUI and register view_port + Gui* gui = furi_record_open("gui"); + gui_add_view_port(gui, view_port, GuiLayerFullscreen); + + PluginEvent event; + for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); PluginState* plugin_state = (PluginState*)acquire_mutex_block(&state_mutex); @@ -86,30 +105,32 @@ int32_t GPIO_reader_app(void* p) { if(event.type == EventTypeKey) { if(event.input.type == InputTypePress || event.input.type == InputTypeRepeat) { switch(event.input.key) { - case InputKeyRight: - plugin_state->pin = (plugin_state->pin + 1) % GPIO_ITEM_COUNT; - gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); - break; - case InputKeyLeft: - plugin_state->pin = (plugin_state->pin - 1 + GPIO_ITEM_COUNT) % GPIO_ITEM_COUNT; - gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); - break; + case InputKeyRight: + plugin_state->pin = (plugin_state->pin + 1) % GPIO_ITEM_COUNT; + gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); + break; + case InputKeyLeft: + plugin_state->pin = + (plugin_state->pin - 1 + GPIO_ITEM_COUNT) % GPIO_ITEM_COUNT; + gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); + break; case InputKeyUp: - plugin_state->pullMode = (plugin_state->pullMode + 1) % GPIO_PULL_COUNT; - gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); + plugin_state->pullMode = (plugin_state->pullMode + 1) % GPIO_PULL_COUNT; + gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); break; case InputKeyDown: - plugin_state->pullMode = (plugin_state->pullMode - 1 + GPIO_PULL_COUNT) % GPIO_PULL_COUNT; - gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); + plugin_state->pullMode = + (plugin_state->pullMode - 1 + GPIO_PULL_COUNT) % GPIO_PULL_COUNT; + gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode); break; - case InputKeyBack: + case InputKeyBack: processing = false; break; default: break; } } - } + } } else { FURI_LOG_D("GPIO_reader", "FuriMessageQueue: event timeout"); // event timeout diff --git a/applications/plugins/gpioreader2/GPIO_reader_item.c b/applications/plugins/gpioreader2/GPIO_reader_item.c index 15726722c..19a730ad0 100644 --- a/applications/plugins/gpioreader2/GPIO_reader_item.c +++ b/applications/plugins/gpioreader2/GPIO_reader_item.c @@ -13,14 +13,15 @@ const char* gpio_item_get_pull_mode(uint8_t pull_mode) { const char* gpio_item_get_pin_level(uint8_t index) { furi_assert(index < GPIO_ITEM_COUNT); //furi_hal_gpio_write(gpio_item[index].pin, level); - if (furi_hal_gpio_read(gpio_item[index].pin)){ + if(furi_hal_gpio_read(gpio_item[index].pin)) { return "High"; - }else{ + } else { return "Low"; } } void gpio_item_configure_pin(uint8_t index, uint8_t pull_mode) { furi_assert(index < GPIO_ITEM_COUNT); - furi_hal_gpio_init(gpio_item[index].pin, GpioModeInput, gpio_pull_mode[pull_mode].pull, GpioSpeedVeryHigh); + furi_hal_gpio_init( + gpio_item[index].pin, GpioModeInput, gpio_pull_mode[pull_mode].pull, GpioSpeedVeryHigh); } \ No newline at end of file diff --git a/applications/plugins/orgasmotron/application.fam b/applications/plugins/orgasmotron/application.fam new file mode 100644 index 000000000..6cc457a53 --- /dev/null +++ b/applications/plugins/orgasmotron/application.fam @@ -0,0 +1,11 @@ +App( + appid="Orgasmotron", + name="Orgasmotron", + apptype=FlipperAppType.EXTERNAL, + entry_point="orgasmotron_app", + cdefines=["ORGASMOTRON"], + requires=["gui"], + stack_size=1 * 1024, + order=20, + fap_category="Misc", +) diff --git a/applications/plugins/orgasmotron/orgasmotron.c b/applications/plugins/orgasmotron/orgasmotron.c new file mode 100644 index 000000000..814a9e26d --- /dev/null +++ b/applications/plugins/orgasmotron/orgasmotron.c @@ -0,0 +1,75 @@ +#include +#include + +#include +#include +#include + +void vibro_test_draw_callback(Canvas* canvas, void* ctx) { + UNUSED(ctx); + canvas_clear(canvas); + canvas_set_font(canvas, FontPrimary); + canvas_draw_str(canvas, 2, 10, "Vibro application"); + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 2, 22, "Press OK turns on vibro"); + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 2, 34, "Press LEFT turns off vibro"); +} + +void vibro_test_input_callback(InputEvent* input_event, void* ctx) { + furi_assert(ctx); + FuriMessageQueue* event_queue = ctx; + furi_message_queue_put(event_queue, input_event, FuriWaitForever); +} + +int32_t orgasmotron_app(void* p) { + UNUSED(p); + FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent)); + + // Configure view port + ViewPort* view_port = view_port_alloc(); + view_port_draw_callback_set(view_port, vibro_test_draw_callback, NULL); + view_port_input_callback_set(view_port, vibro_test_input_callback, event_queue); + + // Register view port in GUI + Gui* gui = furi_record_open(RECORD_GUI); + gui_add_view_port(gui, view_port, GuiLayerFullscreen); + + NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION); + + InputEvent event; + + while(furi_message_queue_get(event_queue, &event, FuriWaitForever) == FuriStatusOk) { + if(event.type == InputTypeShort && event.key == InputKeyBack) { + notification_message(notification, &sequence_reset_vibro); + notification_message(notification, &sequence_reset_green); + break; + } + if(event.key == InputKeyOk) { + if(event.type == InputTypePress) { + notification_message(notification, &sequence_set_vibro_on); + notification_message(notification, &sequence_set_green_255); + } else if(event.type == InputTypeRelease) { + notification_message(notification, &sequence_set_vibro_on); + notification_message(notification, &sequence_set_green_255); + } + } + if(event.key == InputKeyLeft) { + if(event.type == InputTypePress) { + notification_message(notification, &sequence_reset_vibro); + notification_message(notification, &sequence_reset_green); + } else if(event.type == InputTypeRelease) { + notification_message(notification, &sequence_reset_vibro); + notification_message(notification, &sequence_reset_green); + } + } + } + gui_remove_view_port(gui, view_port); + view_port_free(view_port); + furi_message_queue_free(event_queue); + + furi_record_close(RECORD_NOTIFICATION); + furi_record_close(RECORD_GUI); + + return 0; +} \ No newline at end of file diff --git a/applications/plugins/orgasmotron/orgasmotron.fap b/applications/plugins/orgasmotron/orgasmotron.fap new file mode 100644 index 000000000..23d7bebb3 Binary files /dev/null and b/applications/plugins/orgasmotron/orgasmotron.fap differ diff --git a/applications/plugins/yatzee/LICENSE b/applications/plugins/yatzee/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/applications/plugins/yatzee/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/applications/plugins/yatzee/README.md b/applications/plugins/yatzee/README.md new file mode 100644 index 000000000..7483879e2 --- /dev/null +++ b/applications/plugins/yatzee/README.md @@ -0,0 +1,48 @@ +# flipperzero-yatzee +Yahtzee game for flipperzero + +Code is bad, I should feel bad, but it works and now I can play Yahtzee on my flipper while I shit at work. + +Installation: + +Download fap from releases. Copy fap to flipper sd at ext > apps > Games + + +Controls: + +- Up to Roll +- Left/Right to move cursor +- OK to Hold a die +- Moving cursor past the dice will move the cursor up to the scorecard. Moving the scores cursor will show you the potential score you would get. + + +Rules & Scoring: + +- Between rolls, move the cursor and use the OK button to select which dice you will hold for the next roll +- 3 rolls per round and then you are forced to select a score. +- To score, move cursor with Left/Right up to the scorecard, when desired score to count is underlined, press the Down button to confirm. + +- 1-6 add up the corresponding dice of that number in your roll. +- 3 of a Kind (3k) = total of dice when 3 of a kind is rolled +- 4 of a Kind (4k) = total of dice when 4 of a kind is rolled +- Full House (Fh) = 25 +- Small Straight (Sm) = 30 +- Large Straight (Lg) = 40 +- Chance (Ch) = total of all dice in roll +- Yatzee (Yz) = 50 for the first yatzee. Successive Yatzees do not show in the score card, but add 100 each to the total score +- Game ends when every scoring value has been selected once. +- If sub score is at least 63, 35 points are added to the total score. + +Todo +- Redo the scorecard now that I understand a little better how this works + - Would like to make it a grid with 4 rows, and 4 columns + - Rows 0 and 2 will have the scores 'names' + - Rows 1 and 3 will be empty until filled by a score. + - Column 3 will span all rows and show each bonus yatzee as an icon like a star or something. + - Once grided score card is implemented, identify a better mechanism to show that a score has already been counted- instead of the '.' that shows up now. + - Maybe invert the grid color to show which score is being selected by the cursor. +- If upper score >= 63, add a pop-up message at the end game to give a visual indication that a bonus for the top row is being. +- Redo button mapping so that + - the middle button can be used to both hold on dice or confirm score. Leaves the down arrow open for something else. + - Would be nice if up/down could be used to move through the scorecard and left/right move through the dice, but then theres not enough buttons for ROLL so idk yet. +- Learn more about C so that I can move stuff to a header file like everyone else does. diff --git a/applications/plugins/yatzee/application.fam b/applications/plugins/yatzee/application.fam new file mode 100644 index 000000000..183021854 --- /dev/null +++ b/applications/plugins/yatzee/application.fam @@ -0,0 +1,13 @@ +App( + appid="Yatzee", + name="Yatzee", + apptype=FlipperAppType.EXTERNAL, + entry_point="yatzee_main", + requires=["gui"], + stack_size=4 * 1024, + order=99, + fap_icon="images/yatzee_icon_10px.png", + fap_category="Games", + fap_icon_assets="images", + +) diff --git a/applications/plugins/yatzee/images/die_1.png b/applications/plugins/yatzee/images/die_1.png new file mode 100644 index 000000000..84f86cbb4 Binary files /dev/null and b/applications/plugins/yatzee/images/die_1.png differ diff --git a/applications/plugins/yatzee/images/die_2.png b/applications/plugins/yatzee/images/die_2.png new file mode 100644 index 000000000..bfdc37c36 Binary files /dev/null and b/applications/plugins/yatzee/images/die_2.png differ diff --git a/applications/plugins/yatzee/images/die_3.png b/applications/plugins/yatzee/images/die_3.png new file mode 100644 index 000000000..4c0db3f26 Binary files /dev/null and b/applications/plugins/yatzee/images/die_3.png differ diff --git a/applications/plugins/yatzee/images/die_4.png b/applications/plugins/yatzee/images/die_4.png new file mode 100644 index 000000000..682f26d3a Binary files /dev/null and b/applications/plugins/yatzee/images/die_4.png differ diff --git a/applications/plugins/yatzee/images/die_5.png b/applications/plugins/yatzee/images/die_5.png new file mode 100644 index 000000000..c251d3a78 Binary files /dev/null and b/applications/plugins/yatzee/images/die_5.png differ diff --git a/applications/plugins/yatzee/images/die_6.png b/applications/plugins/yatzee/images/die_6.png new file mode 100644 index 000000000..77e300d88 Binary files /dev/null and b/applications/plugins/yatzee/images/die_6.png differ diff --git a/applications/plugins/yatzee/images/yatzee_icon_10px.png b/applications/plugins/yatzee/images/yatzee_icon_10px.png new file mode 100644 index 000000000..38dfd172f Binary files /dev/null and b/applications/plugins/yatzee/images/yatzee_icon_10px.png differ diff --git a/applications/plugins/yatzee/yatzee.c b/applications/plugins/yatzee/yatzee.c new file mode 100644 index 000000000..304a604c1 --- /dev/null +++ b/applications/plugins/yatzee/yatzee.c @@ -0,0 +1,827 @@ +#include "Yatzee_icons.h" + +#include +#include + +#include +#include +#include + +#include +#include + +#define BASE_X 18 +#define BASE_Y 44 +#define DICE_OFFSET 12 +#define HOLD "*" +#define MAX_DICE 5 +#define NUM_SCORES 13 + +bool new_game = true; +bool game_over = false; +bool bonus_added = false; +int8_t num_bonus_yatzees = 0; + +// struct to hold image posistion for dice +typedef struct { + // +-----x + // | + // | + // y + uint8_t x; + uint8_t y; +} ImagePosition; + +typedef struct { + char* name; + uint32_t value; + bool used; + int8_t row; + int8_t col; + uint8_t (*fn)(); // pointer to function that calculates score +} Score; + +typedef struct { + uint8_t index; + uint8_t value; + bool isHeld; +} Die; + +typedef struct { + int index; + char* symbol; +} Cursor; + +// locations for the dice images +ImagePosition position[5] = { + {.x = BASE_X - DICE_OFFSET, .y = BASE_Y}, + {.x = BASE_X * 2 - DICE_OFFSET, .y = BASE_Y}, + {.x = BASE_X * 3 - DICE_OFFSET, .y = BASE_Y}, + {.x = BASE_X * 4 - DICE_OFFSET, .y = BASE_Y}, + {.x = BASE_X * 5 - DICE_OFFSET, .y = BASE_Y}, +}; + +// these are the positions that the score cursor will cycle through +ImagePosition score_positions[13] = { + {.x = 15, .y = 0}, + {.x = 15, .y = 9}, + {.x = 15, .y = 18}, + {.x = 15, .y = 27}, + {.x = 44, .y = 0}, + {.x = 44, .y = 9}, + {.x = 44, .y = 18}, + {.x = 44, .y = 27}, + {.x = 77, .y = 0}, + {.x = 77, .y = 9}, + {.x = 77, .y = 18}, + {.x = 77, .y = 27}, + {.x = 91, .y = 21}, +}; + +// cursor to select dice +Cursor cursor = {.index = 0, .symbol = "^"}; + +// cursor to select score +Cursor scoreCursor = {.index = -1, .symbol = "_"}; + +// setup array to store dice info +Die die[5] = { + {.index = 0, .value = 1, .isHeld = false}, + {.index = 1, .value = 1, .isHeld = false}, + {.index = 2, .value = 1, .isHeld = false}, + {.index = 3, .value = 1, .isHeld = false}, + {.index = 4, .value = 1, .isHeld = false}, +}; + +uint8_t upperScore = 0; +int32_t lowerScore = 0; +int32_t totalScore = 0; +uint8_t roll = 0; +uint8_t totalrolls = 0; + +// ############################################# +// # The following methods add the score for # +// # whichever number is mentioned. # +// ############################################# +static uint8_t ones() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 1) { + sum++; + } + } + return sum; +} + +static uint8_t twos() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 2) { + sum = sum + 2; + } + } + return sum; +} + +static uint8_t threes() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 3) { + sum = sum + 3; + } + } + return sum; +} + +static uint8_t fours() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 4) { + sum = sum + 4; + } + } + return sum; +} + +static uint8_t fives() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 5) { + sum = sum + 5; + } + } + return sum; +} + +static uint8_t sixes() { + uint8_t sum = 0; + for(uint8_t i = 0; i < 5; i++) { + if(die[i].value == 6) { + sum = sum + 6; + } + } + return sum; +} + +// #################################################### +// # Helper methods for the special score types # +// # defined before them so they can be used # +// # since this whole thing is a linear mess # +// # lol. # +// # add_dice: # +// # inputs: none # +// # output: int8_t value of roll # +// # check_if_score_used: +// # inputs: Score +// # output: true if score.used = true +// # # # # # # # # # # # # # # # # # # # # # # # # # # +int8_t add_dice() { + int8_t sum = 0; + for(int8_t i = 0; i < MAX_DICE; i++) { + sum += die[i].value; + } + return sum; +} + +bool check_if_score_used(Score score) { + if(score.used == true) { + return true; + } else { + return false; + } +} + +// ############################################# +// # Methods to calculate scores for the fancy # +// # scoring types: 3 of a kind, 4 of a kind, # +// # Full house, small straight, large straight# +// # chance & yatzee. # +// ############################################# +static uint8_t threekind() { + int8_t score = 0; + for(int8_t num = 1; num < 7; num++) { + int8_t sum = 0; + + for(int8_t i = 0; i < MAX_DICE; i++) { + if(die[i].value == num) { + sum++; + } + if(sum > 2) { + score = add_dice(); + } + } + } + return score; +} + +static uint8_t fourkind() { + int8_t score = 0; + for(int8_t num = 1; num < 7; num++) { + int8_t sum = 0; + + for(int8_t i = 0; i < MAX_DICE; i++) { + if(die[i].value == num) { + sum++; + } + if(sum > 3) { + score = add_dice(); + } + } + } + return score; +} + +static uint8_t fullhouse() { + bool check1 = false; + bool check2 = false; + int8_t val1 = 0; + int8_t val2 = 0; + UNUSED(val2); + UNUSED(val1); + + //check 1 for three of a kind + for(int8_t num = 1; num < 7; num++) { + int8_t sum = 0; + + for(int8_t i = 0; i < MAX_DICE; i++) { + if(die[i].value == num) { + sum++; + } + if(sum > 2) { + val1 = die[i].value; + check1 = true; + } + } + } + + // return if check 1 failed + if(check1 == false) { + return 0; + } + + // check 2 for two of a kind. + for(int8_t num = 1; num < 7; num++) { + if(num == val1) { + continue; + } + int8_t sum = 0; + + for(int8_t i = 0; i < MAX_DICE; i++) { + if(die[i].value == num) { + sum++; + } + if(sum > 1) { + val2 = die[i].value; + check2 = true; + } + } + if(check1 && check2) { + return 25; + } + } + return 0; +} + +// # # # # # # # # # # # # # # # # # # # # # # # # # # # +// # I'm dumb so I asked ChatGPT to write the # +// # smallstraight function for me. Then I adapted it # +// # fo the largestraight function. # +// # # # # # # # # # # # # # # # # # # # # # # # # # # # +static uint8_t smallstraight() { + // Create a new array with the frequencies of the different die faces + int8_t frequencies[6] = {0}; + + for(int8_t i = 0; i < 5; i++) { + int8_t face = die[i].value; + frequencies[face - 1]++; + } + + // Check if there is a sequence of 4 consecutive die faces with at least one die + bool found_small_straight = false; + for(int i = 0; i < 3 && !found_small_straight; i++) { + if(frequencies[i] > 0 && frequencies[i + 1] > 0 && frequencies[i + 2] > 0 && + frequencies[i + 3] > 0) { + found_small_straight = true; + } + } + + if(found_small_straight) { + return 30; + } else { + return 0; + } +} + +static uint8_t largestraight() { + // Create a new array with the frequencies of the different die faces + int8_t frequencies[6] = {0}; + + for(int8_t i = 0; i < 5; i++) { + int8_t face = die[i].value; + frequencies[face - 1]++; + } + + // Check if there is a sequence of 4 consecutive die faces with at least one die + bool found_large_straight = false; + for(int i = 0; i < 3 && !found_large_straight; i++) { + if(frequencies[i] > 0 && frequencies[i + 1] > 0 && frequencies[i + 2] > 0 && + frequencies[i + 3] > 0 && frequencies[i + 4] > 0) { + found_large_straight = true; + } + } + + if(found_large_straight) { + return 40; + } else { + return 0; + } +} + +static uint8_t chance() { + // chance allows your roll to count for the raw number of pips showing + int8_t sum = 0; + for(int8_t i = 0; i < MAX_DICE; i++) { + sum += die[i].value; + } + return sum; +} + +static uint8_t yatzee() { + // checks if all die.values are equal to the first die + int8_t val = die[0].value; + for(int8_t i = 1; i < MAX_DICE; i++) { + // if value is the same as the first die, continue to next + if(die[i].value == val) { + continue; + } else { + // if any value is not equal to the first die, + // this is not a yatzee and we return 0 + return 0; + } + } + return 50; +} + +// # # # # # # # # # # # # # # # # # # # # # # # # # # +// # Method to return true if yatzee returns 50 # +// # # +// # # # # # # # # # # # # # # # # # # # # # # # # # # +// static bool check_for_bonus_yatzee() { +// if (yatzee()==50){ +// return true; +// } else { +// return false; +// } +// } + +// Scorecard defined here so that we can use pointers to the functions +// defined above +Score scorecard[13] = { + {.name = "1", .value = 0, .used = false, .row = 0, .col = 0, .fn = &ones}, + {.name = "2", .value = 0, .used = false, .row = 1, .col = 0, .fn = &twos}, + {.name = "3", .value = 0, .used = false, .row = 2, .col = 0, .fn = &threes}, + {.name = "4", .value = 0, .used = false, .row = 3, .col = 0, .fn = &fours}, + {.name = "5", .value = 0, .used = false, .row = 0, .col = 1, .fn = &fives}, + {.name = "6", .value = 0, .used = false, .row = 1, .col = 1, .fn = &sixes}, + {.name = "3k", .value = 0, .used = false, .row = 2, .col = 1, .fn = &threekind}, + {.name = "4k", .value = 0, .used = false, .row = 3, .col = 1, .fn = &fourkind}, + {.name = "Fh", .value = 0, .used = false, .row = 0, .col = 2, .fn = &fullhouse}, + {.name = "Sm", .value = 0, .used = false, .row = 1, .col = 2, .fn = &smallstraight}, + {.name = "Lg", .value = 0, .used = false, .row = 2, .col = 2, .fn = &largestraight}, + {.name = "Ch", .value = 0, .used = false, .row = 3, .col = 2, .fn = &chance}, + {.name = "Yz", .value = 0, .used = false, .row = 2, .col = 3, .fn = &yatzee}, +}; + +// ############################################# +// # begin draw callback # +// # # +// ############################################# +// define the callback for telling ViewPort how to update the screen +// not sure what ctx is but it seems important +static void app_draw_callback(Canvas* canvas, void* ctx) { + UNUSED(ctx); + canvas_set_font(canvas, FontSecondary); //define a font so we can put letters on the screen + int8_t selectorOffsetX = 8; + int8_t selectorOffsetY = 16; + char buffer[36]; + char bigbuffer[256]; + + canvas_clear(canvas); + + // if new_game, show user instructions + if(new_game) { + canvas_set_font(canvas, FontPrimary); + elements_multiline_text_aligned(canvas, 64, 0, AlignCenter, AlignTop, "Yatzee!"); + canvas_set_font(canvas, FontSecondary); + snprintf( + bigbuffer, + sizeof(bigbuffer), + "Up: Roll\nLeft/Right: Move cursor\nOK: Hold Die\nDown: Score"); + elements_multiline_text_aligned(canvas, 0, 8, AlignLeft, AlignTop, bigbuffer); + elements_button_center(canvas, "Start!"); + return; + + } else { + // draw border lines + canvas_draw_line(canvas, 0, 37, 104, 37); + canvas_draw_line(canvas, 104, 0, 104, 64); + + // iterate through dice and draw icon that correlates to die[n].value, and the x,y position indicated by position[die[i].index] + for(int8_t i = 0; i < 5; i++) { + if(die[i].value == 1) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_1); + } else if(die[i].value == 2) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_2); + } else if(die[i].value == 3) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_3); + } else if(die[i].value == 4) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_4); + } else if(die[i].value == 5) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_5); + } else if(die[i].value == 6) { + canvas_draw_icon( + canvas, + position[die[i].index].x % 128, + position[die[i].index].y % 64, + &I_die_6); + } + } + + // Puts an '*' above the die if hold is selected. + int8_t holdOffsetX = 8; + int8_t holdOffsetY = -5; + for(int8_t i = 0; i < 5; i++) { + if(die[i].isHeld == 1) { + elements_multiline_text_aligned( + canvas, + position[die[i].index].x + holdOffsetX, + position[die[i].index].y + holdOffsetY, + AlignCenter, + AlignTop, + HOLD); + } + } + + // Update die cursor location + if(cursor.index != -1) { + elements_multiline_text_aligned( + canvas, + position[cursor.index].x + selectorOffsetX, + position[cursor.index].y + selectorOffsetY, + AlignCenter, + AlignTop, + cursor.symbol); + } + + // Update score cursor location + if(scoreCursor.index != -1) { + elements_multiline_text_aligned( + canvas, + score_positions[scoreCursor.index].x, + score_positions[scoreCursor.index].y + 1, + AlignLeft, + AlignTop, + scoreCursor.symbol); + } + + // Update Roll + + // Scores are updated in groups on screen to help with formatting + // first group is scorecard[0:7], second group is [8:12] + // Cycle through first 8 scores, if cursor at score, update to show possible score + // otherwise, show current scores value. + for(int8_t i = 0; i < 8; i++) { + if(scoreCursor.index == i && scorecard[i].used == false) { + int possiblescore = (int)(*scorecard[i].fn)(); + + snprintf(buffer, sizeof(buffer), "%s: %3u ", scorecard[i].name, possiblescore); + canvas_draw_str_aligned( + canvas, + 23 + 29 * scorecard[i].col, + 9 * scorecard[i].row, + AlignRight, + AlignTop, + buffer); + } else { + uint8_t currentscore = scorecard[i].value; + snprintf(buffer, sizeof(buffer), "%s: %3u ", scorecard[i].name, currentscore); + canvas_draw_str_aligned( + canvas, + 23 + 29 * scorecard[i].col, + 9 * scorecard[i].row, + AlignRight, + AlignTop, + buffer); + } + if(scorecard[i].used) { + canvas_draw_dot(canvas, 23 + 29 * scorecard[i].col, 3 + 9 * scorecard[i].row); + } + } + + // cycle through lower scores + // NUM_SCORES minus one because the yatzee is 12 and is handled separately + for(int8_t i = 8; i < NUM_SCORES - 1; i++) { + if(scoreCursor.index == i && scorecard[i].used == false) { + int possiblescore = (int)(*scorecard[i].fn)(); + + snprintf(buffer, sizeof(buffer), " %s: %3u ", scorecard[i].name, possiblescore); + canvas_draw_str_aligned( + canvas, + 31 + 27 * scorecard[i].col, + 9 * scorecard[i].row, + AlignRight, + AlignTop, + buffer); + } else { + uint8_t currentscore = scorecard[i].value; + snprintf(buffer, sizeof(buffer), " %s: %3u ", scorecard[i].name, currentscore); + canvas_draw_str_aligned( + canvas, + 31 + 27 * scorecard[i].col, + 9 * scorecard[i].row, + AlignRight, + AlignTop, + buffer); + } + if(scorecard[i].used) { + canvas_draw_dot(canvas, 31 + 27 * scorecard[i].col, 3 + 9 * scorecard[i].row); + } + } + + // update yatzee score + if(scoreCursor.index == 12 && scorecard[12].used == false) { + int possiblescore = (int)(*scorecard[12].fn)(); + + snprintf(buffer, sizeof(buffer), "Yz\n%u", possiblescore); + elements_multiline_text_aligned(canvas, 93, 10, AlignCenter, AlignTop, buffer); + } else { + snprintf(buffer, sizeof(buffer), "Yz\n%ld", scorecard[12].value); + elements_multiline_text_aligned(canvas, 93, 10, AlignCenter, AlignTop, buffer); + } + + // Scores and roll number updated + + // sub score shows the 1-6 scores only. If this is >63 at the end of the game, + // a 35 point bonus is added to the total score + snprintf(buffer, sizeof(buffer), "Sub\n%u", upperScore); + elements_multiline_text_aligned(canvas, 117, 0, AlignCenter, AlignTop, buffer); + + snprintf(buffer, sizeof(buffer), "Total\n%ld", totalScore); + elements_multiline_text_aligned(canvas, 117, 22, AlignCenter, AlignTop, buffer); + + if(totalrolls == 0) { + snprintf(buffer, sizeof(buffer), "Roll\n%s", " "); + elements_multiline_text_aligned(canvas, 117, 64, AlignCenter, AlignBottom, buffer); + } else { + snprintf(buffer, sizeof(buffer), "Roll\n%u", totalrolls); + elements_multiline_text_aligned(canvas, 117, 64, AlignCenter, AlignBottom, buffer); + } + + // Check for then handle end of game + + // add num_bonus_yatzees to total rounds so that multiple + // yatzees can be scored without impacting the number of rounds before + // the game is over + int8_t total_rounds = num_bonus_yatzees; + // add up number of scores counted so far + for(int8_t i = 0; i < NUM_SCORES; i++) { + if(scorecard[i].used) { + total_rounds++; + } + } + + // if total rounds is 13 + the number of bonus rounds, + // thats it, game over. + if(total_rounds == NUM_SCORES + num_bonus_yatzees) { + // if scores of 1-6 add up to 63, a 35 point bonus is bonus_added + // bonus_added = true keeps the game loop from + // adding bonuses indefinetly + if(upperScore >= 63 && bonus_added == false) { + totalScore += 35; + bonus_added = true; + } + // set game over to true and tell the user the game is over + game_over = true; + elements_button_center(canvas, "Game Over"); + } + } +} + +// define the callback for helping ViewPort get InputEvent and place it in the event_queue defined in the main method +static void app_input_callback(InputEvent* input_event, void* ctx) { + furi_assert(ctx); + + FuriMessageQueue* event_queue = ctx; + furi_message_queue_put(event_queue, input_event, FuriWaitForever); +} + +// roll them diiiiceeee +static void roll_dice() { + // increment roll count + totalrolls++; + for(uint8_t i = 0; i < MAX_DICE; i++) { + // dont reroll if the dice is being held + if(die[i].isHeld == false) { + die[i].value = 1 + rand() % 6; + } + } + // if 3 rolls have been used, force user to select a score. + if(totalrolls == 3) { + scoreCursor.index = 0; + } +} + +static void clear_board() { + // reset board after adding score + totalrolls = 0; + for(int8_t i = 0; i < MAX_DICE; i++) { + die[i].isHeld = false; + } + scoreCursor.index = -1; + cursor.index = 0; +} + +static void add_score() { + // return when scoring is not possible + if(cursor.index != -1 || totalrolls == 0 || + (scorecard[scoreCursor.index].used && + strcmp(scorecard[scoreCursor.index].name, "Yz") != 0)) { + return; + } + + // extra yatzee scores + if(scoreCursor.index == 12 && scorecard[scoreCursor.index].used) { + uint8_t yatzee_score = (*scorecard[12].fn)(); + scorecard[12].value += 2 * yatzee_score; + lowerScore += 100; + num_bonus_yatzees++; + } + + // upper score + for(int8_t i = 0; i < 6; i++) { + if(scoreCursor.index == i && scorecard[scoreCursor.index].used == false) { + scorecard[i].value = (*scorecard[i].fn)(); + upperScore += scorecard[i].value; + scorecard[i].used = true; + } + } + + // lower score + for(int8_t i = 6; i < 13; i++) { + if(scoreCursor.index == i && scorecard[scoreCursor.index].used == false) { + scorecard[i].value = (*scorecard[i].fn)(); + lowerScore += scorecard[i].value; + scorecard[i].used = true; + } + } + + // recalculate total score + totalScore = lowerScore + upperScore; + clear_board(); +} + +// Entry Point +int32_t yatzee_main(void* p) { + UNUSED(p); + + // Initialize event queue to handle incoming events like button presses + // Use FuriMessageQueue as type as defined in furi api + // InputEvents are supported by app_input_callback + FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent)); + + // Initialize viewport + ViewPort* view_port = view_port_alloc(); + + // Set system callbacks + view_port_draw_callback_set(view_port, app_draw_callback, view_port); + view_port_input_callback_set(view_port, app_input_callback, event_queue); + + // Open GUI & register viewport + Gui* gui = furi_record_open(RECORD_GUI); + gui_add_view_port(gui, view_port, GuiLayerFullscreen); + + // hold input event + InputEvent event; + + // Create a loop for the app to run in and handle InputEvents + bool isRunning = true; + + while(isRunning) { + if(totalrolls == 3) { + cursor.index = -1; + } + if(furi_message_queue_get(event_queue, &event, 100) == FuriStatusOk) { + if((event.type == InputTypePress) || event.type == InputTypeRepeat) { + switch(event.key) { + case InputKeyLeft: + if(cursor.index == -1) { + if(scoreCursor.index == 0 && totalrolls == 3) { + scoreCursor.index = NUM_SCORES - 1; + } else if(scoreCursor.index == 0) { + scoreCursor.index = -1; + cursor.index = 4; + } else { + scoreCursor.index--; + } + } else { + if(cursor.index == 0) { + cursor.index = -1; + scoreCursor.index = NUM_SCORES - 1; + } else { + cursor.index--; + } + } + break; + case InputKeyRight: + // cursor.index == -1 means that scoreCursor is active + if(cursor.index == -1) { + if(scoreCursor.index == NUM_SCORES - 1 && totalrolls == 3) { + scoreCursor.index = 0; + } else if(scoreCursor.index == NUM_SCORES - 1) { + scoreCursor.index = -1; + cursor.index = 0; + } else { + scoreCursor.index++; + } + // if cursor.index is not -1, then dice cursor is active + } else { + if(cursor.index == 4) { + cursor.index = -1; + scoreCursor.index = 0; + } else { + cursor.index++; + } + } + break; + case InputKeyUp: + + if(totalrolls < 3) { + roll_dice(); + } + // if (check_for_bonus_yatzee() && scorecard[13].used) { + // num_bonus_yatzees++; + // totalScore+=100; + // + // clear_board(); + // } + break; + case InputKeyDown: + add_score(); + break; + case InputKeyOk: + if(new_game) { + new_game = false; + break; + } + if(game_over) { + isRunning = false; + } + if(cursor.index == -1 || totalrolls == 0) { + break; + } + if(die[cursor.index].isHeld == false) { + die[cursor.index].isHeld = true; + } else { + die[cursor.index].isHeld = false; + } + break; + default: + isRunning = false; + break; + } + } + } + // after every event, update view_port + // uses app_draw_callback which is set before the game loop begins. + view_port_update(view_port); + } + + // cleanup + view_port_enabled_set(view_port, false); + gui_remove_view_port(gui, view_port); + view_port_free(view_port); + furi_message_queue_free(event_queue); + furi_record_close(RECORD_GUI); + + return 0; +} \ No newline at end of file