From 4046450727eee347de189271bdbefa8905cf0c3d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 6 Feb 2017 21:03:09 -0500 Subject: [PATCH] auto-sync --- firmware/hw_layer/adc_inputs.cpp | 2 +- firmware/hw_layer/can_hw.cpp | 5 ++--- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 3d9886839f..97c7f8bab3 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -345,7 +345,7 @@ const char * getAdcMode(adc_channel_e hwChannel) { if (fastAdc.isHwUsed(hwChannel)) { return "fast"; } - return "INACTIVE"; + return "INACTIVE - need restart"; } int getAdcChannelPin(adc_channel_e hwChannel) { diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 16426a33e3..e9f9879635 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -60,7 +60,7 @@ CANTxFrame txmsg; static void printPacket(CANRxFrame *rx) { // scheduleMsg(&logger, "CAN FMI %x", rx->FMI); // scheduleMsg(&logger, "TIME %x", rx->TIME); - scheduleMsg(&logger, "SID %x/%x %x %x %x %x %x %x %x %x", rx->SID, rx->DLC, rx->data8[0], rx->data8[1], + scheduleMsg(&logger, "Got CAN message: SID %x/%x %x %x %x %x %x %x %x %x", rx->SID, rx->DLC, rx->data8[0], rx->data8[1], rx->data8[2], rx->data8[3], rx->data8[4], rx->data8[5], rx->data8[6], rx->data8[7]); if (rx->SID == CAN_BMW_E46_CLUSTER_STATUS) { @@ -199,13 +199,12 @@ static void canInfoNBCBroadcast(can_nbc_e typeOfNBC) { } static void canRead(void) { - scheduleMsg(&logger, "Waiting for CAN"); +// scheduleMsg(&logger, "Waiting for CAN"); msg_t result = canReceive(&EFI_CAN_DEVICE, CAN_ANY_MAILBOX, &rxBuffer, MS2ST(1000)); if (result == RDY_TIMEOUT) { return; } - scheduleMsg(&logger, "Got CAN message"); canReadCounter++; printPacket(&rxBuffer); obdOnCanPacketRx(&rxBuffer); diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 5d72ce577d..4536b8f9e9 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 06 18:33:11 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 06 20:36:08 EST 2017 pageSize = 16376 page = 1 @@ -1562,7 +1562,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} dialog = triggerConfiguration_IO, "Settings I/O" - field = "!ECU reboot needed to apply these settings" + field = "!ECU reboot needed to apply pin assignment" field = "#Cam is primary if you have cam sensor" field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} @@ -1826,6 +1826,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" panel = mapSensorFDlg, South dialog = mapSwitchAndSettings, "Switch and Settings" + field = "!ECU reboot needed to apply pin assignment" panel = mapSwitch, North panel = mapVandF, South diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1c5269f239..4654d276c1 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1496,7 +1496,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} dialog = triggerConfiguration_IO, "Settings I/O" - field = "!ECU reboot needed to apply these settings" + field = "!ECU reboot needed to apply pin assignment" field = "#Cam is primary if you have cam sensor" field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} @@ -1760,6 +1760,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" panel = mapSensorFDlg, South dialog = mapSwitchAndSettings, "Switch and Settings" + field = "!ECU reboot needed to apply pin assignment" panel = mapSwitch, North panel = mapVandF, South