Merge pull request #7 from leha-bot/fix/build-on-rel-fw

Fix build on fresh Flipper firmware
RogueMaster · May 20, 2024 · 8bce552 · 8bce552
2 parents 322f7f2 + 66995c1
commit 8bce552
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/helpers/flipchess_file.c b/helpers/flipchess_file.c
@@ -16,10 +16,10 @@
 bool flipchess_has_file(const FlipChessFile file_type, const char* file_name, const bool remove) {
     bool ret = false;
     const char* path;
+    char path_buf[FILE_MAX_PATH_LEN] = {0};
     if(file_type == FlipChessFileBoard) {
         path = FLIPCHESS_BOARD_PATH;
     } else {
-        char path_buf[FILE_MAX_PATH_LEN] = {0};
         strcpy(path_buf, FLIPCHESS_APP_BASE_FOLDER); // 22
         strcpy(path_buf + strlen(path_buf), "/");
         strcpy(path_buf + strlen(path_buf), file_name);

diff --git a/sam/stm32_sam.cpp b/sam/stm32_sam.cpp
@@ -4510,7 +4510,7 @@ void STM32SAM::AdjustLengths() {
                 mem56 = flags[index];
 
             // not a consonant
-            if((flags[index] & 64) == 0) {
+            if((index != 255 && flags[index] & 64) == 0) {
                 // RX or LX?
                 if((index == 18) || (index == 19)) // 'RX' & 'LX'
                 {
@@ -5700,4 +5700,4 @@ inline void STM32SAM::SetAUDIO(unsigned char main_volume) {
     }
 
     LL_TIM_OC_SetCompareCH1(FURI_HAL_SPEAKER_TIMER, data);
-}
+}