auto-sync
This commit is contained in:
parent
c9cc87cb31
commit
4b852fc66e
|
@ -301,6 +301,9 @@ void setMiata1994_d(engine_configuration_s *engineConfiguration, board_configura
|
||||||
void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
|
void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
|
||||||
setMiata1994_common(engineConfiguration, boardConfiguration);
|
setMiata1994_common(engineConfiguration, boardConfiguration);
|
||||||
engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2;
|
engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2;
|
||||||
|
|
||||||
|
boardConfiguration->triggerSimulatorPins[2] = GPIO_NONE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This board has PE0 & PE1 mosfets rewires to PD3 and PD5
|
* This board has PE0 & PE1 mosfets rewires to PD3 and PD5
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -168,4 +168,10 @@ void initBoardTest(void) {
|
||||||
currentIndex++;
|
currentIndex++;
|
||||||
waitForKey();
|
waitForKey();
|
||||||
}
|
}
|
||||||
|
// no buffered logger still, just plain old stdout
|
||||||
|
while (1) {
|
||||||
|
print("Board test done, thank you! Time to remove that jumper and reboot\r\n");
|
||||||
|
print("Bye!\r\n");
|
||||||
|
chThdSleepSeconds(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,7 +165,6 @@ void initHardware(Logging *logger, Engine *engine) {
|
||||||
*/
|
*/
|
||||||
initTriggerDecoder();
|
initTriggerDecoder();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We need the LED_ERROR pin even before we read configuration
|
* We need the LED_ERROR pin even before we read configuration
|
||||||
*/
|
*/
|
||||||
|
@ -208,8 +207,8 @@ void initHardware(Logging *logger, Engine *engine) {
|
||||||
initAdcInputs(isBoardTestMode_b);
|
initAdcInputs(isBoardTestMode_b);
|
||||||
|
|
||||||
if (isBoardTestMode_b) {
|
if (isBoardTestMode_b) {
|
||||||
|
// this method never returns
|
||||||
initBoardTest();
|
initBoardTest();
|
||||||
efiAssertVoid(FALSE, "board test done");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
initRtc();
|
initRtc();
|
||||||
|
@ -335,14 +334,14 @@ static void extCallback(EXTDriver *extp, expchannel_t channel) {
|
||||||
* because pin '0' would be used on two different ports
|
* because pin '0' would be used on two different ports
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static EXTConfig extcfg = { { { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
static EXTConfig extcfg = { { { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED,
|
||||||
|
NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, {
|
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL } } };
|
||||||
EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL }, { EXT_CH_MODE_DISABLED, NULL } } };
|
|
||||||
|
|
||||||
void initExt(void) {
|
void initExt(void) {
|
||||||
|
|
||||||
|
@ -359,7 +358,6 @@ void initExt(void) {
|
||||||
extcfg.channels[11].mode = EXT_CH_MODE_BOTH_EDGES | EXT_CH_MODE_AUTOSTART | EXT_MODE_GPIOD; // PD11
|
extcfg.channels[11].mode = EXT_CH_MODE_BOTH_EDGES | EXT_CH_MODE_AUTOSTART | EXT_MODE_GPIOD; // PD11
|
||||||
extcfg.channels[11].cb = extCallback;
|
extcfg.channels[11].cb = extCallback;
|
||||||
|
|
||||||
|
|
||||||
mySetPadMode("joy A", GPIOD, 8, PAL_MODE_INPUT_PULLUP);
|
mySetPadMode("joy A", GPIOD, 8, PAL_MODE_INPUT_PULLUP);
|
||||||
mySetPadMode("joy A", GPIOD, 9, PAL_MODE_INPUT_PULLUP);
|
mySetPadMode("joy A", GPIOD, 9, PAL_MODE_INPUT_PULLUP);
|
||||||
mySetPadMode("joy A", GPIOD, 10, PAL_MODE_INPUT_PULLUP);
|
mySetPadMode("joy A", GPIOD, 10, PAL_MODE_INPUT_PULLUP);
|
||||||
|
|
|
@ -252,5 +252,5 @@ void firmwareError(const char *fmt, ...) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int getRusEfiVersion(void) {
|
int getRusEfiVersion(void) {
|
||||||
return 20141108;
|
return 20141109;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue