FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-11-02 12:03:07 -06:00
parent 6fc0f47f57
commit 7697a8f03c
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/dodge_neon.cpp
View File

@ -201,6 +201,9 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
setThermistorConfiguration(&engineConfiguration->cltThermistorConf, 0, 32500, 30, 7550, 100, 700); setThermistorConfiguration(&engineConfiguration->cltThermistorConf, 0, 32500, 30, 7550, 100, 700);
engineConfiguration->cltThermistorConf.bias_resistor = 10000; engineConfiguration->cltThermistorConf.bias_resistor = 10000;
setThermistorConfiguration(&engineConfiguration->iatThermistorConf, 0, 32500, 30, 7550, 100, 700);
engineConfiguration->iatThermistorConf.bias_resistor = 10000;
/** /**
* MAP D17/W5 * MAP D17/W5
*/ */

8
firmware/controllers/flash_main.cpp
View File

@ -117,10 +117,16 @@ void readFromFlash(void) {
engineConfiguration->firmwareVersion = getRusEfiVersion(); engineConfiguration->firmwareVersion = getRusEfiVersion();
} }
void initFlash(void) { static void rewriteConfig(Engine *engine) {
doResetConfiguration();
writeToFlash();
}
void initFlash(Engine *engine) {
initLogging(&logger, "Flash memory"); initLogging(&logger, "Flash memory");
addConsoleAction("readconfig", readFromFlash); addConsoleAction("readconfig", readFromFlash);
addConsoleAction("writeconfig", writeToFlash); addConsoleAction("writeconfig", writeToFlash);
addConsoleAction("resetconfig", doResetConfiguration); addConsoleAction("resetconfig", doResetConfiguration);
addConsoleActionP("rewriteconfig", (VoidPtr)rewriteConfig, engine);
} }

13
firmware/controllers/flash_main.h
View File

@ -10,16 +10,13 @@
#define FLASH_MAIN_H_ #define FLASH_MAIN_H_
#include "engine_configuration.h" #include "engine_configuration.h"
#include "engine.h"
#define FLASH_DATA_VERSION 5014 #define FLASH_DATA_VERSION 5014
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void readFromFlash(void); void readFromFlash(void);
void initFlash(void); void initFlash(Engine *engine);
/** /**
* Because of hardware-related issues, stm32f4 chip is totally * Because of hardware-related issues, stm32f4 chip is totally
* frozen while we are writing to internal flash. Writing the configuration takes * frozen while we are writing to internal flash. Writing the configuration takes
@ -34,8 +31,4 @@ void setNeedToWriteConfiguration(void);
bool getNeedToWriteConfiguration(void); bool getNeedToWriteConfiguration(void);
void writeToFlashIfPending(void); void writeToFlashIfPending(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* FLASH_MAIN_H_ */ #endif /* FLASH_MAIN_H_ */

2
firmware/hw_layer/hardware.cpp
View File

@ -173,7 +173,7 @@ void initHardware(Logging *logger, Engine *engine) {
palSetPadMode(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN, PAL_MODE_INPUT_PULLUP); palSetPadMode(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN, PAL_MODE_INPUT_PULLUP);
initFlash(); initFlash(engine);
/** /**
* this call reads configuration from flash memory or sets default configuration * this call reads configuration from flash memory or sets default configuration
* if flash state does not look right. * if flash state does not look right.

1
firmware/hw_layer/io_pins.c
View File

@ -15,7 +15,6 @@
#include "status_loop.h" #include "status_loop.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#include "console_io.h" #include "console_io.h"
#include "flash_main.h"
#if EFI_ENGINE_CONTROL #if EFI_ENGINE_CONTROL
#include "main_trigger_callback.h" #include "main_trigger_callback.h"

2
firmware/rusefi.cpp
View File

@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) {
} }
int getRusEfiVersion(void) { int getRusEfiVersion(void) {
return 20141101; return 20141102;
} }