From fbc552a629b1e501f38f40e9e3da0714744db0a3 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 14 Nov 2014 10:03:49 -0600 Subject: [PATCH] auto-sync --- firmware/console/tunerstudio/tunerstudio.cpp | 4 ++-- firmware/controllers/trigger/trigger_central.cpp | 3 ++- firmware/controllers/trigger/trigger_decoder.cpp | 2 +- firmware/controllers/trigger/trigger_decoder.h | 2 +- firmware/rusefi.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/tunerstudio/tunerstudio.cpp index 7babe837b8..8810add152 100644 --- a/firmware/console/tunerstudio/tunerstudio.cpp +++ b/firmware/console/tunerstudio/tunerstudio.cpp @@ -111,8 +111,8 @@ extern board_configuration_s *boardConfiguration; static void printStats(void) { #if EFI_PROD_CODE if (!isSerialOverUart()) { - scheduleMsg(&logger, "TS RX on %s%d/TX on %s%d", portname(TS_SERIAL_RX_PORT), TS_SERIAL_RX_PIN, - portname(TS_SERIAL_TX_PORT), TS_SERIAL_TX_PIN); + scheduleMsg(&logger, "TS RX on %s%d/TX on %s%d @%d", portname(TS_SERIAL_RX_PORT), TS_SERIAL_RX_PIN, + portname(TS_SERIAL_TX_PORT), TS_SERIAL_TX_PIN, TS_SERIAL_SPEED); } #endif /* EFI_PROD_CODE */ scheduleMsg(&logger, "TunerStudio total/error counter=%d/%d H=%d / O counter=%d size=%d / P=%d / B=%d", tsCounter, tsState.errorCounter, tsState.queryCommandCounter, tsState.outputChannelsCommandCounter, diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 78e0eee0d8..7b6eea79ac 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -216,7 +216,8 @@ static void triggerInfo(Engine *engine) { scheduleMsg(&logger, "expected duty #0=%f/#1=%f", engineConfiguration2->triggerShape.dutyCycle[0], engineConfiguration2->triggerShape.dutyCycle[1]); - scheduleMsg(&logger, "isError %d/total errors=%d/total revolutions=%d", isTriggerDecoderError(), + scheduleMsg(&logger, "isError %s/total errors=%d/total revolutions=%d", + boolToString(isTriggerDecoderError()), triggerCentral.triggerState.totalTriggerErrorCounter, triggerCentral.triggerState.getTotalRevolutionCounter()); diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index 78865238a7..f28cd1d7eb 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -46,7 +46,7 @@ Logging logger; /** * @return TRUE is something is wrong with trigger decoding */ -int isTriggerDecoderError(void) { +bool_t isTriggerDecoderError(void) { return errorDetection.sum(6) > 4; } diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h index 4883679121..61374a09b6 100644 --- a/firmware/controllers/trigger/trigger_decoder.h +++ b/firmware/controllers/trigger/trigger_decoder.h @@ -83,6 +83,6 @@ uint32_t findTriggerZeroEventIndex(trigger_shape_s * shape, trigger_config_s con void initializeTriggerShape(Logging *logger, engine_configuration_s const *engineConfiguration, engine_configuration2_s *engineConfiguration2); void initTriggerDecoder(void); -int isTriggerDecoderError(void); +bool_t isTriggerDecoderError(void); #endif /* TRIGGER_DECODER_H_ */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 1f128fa561..a1578bab75 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -252,5 +252,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20141113; + return 20141114; }