rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cli crash on get, dump, diff on SITL

This commit is contained in:
cs8425 2017-09-08 00:12:12 +08:00
parent ad7da28b1d
commit f8c9b57fd6
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/mcu/SITL.mk
View File

@ -25,7 +25,6 @@ MCU_EXCLUDES = \
drivers/dma.c \ drivers/dma.c \
drivers/pwm_output.c \ drivers/pwm_output.c \
drivers/timer.c \ drivers/timer.c \
drivers/light_led.c \
drivers/system.c \ drivers/system.c \
drivers/rcc.c \ drivers/rcc.c \
drivers/serial_escserial.c \ drivers/serial_escserial.c \

6
src/main/config/config_eeprom.c
View File

@ -33,11 +33,7 @@
#include "drivers/system.h" #include "drivers/system.h"
#ifdef EEPROM_IN_RAM #ifndef EEPROM_IN_RAM
extern uint8_t eepromData[EEPROM_SIZE];
# define __config_start (*eepromData)
# define __config_end (*ARRAYEND(eepromData))
#else
extern uint8_t __config_start; // configured via linker script when building binaries. extern uint8_t __config_start; // configured via linker script when building binaries.
extern uint8_t __config_end; extern uint8_t __config_end;
#endif #endif

2
src/main/config/config_streamer.c
View File

@ -23,8 +23,10 @@
#include "config/config_streamer.h" #include "config/config_streamer.h"
#ifndef EEPROM_IN_RAM
extern uint8_t __config_start; // configured via linker script when building binaries. extern uint8_t __config_start; // configured via linker script when building binaries.
extern uint8_t __config_end; extern uint8_t __config_end;
#endif
#if !defined(FLASH_PAGE_SIZE) #if !defined(FLASH_PAGE_SIZE)
// F1 // F1

6
src/main/target/SITL/target.c
View File

@ -254,12 +254,6 @@ void systemResetToBootloader(void) {
exit(0); exit(0);
} }
// drivers/light_led.c
void ledInit(const statusLedConfig_t *statusLedConfig) {
UNUSED(statusLedConfig);
printf("[led]Init...\n");
}
void timerInit(void) { void timerInit(void) {
printf("[timer]Init...\n"); printf("[timer]Init...\n");
} }

11
src/main/target/SITL/target.h
View File

@ -35,7 +35,7 @@
// file name to save config // file name to save config
#define EEPROM_FILENAME "eeprom.bin" #define EEPROM_FILENAME "eeprom.bin"
#define EEPROM_IN_RAM #define EEPROM_IN_RAM
#define EEPROM_SIZE 8192 #define EEPROM_SIZE 32768
#define U_ID_0 0 #define U_ID_0 0
#define U_ID_1 1 #define U_ID_1 1
@ -137,6 +137,15 @@
uint32_t SystemCoreClock; uint32_t SystemCoreClock;
#ifdef EEPROM_IN_RAM
extern uint8_t eepromData[EEPROM_SIZE];
#define __config_start (*eepromData)
#define __config_end (*ARRAYEND(eepromData))
#else
extern uint8_t __config_start; // configured via linker script when building binaries.
extern uint8_t __config_end;
#endif
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
typedef enum typedef enum