Merge blackjack from https://github.com/xMasterX/all-the-plugins

blackjack/application.fam

@@ -3,11 +3,13 @@ App(
     name="BlackJack",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="blackjack_app",
-    cdefines=["APP_BLACKJACK"],
     requires=["gui","storage","canvas"],
     stack_size=2 * 1024,
     order=30,
     fap_icon="blackjack_10px.png",
     fap_category="Games",
-    fap_icon_assets="assets"
+    fap_icon_assets="assets",
+    fap_author="@teeebor",
+    fap_version="1.1",
+    fap_description="Blackjack Game",
 )

blackjack/blackjack.c

@@ -568,7 +568,7 @@ int32_t blackjack_app(void* p) {
     FuriTimer* timer = furi_timer_alloc(update_timer_callback, FuriTimerTypePeriodic, event_queue);
     furi_timer_start(timer, furi_kernel_get_tick_frequency() / 25);
 
-    Gui* gui = furi_record_open("gui");
+    Gui* gui = furi_record_open(RECORD_GUI);
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
     AppEvent event;
@@ -610,12 +610,10 @@ int32_t blackjack_app(void* p) {
                 tick(game_state);
                 processing = game_state->processing;
             }
-            // } else {
-            //     FURI_LOG_D(APP_NAME, "osMessageQueue: event timeout");
-            // event timeout
         }
-        view_port_update(view_port);
+
         furi_mutex_release(game_state->mutex);
+        view_port_update(view_port);
     }
 
     furi_timer_free(timer);

blackjack/common/card.c

@@ -173,7 +173,7 @@ uint8_t hand_count(const Card* cards, uint8_t count) {
     }
 
     for(uint8_t i = 0; i < aceCount; i++) {
-        if((score + 11) <= 21)
+        if((score + 11 + (aceCount - 1)) <= 21)
             score += 11;
         else
             score++;

blackjack/common/card.h

@@ -163,7 +163,7 @@ void add_to_hand(Hand* hand_ptr, Card card);
 void draw_card_space(int16_t pos_x, int16_t pos_y, bool highlighted, Canvas* const canvas);
 
 /**
- * Draws a column of card, displaying the last 4 cards on the list
+ * Draws a column of card, displaying the last [max_cards] cards on the list
  * @param hand              Hand object
  * @param pos_x             X coordinate to draw
  * @param pos_y             Y coordinate to draw