rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2017-02-06 21:03:09 -05:00
parent 83e37c5f63
commit 4046450727
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/hw_layer/adc_inputs.cpp
View File

@ -345,7 +345,7 @@ const char * getAdcMode(adc_channel_e hwChannel) {
if (fastAdc.isHwUsed(hwChannel)) { if (fastAdc.isHwUsed(hwChannel)) {
return "fast"; return "fast";
} }
return "INACTIVE"; return "INACTIVE - need restart";
} }
int getAdcChannelPin(adc_channel_e hwChannel) { int getAdcChannelPin(adc_channel_e hwChannel) {

5
firmware/hw_layer/can_hw.cpp
View File

@ -60,7 +60,7 @@ CANTxFrame txmsg;
static void printPacket(CANRxFrame *rx) { static void printPacket(CANRxFrame *rx) {
// scheduleMsg(&logger, "CAN FMI %x", rx->FMI); // scheduleMsg(&logger, "CAN FMI %x", rx->FMI);
// scheduleMsg(&logger, "TIME %x", rx->TIME); // 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]); 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) { if (rx->SID == CAN_BMW_E46_CLUSTER_STATUS) {
@ -199,13 +199,12 @@ static void canInfoNBCBroadcast(can_nbc_e typeOfNBC) {
} }
static void canRead(void) { 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)); msg_t result = canReceive(&EFI_CAN_DEVICE, CAN_ANY_MAILBOX, &rxBuffer, MS2ST(1000));
if (result == RDY_TIMEOUT) { if (result == RDY_TIMEOUT) {
return; return;
} }
scheduleMsg(&logger, "Got CAN message");
canReadCounter++; canReadCounter++;
printPacket(&rxBuffer); printPacket(&rxBuffer);
obdOnCanPacketRx(&rxBuffer); obdOnCanPacketRx(&rxBuffer);

5
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 16376
page = 1 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 = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0}
field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0}
dialog = triggerConfiguration_IO, "Settings I/O" 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 = "#Cam is primary if you have cam sensor"
field = "Primary input channel", triggerInputPins1 field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} 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 panel = mapSensorFDlg, South
dialog = mapSwitchAndSettings, "Switch and Settings" dialog = mapSwitchAndSettings, "Switch and Settings"
field = "!ECU reboot needed to apply pin assignment"
panel = mapSwitch, North panel = mapSwitch, North
panel = mapVandF, South panel = mapVandF, South

3
firmware/tunerstudio/rusefi.input
View File

@ -1496,7 +1496,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0}
field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0} field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0}
dialog = triggerConfiguration_IO, "Settings I/O" 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 = "#Cam is primary if you have cam sensor"
field = "Primary input channel", triggerInputPins1 field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} 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 panel = mapSensorFDlg, South
dialog = mapSwitchAndSettings, "Switch and Settings" dialog = mapSwitchAndSettings, "Switch and Settings"
field = "!ECU reboot needed to apply pin assignment"
panel = mapSwitch, North panel = mapSwitch, North
panel = mapVandF, South panel = mapVandF, South