From 9fe7324a3e290afd0dc18711a956c36eaf1faa69 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 13 Mar 2015 21:05:50 -0500 Subject: [PATCH] auto-sync --- firmware/console/status_loop.cpp | 7 +------ firmware/controllers/alternatorController.cpp | 14 +++++++++++--- firmware/controllers/settings.cpp | 3 +++ firmware/rusefi.cpp | 2 +- .../models/src/com/rusefi/core/SensorCentral.java | 6 +----- java_console/rusefi.xml | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 4099274d7b..f354d612b5 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -140,14 +140,9 @@ static void reportSensorI(Logging *log, bool fileFormat, const char *caption, co } } -static const char* boolean2string(int value) { - return value ? "YES" : "NO"; -} - EXTERN_ENGINE ; - void printSensors(Logging *log, bool fileFormat) { // current time, in milliseconds int nowMs = currentTimeMillis(); @@ -663,7 +658,7 @@ void startStatusThreads(Engine *engine) { } void setFullLog(int value) { - print("Setting full logging: %s\r\n", boolean2string(value)); + print("Setting full logging: %s\r\n", boolToString(value)); printMsg(&logger, "%s%d", FULL_LOGGING_KEY, value); fullLog = value; } diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index 497692e984..7a7bdfa2b7 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -29,17 +29,19 @@ static Pid altPid(10, 0, 0, 10, 90); static THD_WORKING_AREA(alternatorControlThreadStack, UTILITY_THREAD_STACK_SIZE); +static float currentAltDuty; + static msg_t AltCtrlThread(int param) { chRegSetThreadName("AlternatorController"); while (true) { chThdSleepMilliseconds(100); - float result = altPid.getValue(14, getVBatt(engineConfiguration), 1); + currentAltDuty = altPid.getValue(14, getVBatt(engineConfiguration), 1); if (boardConfiguration->isVerboseAlternator) { - scheduleMsg(logger, "alt duty: %f", result); + scheduleMsg(logger, "alt duty: %f/vbatt=%f", currentAltDuty, getVBatt(engineConfiguration)); } - alternatorControl.setSimplePwmDutyCycle(result / 100); + alternatorControl.setSimplePwmDutyCycle(currentAltDuty / 100); } #if defined __GNUC__ return -1; @@ -60,6 +62,11 @@ static void applyAlternatorPinState(PwmConfig *state, int stateIndex) { output->setValue(value); } +static void showAltInfo(void) { + scheduleMsg(logger, "atl=%s", boolToString(engineConfiguration->isAlternatorControlEnabled)); + scheduleMsg(logger, "vbatt=%f/duty=%f", getVBatt(engineConfiguration), currentAltDuty); +} + void initAlternatorCtrl(Logging *sharedLogger) { logger = sharedLogger; if (boardConfiguration->alternatorControlPin == GPIO_UNASSIGNED) @@ -72,4 +79,5 @@ void initAlternatorCtrl(Logging *sharedLogger) { (tfunc_t) AltCtrlThread, NULL); addConsoleActionF("alt_pid", setAltPid); + addConsoleAction("altinfo", showAltInfo); } diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index ae0e3bc4da..31ce3e02ca 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -98,6 +98,9 @@ static void printOutputs(engine_configuration_s *engineConfiguration) { scheduleMsg(&logger, "mainRelay: mode %s @ %s", getPin_output_mode_e(boardConfiguration->mainRelayPinMode), hwPortname(boardConfiguration->mainRelayPin)); + + scheduleMsg(&logger, "alternator field: mode %s @ %s", getPin_output_mode_e(boardConfiguration->alternatorControlPinMode), + hwPortname(boardConfiguration->alternatorControlPin)); } EXTERN_ENGINE diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index e823c62100..fbcff5136f 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -276,5 +276,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150311; + return 20150313; } diff --git a/java_console/models/src/com/rusefi/core/SensorCentral.java b/java_console/models/src/com/rusefi/core/SensorCentral.java index ace2d86a3d..83923469d1 100644 --- a/java_console/models/src/com/rusefi/core/SensorCentral.java +++ b/java_console/models/src/com/rusefi/core/SensorCentral.java @@ -85,12 +85,8 @@ public class SensorCentral { for (SensorListener listener : listeners) listener.onSensorUpdate(value); - ResponseImpl r = new ResponseImpl(); - - - LoggerData d = new LoggerData() { @Override public String toString() { @@ -99,7 +95,7 @@ public class SensorCentral { @Override public String getId() { - return sensor.getName(); + return sensor.name(); } @Override diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index bf0397b6e8..ba1c97f8cb 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -18,7 +18,7 @@ -
+
@@ -28,7 +28,7 @@
-
+