Explorar el Código

Minor changes for new gcc

Dmitry Telenkov hace 2 semanas
padre
commit
d99da76dd7

+ 0 - 1
iap/Modules/Ethernet/httpserver.h

@@ -83,6 +83,5 @@ uint32_t ReturnFlashWriteAddress(void);
 
 bool GetFileName(char *inStr, char *fileName, uint8_t *fileNameLen);
 
-uint8_t update_timeout;
 
 #endif /* __HTTPD_H__ */

+ 2 - 0
iap/User/main.c

@@ -52,6 +52,8 @@ bool fUpload = false;
 bool fInvalidFw = false;
 bool fBootFailed = false;
 
+extern uint8_t update_timeout;
+
 volatile uint32_t resetCounter = 0;
 bool UpdateTimeoutFlag = false;
 

+ 2 - 2
modules/cli/CLI_Commands.c

@@ -3697,7 +3697,7 @@ static portBASE_TYPE prvTaskFTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
     signed portBASE_TYPE xReturn;
     portBASE_TYPE xParameterNumber = 1;
     char str[110];
-    uint8_t i;
+    uint8_t i = 0;
 
     ( void ) xWriteBufferLen;
     configASSERT( pcWriteBuffer );
@@ -3841,7 +3841,7 @@ static portBASE_TYPE prvTaskFTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
  */
 static portBASE_TYPE prvSetUPSserialCommand(cli_state_t *cli_state,  int8_t *pcWriteBuffer, size_t xWriteBufferLen, const int8_t *pcCommandString ){
 	int8_t *pcParameterString;
-	signed portBASE_TYPE xParameterStringLength;
+	unsigned portBASE_TYPE xParameterStringLength;
 	portBASE_TYPE xParameterNumber = 1;
 	char str[10];
 

+ 2 - 0
modules/monitor/ups_monitor.c

@@ -57,6 +57,7 @@ extern int test_time;
 TimerHandle_t UPSRestartTimer;
 
 void UPSRestartCallback(TimerHandle_t pxTimer) {
+  (void)pxTimer;
   UPScmd(ups_remote_turn_on);
 }
 #endif
@@ -64,6 +65,7 @@ void UPSRestartCallback(TimerHandle_t pxTimer) {
 TimerHandle_t UPSTurnOffTimer;
 
 void UPSTurnOffCallback(TimerHandle_t pxTimer) {
+  (void)pxTimer;
   UPScmd(ups_remote_turn_off);
   xTimerStart(UPSRestartTimer, 0);
 }

+ 1 - 1
peripheral_modules/src/rtc.c

@@ -438,7 +438,7 @@ void TM_RTC_Config(TM_RTC_ClockSource_t source) {
 }
 
 void TM_RTC_Interrupts(TM_RTC_Int_t int_value) {
-	uint32_t int_val;
+	uint32_t int_val = 0;
 	
 	/* Clear pending bit */
 	EXTI->PR = 0x00400000;

+ 1 - 3
projects/gcc/configs/stm32f4discovery.cfg

@@ -3,9 +3,7 @@
 
 source [find interface/stlink-v2.cfg]
 
-transport select hla_swd
-
-source [find target/stm32f4x_stlink.cfg]
+source [find target/stm32f4x.cfg]
 
 reset_config  srst_only
 tpiu config internal tracefile.bin uart	off 120000000 1600000

+ 0 - 5
user/init_task.c

@@ -96,12 +96,7 @@ void InitTask(void *params)
     log_init(false);
     ups_megatec_init();
 // -----------------------------------------------------------------------------
-    // SETTINGS_SetProDate("28.11.24 13:42", 14);
-    // SETTINGS_SetT2OK();
-    // SETTINGS_SetAllDefault();
-    // SETTINGS_Save();
     SETTINGS_Load();
-    // sSettings.sWebParams.dhcpEnable = 0;
 
     if (set_mode_jumper()) {
         SETTINGS_SetServiceDef();