diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 05cbfe2d0f..aebfd639f8 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -61,6 +61,8 @@ void setBmwE34(engine_configuration_s *engineConfiguration) { bc->injectionPins[4] = GPIO_UNASSIGNED; // #5 bc->injectionPins[5] = GPIO_UNASSIGNED; // #6 + bc->triggerErrorPin = GPIOE_3; + /** * emulating the 60-0 trigger takes some resources, let's keep it slow by default * rpm 200 diff --git a/firmware/config/system/chconf.h b/firmware/config/system/chconf.h index fc4908b4e1..0f7db4731f 100644 --- a/firmware/config/system/chconf.h +++ b/firmware/config/system/chconf.h @@ -44,9 +44,7 @@ chDbgPanic3(__QUOTE_THIS(func)"()", __FILE__, __LINE__); \ } -#define COMMON_IRQ_PRIORITY 6 - -#define CORTEX_PRIORITY_SYSTICK COMMON_IRQ_PRIORITY +#define CORTEX_PRIORITY_SYSTICK 6 #define PORT_IDLE_THREAD_STACK_SIZE 1024 diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 4ee2832fea..2d08e5888b 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -230,7 +230,7 @@ static void triggerInfo(Engine *engine) { scheduleMsg(&logger, "expected duty #0=%f/#1=%f", engineConfiguration2->triggerShape.dutyCycle[0], engineConfiguration2->triggerShape.dutyCycle[1]); - scheduleMsg(&logger, "isError %s/total errors=%d %d/total revolutions=%d/self=%s", + scheduleMsg(&logger, "isError %s/total errors=%d ord_err=%d/total revolutions=%d/self=%s", boolToString(isTriggerDecoderError()), triggerCentral.triggerState.totalTriggerErrorCounter, triggerCentral.triggerState.orderingErrorCounter, @@ -250,6 +250,9 @@ static void triggerInfo(Engine *engine) { scheduleMsg(&logger, "3rd trigger simulator: %s %s", hwPortname(boardConfiguration->triggerSimulatorPins[2]), pinModeToString(boardConfiguration->triggerSimulatorPinModes[2])); + scheduleMsg(&logger, "trigger error extra LED: %s %s", hwPortname(boardConfiguration->triggerErrorPin), + pinModeToString(boardConfiguration->triggerErrorPinMode)); + scheduleMsg(&logger, "primary trigger input: %s", hwPortname(boardConfiguration->triggerInputPins[0])); scheduleMsg(&logger, "secondary trigger input: %s", hwPortname(boardConfiguration->triggerInputPins[1])); scheduleMsg(&logger, "primary logic input: %s", hwPortname(boardConfiguration->logicAnalyzerPins[0])); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index d1185c1a44..a679eaf927 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -270,5 +270,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20141122; + return 20141123; } diff --git a/hardware/frankenso/known_issues.txt b/hardware/frankenso/known_issues.txt index df95f50f31..aba8d312e4 100644 --- a/hardware/frankenso/known_issues.txt +++ b/hardware/frankenso/known_issues.txt @@ -28,6 +28,12 @@ 28) RESOLVED IN R0.2 better silkscreen for P602 & P604 - explicit "5v" "12v" "GND" 29) RESOLVED IN R0.2 Add LED indicators to injector channels. 30) RESOLVED IN R0.3 3D for C1001 bulk cap has black mark on wrong side +31) We've moved the upper mounting hole too far - we need to move it half way back http://rusefi.com/forum/viewtopic.php?f=4&t=735#p12500 +32) C1001 should be 1mm lower to improve clearance with the case +32) Q411 should be 1.5mm lower to improve clearance with the case +33) Q412 should be moved 3mm to the left, this would probably affect W63 which would affect the whole corner. Maybe move Q412 to the back of the board? +34) rename the recently added low-side diodes and LEDs/resistors into 400 range + For honda add-on / rewiring board -- Add 2A high side solinoid drive for VTec sol