Просмотр исходного кода

Fixes for toolchain 28 / gcc 12 pt2

These might need a double check, should be fine tho
Willy-JL 1 год назад
Родитель
Сommit
f5efc5bec3

+ 2 - 2
chess/sam/stm32_sam.cpp

@@ -4510,7 +4510,7 @@ void STM32SAM::AdjustLengths() {
                 mem56 = flags[index];
 
             // not a consonant
-            if((flags[index] & 64) == 0) {
+            if((mem56 & 64) == 0) {
                 // RX or LX?
                 if((index == 18) || (index == 19)) // 'RX' & 'LX'
                 {
@@ -4519,7 +4519,7 @@ void STM32SAM::AdjustLengths() {
                     index = phonemeindex[X];
 
                     // next phoneme a consonant?
-                    if((flags[index] & 64) != 0) {
+                    if((mem56 & 64) != 0) {
                         // RULE: <VOWEL> RX | LX <CONSONANT>
 
                         // decrease length of vowel by 1 frame

+ 0 - 4
flizzer_tracker/sound_engine/sound_engine.c

@@ -14,10 +14,6 @@ void sound_engine_init(
         free(sound_engine->audio_buffer);
     }
 
-    if(sound_engine->sine_lut) {
-        free(sound_engine->sine_lut);
-    }
-
     memset(sound_engine, 0, sizeof(SoundEngine));
 
     sound_engine->audio_buffer = malloc(audio_buffer_size * sizeof(sound_engine->audio_buffer[0]));

+ 4 - 8
mayhem_marauder/scenes/wifi_marauder_scene_console_output.c

@@ -122,15 +122,11 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
                 app->log_file_path,
                 sequential_file_resolve_path(
                     app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log"));
-            if(app->log_file_path != NULL) {
-                if(storage_file_open(
-                       app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-                    app->is_writing_log = true;
-                } else {
-                    dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
-                }
+            if(storage_file_open(
+                   app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+                app->is_writing_log = true;
             } else {
-                dialog_message_show_storage_error(app->dialogs, "Cannot resolve log path");
+                dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
             }
         }
 

+ 1 - 1
picopass/scenes/picopass_scene_read_card_success.c

@@ -138,7 +138,7 @@ void picopass_scene_read_card_success_on_enter(void* context) {
 
         if(no_key) {
             furi_string_cat_printf(key_str, "No Key: used NR-MAC");
-        } else if(pacs->key) {
+        } else {
             furi_string_cat_printf(key_str, "Key: ");
             uint8_t key[PICOPASS_BLOCK_LEN];
             memcpy(key, &pacs->key, PICOPASS_BLOCK_LEN);

+ 23 - 25
tanks/tanks_game.c

@@ -1371,32 +1371,30 @@ int32_t tanks_game_app(void* p) {
                         memset(incomingMessage, 0x00, message_max_len);
                         subghz_tx_rx_worker_read(subghz_txrx, incomingMessage, message_max_len);
 
-                        if(incomingMessage != NULL) {
-                            tanks_state->received++;
+                        tanks_state->received++;
 
-                            switch(incomingMessage[0]) {
-                            case GoesUp:
-                                tanks_state->p2->moving = true;
-                                tanks_state->p2->direction = DirectionUp;
-                                break;
-                            case GoesRight:
-                                tanks_state->p2->moving = true;
-                                tanks_state->p2->direction = DirectionRight;
-                                break;
-                            case GoesDown:
-                                tanks_state->p2->moving = true;
-                                tanks_state->p2->direction = DirectionDown;
-                                break;
-                            case GoesLeft:
-                                tanks_state->p2->moving = true;
-                                tanks_state->p2->direction = DirectionLeft;
-                                break;
-                            case Shoots:
-                                tanks_state->p2->shooting = true;
-                                break;
-                            default:
-                                break;
-                            }
+                        switch(incomingMessage[0]) {
+                        case GoesUp:
+                            tanks_state->p2->moving = true;
+                            tanks_state->p2->direction = DirectionUp;
+                            break;
+                        case GoesRight:
+                            tanks_state->p2->moving = true;
+                            tanks_state->p2->direction = DirectionRight;
+                            break;
+                        case GoesDown:
+                            tanks_state->p2->moving = true;
+                            tanks_state->p2->direction = DirectionDown;
+                            break;
+                        case GoesLeft:
+                            tanks_state->p2->moving = true;
+                            tanks_state->p2->direction = DirectionLeft;
+                            break;
+                        case Shoots:
+                            tanks_state->p2->shooting = true;
+                            break;
+                        default:
+                            break;
                         }
                     }
 

+ 2 - 2
text2sam/stm32_sam.cpp

@@ -4510,7 +4510,7 @@ void STM32SAM::AdjustLengths() {
                 mem56 = flags[index];
 
             // not a consonant
-            if((flags[index] & 64) == 0) {
+            if((mem56 & 64) == 0) {
                 // RX or LX?
                 if((index == 18) || (index == 19)) // 'RX' & 'LX'
                 {
@@ -4519,7 +4519,7 @@ void STM32SAM::AdjustLengths() {
                     index = phonemeindex[X];
 
                     // next phoneme a consonant?
-                    if((flags[index] & 64) != 0) {
+                    if((mem56 & 64) != 0) {
                         // RULE: <VOWEL> RX | LX <CONSONANT>
 
                         // decrease length of vowel by 1 frame

+ 4 - 8
wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

@@ -122,15 +122,11 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
                 app->log_file_path,
                 sequential_file_resolve_path(
                     app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log"));
-            if(app->log_file_path != NULL) {
-                if(storage_file_open(
-                       app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-                    app->is_writing_log = true;
-                } else {
-                    dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
-                }
+            if(storage_file_open(
+                   app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+                app->is_writing_log = true;
             } else {
-                dialog_message_show_storage_error(app->dialogs, "Cannot resolve log path");
+                dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
             }
         }