Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -119,7 +119,7 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
         for(size_t i = 0; i < subghz_setting_get_frequency_count(instance->setting); i++) {
             uint32_t current_frequency = subghz_setting_get_frequency(instance->setting, i);
             if(furi_hal_subghz_is_frequency_valid(current_frequency) &&
-               (current_frequency != 467750000) &&
+               (current_frequency != 467750000) && (current_frequency != 464000000) &&
                !((furi_hal_subghz.radio_type == SubGhzRadioExternal) &&
                  (current_frequency >= 311900000 && current_frequency <= 312200000))) {
                 furi_hal_spi_acquire(furi_hal_subghz.spi_bus_handle);

applications/plugins/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++;
@@ -350,4 +350,4 @@ void add_hand_region(Hand* to, Hand* from) {
             add_to_hand(to, from->cards[i]);
         }
     }
-}
+}