auto-sync

firmware/controllers/algo/engine_configuration.cpp

@@ -195,6 +195,8 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
 	boardConfiguration->etbDirectionPin2 = GPIO_UNASSIGNED;
 	boardConfiguration->o2heaterPin = GPIO_UNASSIGNED;
 
+	boardConfiguration->tachOutputPin = GPIO_UNASSIGNED;
+
 	boardConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED;
 	boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
 

firmware/controllers/algo/engine_configuration_generated_structures.h

@@ -1,4 +1,4 @@
-// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015
+// this section was generated by config_definition.jar on Tue Aug 18 13:54:22 EDT 2015
 // begin
 #include "rusefi_types.h"
 typedef struct {
@@ -453,7 +453,11 @@ typedef struct {
 	/**
 	 * offset 288
 	 */
-	float unusedADC[2];
+	brain_pin_e tachOutputPin;
+	/**
+	 * offset 292
+	 */
+	pin_output_mode_e tachOutputPinMode;
 	/**
 	 * offset 296
 	 */
@@ -1246,7 +1250,11 @@ typedef struct {
 	/**
 	 * offset 1824
 	 */
-	int unused3[83];
+	float tachPulseDuractionMs;
+	/**
+	 * offset 1828
+	 */
+	int unused3[82];
 	/**
 	 * offset 2156
 	 */
@@ -1457,4 +1465,4 @@ typedef struct {
 } persistent_config_s;
 
 // end
-// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015
+// this section was generated by config_definition.jar on Tue Aug 18 13:54:22 EDT 2015

firmware/controllers/algo/rusefi_generated.h

@@ -319,8 +319,10 @@
 #define etbDT_offset 904
 #define etbDT_offset_hex 388
 #define hip9011CsPinMode_offset 908
-#define unusedADC_offset 912
+#define tachOutputPin_offset 912
-#define unusedADC_offset_hex 390
+#define tachOutputPin_offset_hex 390
+#define tachOutputPinMode_offset 916
+#define tachOutputPinMode_offset_hex 394
 #define triggerInputPins1_offset 920
 #define triggerInputPins1_offset_hex 398
 #define triggerInputPins2_offset 924
@@ -649,8 +651,10 @@
 #define crankingTpsCoef_offset 1760
 #define crankingTpsBins_offset 1792
 #define crankingTpsBins_offset_hex 700
-#define unused3_offset 1824
+#define tachPulseDuractionMs_offset 1824
-#define unused3_offset_hex 720
+#define tachPulseDuractionMs_offset_hex 720
+#define unused3_offset 1828
+#define unused3_offset_hex 724
 #define targetVBatt_offset 2156
 #define alternatorOffAboveTps_offset 2160
 #define alternatorOffAboveTps_offset_hex 870

firmware/controllers/controllers.mk

@@ -13,4 +13,5 @@ CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
 	$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
 	$(PROJECT_DIR)/controllers/alternatorController.cpp \
 	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
+	$(PROJECT_DIR)/controllers/tachometer.cpp \
  	$(PROJECT_DIR)/controllers/engine_controller.cpp

firmware/controllers/flash_main.h

@@ -11,7 +11,7 @@
 
 #include "engine.h"
 
-#define FLASH_DATA_VERSION 8400
+#define FLASH_DATA_VERSION 8500
 
 void readFromFlash(void);
 void initFlash(Logging *sharedLogger);

firmware/controllers/tachometer.cpp

@@ -0,0 +1,16 @@
+/*
+ * @file tachometer.cpp
+ *
+ * @date Aug 18, 2015
+ * @author Andrey Belomutskiy, (c) 2012-2015
+ */
+
+#include "tachometer.h"
+
+EXTERN_ENGINE;
+
+void initTachometer(void) {
+	if (boardConfiguration->tachOutputPin == GPIO_UNASSIGNED)
+		return;
+
+}

firmware/controllers/tachometer.h

@@ -0,0 +1,15 @@
+/*
+ * @file tachometer.h
+ *
+ * @date Aug 18, 2015
+ * @author Andrey Belomutskiy, (c) 2012-2015
+ */
+
+#ifndef CONTROLLERS_TACHOMETER_H_
+#define CONTROLLERS_TACHOMETER_H_
+
+#include "engine.h"
+
+void initTachometer(void);
+
+#endif /* CONTROLLERS_TACHOMETER_H_ */

firmware/integration/rusefi_config.txt

@@ -371,7 +371,8 @@ float etbIFactor;
 	ego_sensor_e afr_type;AFR, WBO, EGO - whatever you like to call it;
 	int etbDT;
 	pin_output_mode_e hip9011CsPinMode;
-	float[2] unusedADC;
+	brain_pin_e tachOutputPin;
+	pin_output_mode_e tachOutputPinMode;
 
 	brain_input_pin_e[3 iterate] triggerInputPins;
 	brain_pin_e mainRelayPin;
@@ -569,7 +570,8 @@ baro_corr_table_t baroCorrTable;
 	float[CRANKING_CURVE_SIZE] crankingTpsCoef;;"%",      1,     0,      0.0,    700.0,   2
 	float[CRANKING_CURVE_SIZE] crankingTpsBins;;"%",        1,     0,    0.0,    100.0,  2
 	
-	int[83] unused3;
+	float tachPulseDuractionMs;
+	int[82] unused3;
 	
 	float targetVBatt;;"Volts",      1,      0,       0,30,      1
 	float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%",  1,      0,       0, 200,      2