rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-05-09 17:26:03 -04:00
parent b469c5a0f7 19a1ad05b1
commit 4ebbe6fd61
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/hw_layer/drivers/gpio/tle8888.c
View File

@ -922,8 +922,8 @@ static int tle8888_chip_init(void * data) {
}
for (int i = 0; i < TLE8888_DIRECT_MISC; i++) {
if (cfg->direct_io[i].port) {
ret |= gpio_pin_markUsed(cfg->direct_io[i].port, cfg->direct_io[i].pad, DRIVER_NAME " DIRECT IO");
// TODO: we need this but that's incompatible configuration change
// ret |= gpio_pin_markUsed(cfg->direct_io[i].port, cfg->direct_io[i].pad, DRIVER_NAME " DIRECT IO");
// palSetPadMode(cfg->direct_io[i].port, cfg->direct_io[i].pad, PAL_MODE_OUTPUT_PUSHPULL);
// palClearPort(cfg->direct_io[i].port, PAL_PORT_BIT(cfg->direct_io[i].pad));
}
@ -945,9 +945,12 @@ err_gpios:
gpio_pin_markUnused(cfg->ign_en.port, cfg->ign_en.pad);
if (cfg->reset.port != NULL)
gpio_pin_markUnused(cfg->reset.port, cfg->reset.pad);
for (int i = 0; i < TLE8888_DIRECT_MISC; i++)
if (cfg->direct_io[i].port)
gpio_pin_markUnused(cfg->direct_io[i].port, cfg->direct_io[i].pad);
for (int i = 0; i < TLE8888_DIRECT_MISC; i++) {
if (cfg->direct_io[i].port) {
// TODO: we need this but that's incompatible configuration change
// gpio_pin_markUnused(cfg->direct_io[i].port, cfg->direct_io[i].pad);
}
}
return ret;
}

8
misc/jenkins/compile_other_versions/run.bat
View File

@ -53,10 +53,10 @@ IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat
IF NOT ERRORLEVEL 0 EXIT /B 1
pwd
call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre-f7-test rusefi_microrusefi.ini %f7_console_setting%
IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat
IF NOT ERRORLEVEL 0 EXIT /B 1
pwd
rem call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre-f7-test rusefi_microrusefi.ini %f7_console_setting%
rem IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat
rem IF NOT ERRORLEVEL 0 EXIT /B 1
rem pwd
call misc\jenkins\compile_other_versions\compile_and_upload.bat nucleo_f746 stm32f746_nucleo no %f7_console_setting%
IF NOT ERRORLEVEL 0 echo ERROR invoking compile_and_upload.bat