From 508e337d7711cb9f75daa60293d6fa207bbe9686 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 15 Dec 2014 21:03:22 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 11 ++++++++++- firmware/hw_layer/can_hw.cpp | 10 +++------- firmware/hw_layer/can_hw.h | 2 ++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 993339b4e7..c774293867 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -21,6 +21,9 @@ #include "thermistors.h" #include "engine_math.h" #include "le_functions.h" +#if EFI_PROD_CODE +#include "HIP9011.h" +#endif // setFrankenso_01_LCD #include "honda_accord.h" @@ -306,12 +309,18 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat boardConfiguration->isFastAdcEnabled = true; engineConfiguration->map.sensor.sensorType = MT_DODGE_NEON_2003; +#if EFI_PROD_CODE + setHip9011FrankensoPinout(); +#endif + engineConfiguration->cylinderBore = 87.5; +// engineConfiguration->isCanEnabled = true; // boardConfiguration->canTxPin = GPIOB_6; // boardConfiguration->canRxPin = GPIOB_12; // engineConfiguration->canWriteEnabled = true; // engineConfiguration->canReadEnabled = false; -// engineConfiguration->can_nbc_type = CAN_BUS_NBC_BMW; +//// engineConfiguration->can_nbc_type = CAN_BUS_NBC_BMW; +// engineConfiguration->can_nbc_type = CAN_BUS_MAZDA_RX8; } #endif /* EFI_SUPPORT_DODGE_NEON */ diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 4149ba457e..cd809f6539 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -28,10 +28,6 @@ static int can_write_not_ok = 0; static Logging logger; static THD_WORKING_AREA(canTreadStack, UTILITY_THREAD_STACK_SIZE); -extern engine_configuration_s *engineConfiguration; -extern engine_configuration2_s *engineConfiguration2; -extern board_configuration_s *board_configuration; - /* * 500KBaud * automatic wakeup @@ -203,10 +199,10 @@ static msg_t canThread(void *arg) { static void canInfo(void) { scheduleMsg(&logger, "CAN TX %s", hwPortname(boardConfiguration->canTxPin)); scheduleMsg(&logger, "CAN RX %s", hwPortname(boardConfiguration->canRxPin)); - scheduleMsg(&logger, "type=%d canReadEnabled=%d canWriteEnabled=%d", + scheduleMsg(&logger, "type=%d canReadEnabled=%s canWriteEnabled=%s", engineConfiguration->can_nbc_type, - engineConfiguration->canReadEnabled, - engineConfiguration->canWriteEnabled); + boolToString(engineConfiguration->canReadEnabled), + boolToString(engineConfiguration->canWriteEnabled)); scheduleMsg(&logger, "CAN rx count %d/tx ok %d/tx not ok %d", canReadCounter, can_write_ok, can_write_not_ok); diff --git a/firmware/hw_layer/can_hw.h b/firmware/hw_layer/can_hw.h index 217257b047..7fa4f35bc2 100644 --- a/firmware/hw_layer/can_hw.h +++ b/firmware/hw_layer/can_hw.h @@ -20,6 +20,8 @@ #define CAN_BMW_E46_CLUSTER_STATUS 0x613 #define CAN_FIAT_MOTOR_INFO 0x561 #define CAN_MAZDA_RX_RPM_SPEED 0x201 +#define CAN_MAZDA_RX_STATUS_1 0x212 +#define CAN_MAZDA_RX_STATUS_2 0x420 #define CAN_VAG_RPM 0x280 #define CAN_VAG_CLT 0x289