From c9bd8b4fc3dbef5d4196630b4f08b931089b8e97 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 12 Sep 2015 15:02:40 -0400
Subject: [PATCH] auto-sync

---
 firmware/config/engines/daihatsu.cpp          |  6 +-
 .../controllers/algo/auto_generated_enums.cpp |  2 +
 .../controllers/algo/engine_configuration.cpp |  5 ++
 firmware/controllers/algo/rusefi_enums.h      | 69 +++++---------
 firmware/controllers/settings.cpp             |  2 +
 .../controllers/trigger/trigger_structure.cpp | 10 +++
 .../controllers/trigger/trigger_structure.h   |  4 +-
 .../controllers/trigger/trigger_subaru.cpp    |  7 +-
 firmware/integration/rusefi_config.txt        |  4 +-
 firmware/rusefi.cpp                           |  2 +-
 firmware/tunerstudio/rusefi.ini               |  6 +-
 hardware/CJ125_board/O2_input_CJ125.pro       | 83 ++++++++---------
 hardware/CJ125_board/O2_input_CJ125.sch       | 89 +++++++++++++++++--
 hardware/rusefi_lib/cj125.lib                 | 64 +++++++++++++
 unit_tests/test_trigger_decoder.cpp           |  2 +-
 15 files changed, 252 insertions(+), 103 deletions(-)
 create mode 100644 hardware/rusefi_lib/cj125.lib

diff --git a/firmware/config/engines/daihatsu.cpp b/firmware/config/engines/daihatsu.cpp
index c1ec65386e..6051b65e83 100644
--- a/firmware/config/engines/daihatsu.cpp
+++ b/firmware/config/engines/daihatsu.cpp
@@ -1,6 +1,8 @@
 /**
  * @file daihatsu.cpp
  *
+ * set_engine_type 34
+ *
  * @date Sep 10, 2015
  * @author Andrey Belomutskiy, (c) 2012-2015
  */
@@ -11,7 +13,9 @@
 EXTERN_ENGINE;
 
 void setDaihatsu(DECLARE_ENGINE_PARAMETER_F) {
+	engineConfiguration->trigger.type = TT_36_2_2_2;
+
 	engineConfiguration->specs.cylindersCount = 3;
-	engineConfiguration->specs.firingOrder = FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6;
+	engineConfiguration->specs.firingOrder = FO_1_2_3;
 
 }
diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index 3229564398..957940104d 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -28,6 +28,8 @@ case AUDI_AAN:
   return "AUDI_AAN";
 case SACHS:
   return "SACHS";
+case DAIHATSU:
+	return "DAIHATSU";
 case GM_2_2:
   return "GM_2_2";
 case DODGE_RAM:
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 8cb30e22c2..96d912c9e3 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -62,6 +62,7 @@
 #include "dodge_ram.h"
 #include "vw.h"
 #include "dodge_stratus.h"
+#include "daihatsu.h"
 
 EXTERN_ENGINE;
 
@@ -736,6 +737,10 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
 	case SACHS:
 		setSachs(PASS_ENGINE_PARAMETER_F);
 		break;
+	case DAIHATSU:
+		setDaihatsu(PASS_ENGINE_PARAMETER_F);
+		break;
+
 	default:
 		warning(OBD_PCM_Processor_Fault, "Unexpected engine type: %d", engineType);
 	}
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 48e0c2b4cb..1c07f84717 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -46,11 +46,11 @@ typedef enum {
 	NISSAN_PRIMERA = 5,
 	HONDA_ACCORD_CD = 6,
 	FORD_INLINE_6_1995 = 7,
-/**
- * one cylinder engine
- * 139qmb 50-90cc
- * http://rusefi.com/forum/viewtopic.php?f=3&t=332
- */
+	/**
+	 * one cylinder engine
+	 * 139qmb 50-90cc
+	 * http://rusefi.com/forum/viewtopic.php?f=3&t=332
+	 */
 	GY6_139QMB = 8,
 
 	MAZDA_MIATA_NB = 9,
@@ -103,7 +103,9 @@ typedef enum {
 
 	DODGE_STRATUS = 33,
 
-	ET_UNUSED = 34,
+	DAIHATSU = 34,
+
+	ET_UNUSED = 35,
 
 	Force_4b_engine_type = ENUM_32_BITS,
 } engine_type_e;
@@ -153,23 +155,19 @@ typedef enum {
 } trigger_type_e;
 
 typedef enum {
-	ADC_OFF = 0,
-	ADC_SLOW = 1,
-	ADC_FAST = 2,
+	ADC_OFF = 0, ADC_SLOW = 1, ADC_FAST = 2,
 
 	Force_4b_adc_channel_mode = ENUM_32_BITS,
 } adc_channel_mode_e;
 
 // todo: better names?
 typedef enum {
-	TV_LOW = 0,
-	TV_HIGH = 1
+	TV_LOW = 0, TV_HIGH = 1
 } trigger_value_e;
 
 // todo: better names?
 typedef enum {
-	T_PRIMARY = 0,
-	T_SECONDARY = 1,
+	T_PRIMARY = 0, T_SECONDARY = 1,
 	// todo: I really do not want to call this 'tertiary'. maybe we should rename all of these?
 	T_CHANNEL_3 = 2
 } trigger_wheel_e;
@@ -215,9 +213,7 @@ typedef enum {
 } engine_load_mode_e;
 
 typedef enum {
-	DM_NONE = 0,
-	DM_HD44780 = 1,
-	DM_HD44780_OVER_PCF8574 = 2,
+	DM_NONE = 0, DM_HD44780 = 1, DM_HD44780_OVER_PCF8574 = 2,
 
 	Force_4b_display_mode = ENUM_32_BITS,
 
@@ -234,11 +230,8 @@ typedef enum {
 	Force_4b_log_format = ENUM_32_BITS,
 } log_format_e;
 
-
 typedef enum {
-	IM_AUTO = 0,
-	IM_MANUAL = 1,
-	Force_4b_idle_mode = ENUM_32_BITS,
+	IM_AUTO = 0, IM_MANUAL = 1, Force_4b_idle_mode = ENUM_32_BITS,
 } idle_mode_e;
 
 typedef enum {
@@ -253,8 +246,7 @@ typedef enum {
 	/**
 	 * logical OFF is floating, logical ON is GND
 	 */
-	OM_OPENDRAIN = 2,
-	OM_OPENDRAIN_INVERTED = 3,
+	OM_OPENDRAIN = 2, OM_OPENDRAIN_INVERTED = 3,
 
 	Force_4b_pin_output_mode = ENUM_32_BITS,
 } pin_output_mode_e;
@@ -265,9 +257,7 @@ typedef enum {
 } gpio_mode_e;
 
 typedef enum {
-	PI_DEFAULT = 0,
-	PI_PULLUP = 1,
-	PI_PULLDOWN = 2,
+	PI_DEFAULT = 0, PI_PULLUP = 1, PI_PULLDOWN = 2,
 
 	Force_4b_pin_input_mode = ENUM_32_BITS,
 } pin_input_mode_e;
@@ -295,7 +285,6 @@ typedef enum {
 	FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6 = 7,
 	FO_1_THEN_2_THEN_3_THEN_4_THEN_5_THEN_6 = 9,
 
-
 	Force_4b_firing_order = ENUM_32_BITS,
 } firing_order_e;
 
@@ -320,16 +309,13 @@ typedef enum {
 	/**
 	 * in this mode we use as many coils as we have cylinders
 	 */
-	IM_INDIVIDUAL_COILS = 1,
-	IM_WASTED_SPARK = 2,
+	IM_INDIVIDUAL_COILS = 1, IM_WASTED_SPARK = 2,
 
 	Force_4b_ignition_mode = ENUM_32_BITS,
 } ignition_mode_e;
 
 typedef enum {
-	IM_SIMULTANEOUS = 0,
-	IM_SEQUENTIAL = 1,
-	IM_BATCH = 2,
+	IM_SIMULTANEOUS = 0, IM_SEQUENTIAL = 1, IM_BATCH = 2,
 
 	Force_4b_injection_mode = ENUM_32_BITS,
 } injection_mode_e;
@@ -338,8 +324,7 @@ typedef enum {
  * @brief Ignition Mode while cranking
  */
 typedef enum {
-	CIM_DEFAULT = 0,
-	CIM_FIXED_ANGLE = 1,
+	CIM_DEFAULT = 0, CIM_FIXED_ANGLE = 1,
 
 	Force_4b_cranking_ignition_mode = ENUM_32_BITS,
 } cranking_ignition_mode_e;
@@ -372,21 +357,18 @@ typedef enum {
 	EFI_ADC_14 = 14,
 	EFI_ADC_15 = 15,
 
-
 	EFI_ADC_NONE = 16,
 	EFI_ADC_ERROR = 999,
 
 	Force_4b_cranking_adc_channel = ENUM_32_BITS,
 } adc_channel_e;
 
-
 typedef enum {
 	ES_BPSX_D1 = 0,
 	/**
 	 * same as innovate LC2
 	 */
-	ES_Innovate_MTX_L = 1,
-	ES_14Point7_Free = 2,
+	ES_Innovate_MTX_L = 1, ES_14Point7_Free = 2,
 
 	ES_NarrowBand = 3,
 
@@ -395,8 +377,6 @@ typedef enum {
 	Force_4b_ego_sensor = ENUM_32_BITS,
 } ego_sensor_e;
 
-
-
 /**
  * Hardware pin. This enum is platform-specific.
  */
@@ -544,14 +524,11 @@ typedef enum {
 } brain_pin_e;
 
 typedef enum {
-	MT_CUSTOM = 0,
-	MT_DENSO183 = 1,
+	MT_CUSTOM = 0, MT_DENSO183 = 1,
 	/**
 	 * 20 to 250 kPa (2.9 to 36.3 psi) 0.2 to 4.9 V OUTPUT
 	 */
-	MT_MPX4250 = 2,
-	MT_HONDA3BAR = 3,
-	MT_DODGE_NEON_2003 = 4,
+	MT_MPX4250 = 2, MT_HONDA3BAR = 3, MT_DODGE_NEON_2003 = 4,
 	/**
 	 * 22012AA090
 	 */
@@ -570,9 +547,7 @@ typedef enum {
 } air_pressure_sensor_type_e;
 
 typedef enum {
-	CD_OFF = 0,
-	CD_USE_CAN1 = 1,
-	CD_USE_CAN2 = 2,
+	CD_OFF = 0, CD_USE_CAN1 = 1, CD_USE_CAN2 = 2,
 
 	Internal_ForceMyEnumIntSize_can_device_mode = ENUM_32_BITS,
 } can_device_mode_e;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 96e2f50bcf..7c80faa74d 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -178,6 +178,8 @@ const char* getConfigurationName(engine_type_e engineType) {
 		return "DODGE_STRATUS";
 	case SACHS:
 		return "SACHS";
+	case DAIHATSU:
+		return "DAIHATSU";
 	case GM_2_2:
 	  return "GM_2_2";
 	case DODGE_RAM:
diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp
index 2518aff86d..56a4507b86 100644
--- a/firmware/controllers/trigger/trigger_structure.cpp
+++ b/firmware/controllers/trigger/trigger_structure.cpp
@@ -402,6 +402,16 @@ void TriggerShape::setTriggerSynchronizationGap(float synchRatio) {
 	setTriggerSynchronizationGap2(synchRatio * 0.75f, synchRatio * 1.25f);
 }
 
+void TriggerShape::setSecondTriggerSynchronizationGap2(float syncRatioFrom, float syncRatioTo) {
+	isSynchronizationNeeded = true;
+	this->secondSyncRatioFrom = syncRatioFrom;
+	this->secondSyncRatioTo = syncRatioTo;
+}
+
+void TriggerShape::setSecondTriggerSynchronizationGap(float synchRatio) {
+	setSecondTriggerSynchronizationGap2(synchRatio * 0.75f, synchRatio * 1.25f);
+}
+
 #define S24 (720.0f / 24 / 2)
 
 static float addAccordPair(TriggerShape *s, float sb, trigger_wheel_e const waveIndex) {
diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h
index 10505472b2..bb261c3d8a 100644
--- a/firmware/controllers/trigger/trigger_structure.h
+++ b/firmware/controllers/trigger/trigger_structure.h
@@ -122,8 +122,10 @@ public:
 	// todo: these two methods here, something could be improved
 	void clear();
 	void reset(operation_mode_e operationMode, bool needSecondTriggerInput);
-	void setTriggerSynchronizationGap2(float syncRatioFrom, float syncRatioTo);
 	void setTriggerSynchronizationGap(float synchRatio);
+	void setTriggerSynchronizationGap2(float syncRatioFrom, float syncRatioTo);
+	void setSecondTriggerSynchronizationGap(float synchRatio);
+	void setSecondTriggerSynchronizationGap2(float syncRatioFrom, float syncRatioTo);
 	/**
 	 * this one is per CRANKshaft revolution
 	 */
diff --git a/firmware/controllers/trigger/trigger_subaru.cpp b/firmware/controllers/trigger/trigger_subaru.cpp
index f17433e30c..40b8501a28 100644
--- a/firmware/controllers/trigger/trigger_subaru.cpp
+++ b/firmware/controllers/trigger/trigger_subaru.cpp
@@ -7,13 +7,18 @@
 
 #include "trigger_subaru.h"
 
+/**
+ * This trigger is also used by Nissan and Mazda
+ */
 void initialize36_2_2_2(TriggerShape *s) {
 	s->reset(FOUR_STROKE_CAM_SENSOR, true);
 
 	float wide = 30 * 2;
 	float narrow = 10 * 2;
 
-	s->isSynchronizationNeeded = false;
+	s->isSynchronizationNeeded = true;
+	s->setTriggerSynchronizationGap(0.5);
+	s->setSecondTriggerSynchronizationGap(1);
 
 	float base = 0;
 
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index b412b5e217..f8f5239340 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -176,7 +176,7 @@ float displacement;Engine displacement, in liters\nsee also cylindersCount;"L",
 custom cylinders_count_t 4 bits,    U32,    @OFFSET@, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID"
 cylinders_count_t cylindersCount;
 
-custom firing_order_e 4 bits,    U32,    @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+custom firing_order_e 4 bits,    U32,    @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 firing_order_e firingOrder;
 end_struct
 
@@ -252,7 +252,7 @@ struct trigger_config_s @brief Trigger wheel(s) configuration
 
 custom bool32_t 4 bits,    U32,   @OFFSET@, [0:0], "false", "true"
 
-#define trigger_type_e_enum "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" 
+#define trigger_type_e_enum "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" 
 
 custom trigger_type_e 4 bits,    U32,   @OFFSET@, [0:4], @@trigger_type_e_enum@@
 	trigger_type_e type;
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 808997cdfa..114e781fbd 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -273,5 +273,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20150911;
+	return 20150912;
 }
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 100020d99c..7b511abfc7 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -40,7 +40,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated by ConfigDefinition.jar on Mon Aug 31 13:06:37 EDT 2015
+; this section was generated by ConfigDefinition.jar on Sat Sep 12 14:31:14 EDT 2015
 
 pageSize            = 15288
 page = 1
@@ -93,7 +93,7 @@ page = 1
 	sparkDwell						= array, F32,	368,	[8],	"ms", 1, 0.0, 0.0, 30.0, 2
 	displacement					= scalar, F32,	400,	"L", 1, 0, 0, 1000.0, 2
 	cylindersCount				 = bits, U32, 404, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID"
-	firingOrder					 = bits, U32, 408, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+	firingOrder					 = bits, U32, 408, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 ;skipping cylinderBore offset 412
 	engineCycle						= scalar, S32,	416,	"engine cycle", 1, 0, 0, 1000, 0
 	rpmHardLimit					= scalar, S32,	420,	"rpm", 1, 0, 0, 20000.0, 2
@@ -125,7 +125,7 @@ page = 1
 	tpsAdcChannel				 = bits, U32, 524, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 ;skipping overrideCrankingIgnition offset 528
 	sensorChartFrequency			= scalar, S32,	532,	"index", 1, 0, 0, 300, 0 ; size 4
-	trigger_type				 = bits, U32, 536, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+	trigger_type				 = bits, U32, 536, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	trigger_customIsSynchronizationNeeded= bits,    U32,   	540, [0:0], "false", "true"
 	trigger_customNeedSecondTriggerInput= bits,    U32,   	540, [1:1], "false", "true"
 	trigger_useOnlyFirstChannel= bits,    U32,   	540, [2:2], "false", "true"
diff --git a/hardware/CJ125_board/O2_input_CJ125.pro b/hardware/CJ125_board/O2_input_CJ125.pro
index 1f1af01b76..06febda0ee 100644
--- a/hardware/CJ125_board/O2_input_CJ125.pro
+++ b/hardware/CJ125_board/O2_input_CJ125.pro
@@ -1,50 +1,11 @@
-update=12/09/2015 10:15:34
+update=12/09/2015 14:46:15
 version=1
-last_client=kicad
+last_client=eeschema
 [cvpcb]
 version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[eeschema]
-version=1
-LibDir=
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
 [pcbnew]
 version=1
 LastNetListRead=
@@ -84,3 +45,43 @@ LibName15=pga_sockets
 LibName16=valves
 [general]
 version=1
+[eeschema]
+version=1
+LibDir=
+NetFmtName=
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=special
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=C:/stuff/rusefi_sourceforge/hardware/rusefi_lib/cj125
diff --git a/hardware/CJ125_board/O2_input_CJ125.sch b/hardware/CJ125_board/O2_input_CJ125.sch
index 19ccfb387e..54c974156d 100644
--- a/hardware/CJ125_board/O2_input_CJ125.sch
+++ b/hardware/CJ125_board/O2_input_CJ125.sch
@@ -1,6 +1,8 @@
-EESchema Schematic File Version 2  date 2/26/2012 7:38:24 PM
+EESchema Schematic File Version 2
+LIBS:cj125
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
 LIBS:linear
 LIBS:regul
@@ -11,9 +13,11 @@ LIBS:memory
 LIBS:xilinx
 LIBS:special
 LIBS:microcontrollers
+LIBS:dsp
 LIBS:microchip
 LIBS:analog_switches
 LIBS:motorola
+LIBS:texas
 LIBS:intel
 LIBS:audio
 LIBS:interface
@@ -22,14 +26,15 @@ LIBS:philips
 LIBS:display
 LIBS:cypress
 LIBS:siliconi
+LIBS:opto
+LIBS:atmel
 LIBS:contrib
-LIBS:project_specific_libs
-LIBS:o5e-cache
-EELAYER 25  0
+LIBS:valves
+EELAYER 27 0
 EELAYER END
 $Descr User 11000 8500
 encoding utf-8
-Sheet 11 12
+Sheet 1 1
 Title "Open5xxxECU"
 Date "27 feb 2012"
 Rev "A-spinout-3"
@@ -336,6 +341,7 @@ P 8375 2675
 F 0 "C1211" V 8400 2850 50  0000 L CNN
 F 1 "0.1uF" V 8400 2500 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8375 2675 60  0001 C CNN
 F 4 "AVX,08055C104KAT2A" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,27C8438" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -356,6 +362,7 @@ P 9425 2775
 F 0 "R1223" V 9325 2775 50  0000 C CNN
 F 1 "1k" V 9425 2775 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 9425 2775 60  0001 C CNN
 F 4 "vishay,CRCW08051K00FKTA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,05F1507" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -374,6 +381,7 @@ P 8550 2875
 F 0 "R1219" V 8500 2575 50  0000 C CNN
 F 1 "100k" V 8550 2875 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8550 2875 60  0001 C CNN
 F 4 "vishay,CRCW0805100KFKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,52K9808" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -392,6 +400,7 @@ P 9750 3050
 F 0 "C1215" H 9825 3150 50  0000 L CNN
 F 1 "0.01uF" H 9450 3150 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 9750 3050 60  0001 C CNN
 F 4 "avx,08055C103JAT2A " V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,96M1408" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -410,6 +419,7 @@ P 7100 2175
 F 0 "C1209" V 7025 2375 50  0000 L CNN
 F 1 ".033uF" V 7025 1975 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 7100 2175 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -426,6 +436,7 @@ P 6300 3775
 F 0 "R1211" V 6400 3775 50  0000 C CNN
 F 1 "1k" V 6300 3775 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6300 3775 60  0001 C CNN
 F 4 "vishay,CRCW08051K00FKTA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,05F1507" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -443,6 +454,8 @@ U 1 1 4E39E9CD
 P 7650 2125
 F 0 "#PWR0156" H 7650 2125 30  0001 C CNN
 F 1 "GND" H 7650 2055 30  0001 C CNN
+F 2 "" H 7650 2125 60  0001 C CNN
+F 3 "" H 7650 2125 60  0001 C CNN
 	1    7650 2125
 	-1   0    0    1   
 $EndComp
@@ -453,6 +466,7 @@ P 6250 2675
 F 0 "R1205" V 6200 2975 50  0000 C CNN
 F 1 "61.9" V 6250 2675 50  0000 C CNN
 F 2 "SM0805" V 6430 2775 60  0001 C CNN
+F 3 "" H 6250 2675 60  0001 C CNN
 F 4 "vishay,CRCW080561R9FKEA" V 2430 4325 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0407" V 2430 4325 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2430 4325 60  0001 C CNN "Field3"
@@ -471,6 +485,7 @@ P 6250 2875
 F 0 "R1206" V 6300 2575 50  0000 C CNN
 F 1 "10k" V 6250 2875 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6250 2875 60  0001 C CNN
 F 4 "BOURNS,CR0805-FX-1002ELF" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,02J2368" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -489,6 +504,7 @@ P 6000 3975
 F 0 "C1203" H 6100 3875 50  0000 L CNN
 F 1 ".033uF" H 5800 3875 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6000 3975 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -504,6 +520,8 @@ U 1 1 4E39E9C9
 P 9750 3300
 F 0 "#PWR0157" H 9750 3300 30  0001 C CNN
 F 1 "GND" H 9750 3230 30  0001 C CNN
+F 2 "" H 9750 3300 60  0001 C CNN
+F 3 "" H 9750 3300 60  0001 C CNN
 	1    9750 3300
 	1    0    0    -1  
 $EndComp
@@ -514,6 +532,7 @@ P 8000 2575
 F 0 "R1217" V 7900 2550 50  0000 C CNN
 F 1 "100k" V 8000 2575 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8000 2575 60  0001 C CNN
 F 4 "vishay,CRCW0805100KFKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,52K9808" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -532,6 +551,7 @@ P 4950 3375
 F 0 "C1201" H 5025 3275 50  0000 L CNN
 F 1 "1000pF" H 4625 3275 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 4950 3375 60  0001 C CNN
 F 4 "avx,08052C102KAT2A " V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "mouser,581-08052C102K" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -550,6 +570,7 @@ P 6250 3075
 F 0 "R1207" V 6300 3375 50  0000 C CNN
 F 1 "6.8k" V 6250 3075 50  0000 C CNN
 F 2 "SM0805" V 6430 3175 60  0001 C CNN
+F 3 "" H 6250 3075 60  0001 C CNN
 F 4 "vishay,CRCW08056K80FKEA" V 2430 4725 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0372" V 2430 4725 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2430 4725 60  0001 C CNN "Field3"
@@ -568,6 +589,7 @@ P 6400 2375
 F 0 "C1207" H 6150 2475 50  0000 L CNN
 F 1 "220pf" H 6150 2275 50  0000 L CNN
 F 2 "SM0805" V 3480 3475 60  0001 C CNN
+F 3 "" H 6400 2375 60  0001 C CNN
 F 4 "avx,08051A221JAT2A" V 3480 3475 60  0001 C CNN "mfg,#"
 F 5 "newark,96K4770" V 3480 3475 60  0001 C CNN "vend,#"
 F 6 "-,-" V 3480 3475 60  0001 C CNN "Field3"
@@ -585,6 +607,8 @@ U 1 1 4E39E9C4
 P 6400 2125
 F 0 "#PWR0158" H 6400 2125 30  0001 C CNN
 F 1 "GND" H 6400 2055 30  0001 C CNN
+F 2 "" H 6400 2125 60  0001 C CNN
+F 3 "" H 6400 2125 60  0001 C CNN
 	1    6400 2125
 	-1   0    0    1   
 $EndComp
@@ -595,6 +619,7 @@ P 4500 3175
 F 0 "R1201" V 4600 3175 50  0000 C CNN
 F 1 "10k" V 4500 3175 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 4500 3175 60  0001 C CNN
 F 4 "BOURNS,CR0805-FX-1002ELF" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,02J2368" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -613,6 +638,7 @@ P 6100 3525
 F 0 "C1205" V 6000 3350 50  0000 L CNN
 F 1 "0.1uF" V 6000 3700 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6100 3525 60  0001 C CNN
 F 4 "AVX,08055C104KAT2A" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,27C8438" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -631,6 +657,7 @@ P 6150 3375
 F 0 "R1203" V 6200 3675 50  0000 C CNN
 F 1 "27k" V 6150 3375 50  0000 C CNN
 F 2 "SM0805" V 6330 3475 60  0001 C CNN
+F 3 "" H 6150 3375 60  0001 C CNN
 F 4 "vishay,CRCW080527K0FKEA" V 2330 5025 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0071" V 2330 5025 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2330 5025 60  0001 C CNN "Field3"
@@ -648,6 +675,8 @@ U 1 1 4E39E9C0
 P 4950 3625
 F 0 "#PWR0159" H 4950 3625 30  0001 C CNN
 F 1 "GND" H 4950 3555 30  0001 C CNN
+F 2 "" H 4950 3625 60  0001 C CNN
+F 3 "" H 4950 3625 60  0001 C CNN
 	1    4950 3625
 	1    0    0    -1  
 $EndComp
@@ -657,6 +686,8 @@ U 1 1 4E39E9BF
 P 6000 4225
 F 0 "#PWR0160" H 6000 4225 30  0001 C CNN
 F 1 "GND" H 6000 4155 30  0001 C CNN
+F 2 "" H 6000 4225 60  0001 C CNN
+F 3 "" H 6000 4225 60  0001 C CNN
 	1    6000 4225
 	1    0    0    -1  
 $EndComp
@@ -666,6 +697,8 @@ U 1 1 4E39E9BE
 P 5980 2875
 F 0 "#PWR0161" H 5980 2875 30  0001 C CNN
 F 1 "GND" H 5980 2805 30  0001 C CNN
+F 2 "" H 5980 2875 60  0001 C CNN
+F 3 "" H 5980 2875 60  0001 C CNN
 	1    5980 2875
 	0    1    1    0   
 $EndComp
@@ -678,6 +711,7 @@ P 7075 4375
 F 0 "R1213" V 7175 4350 50  0000 C CNN
 F 1 "82.5" V 7075 4375 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 7075 4375 60  0001 C CNN
 F 4 "vishay,CRCW080582R5FKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,53K0506" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -696,6 +730,7 @@ P 8550 2975
 F 0 "R1220" V 8600 3250 50  0000 C CNN
 F 1 "470k" V 8550 2975 50  0000 C CNN
 F 2 "SM0805" V 8730 3075 60  0001 C CNN
+F 3 "" H 8550 2975 60  0001 C CNN
 F 4 "vishay,CRCW0805470KFKEA" V 4730 4625 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0283" V 4730 4625 60  0001 C CNN "vend,#"
 F 6 "-,-" V 4730 4625 60  0001 C CNN "Field3"
@@ -714,6 +749,7 @@ P 7950 2975
 F 0 "R1215" V 8000 3250 50  0000 C CNN
 F 1 "4.7k" V 7950 2975 50  0000 C CNN
 F 2 "SM0805" V 8130 3075 60  0001 C CNN
+F 3 "" H 7950 2975 60  0001 C CNN
 F 4 "panasonic,ERA6AEB472V" V 4130 4625 60  0001 C CNN "mfg,#"
 F 5 "newark,08N2175" V 4130 4625 60  0001 C CNN "vend,#"
 F 6 "-,-" V 4130 4625 60  0001 C CNN "Field3"
@@ -731,6 +767,8 @@ U 1 1 4E39E9BA
 P 8825 3625
 F 0 "#PWR0162" H 8825 3625 30  0001 C CNN
 F 1 "GND" H 8825 3555 30  0001 C CNN
+F 2 "" H 8825 3625 60  0001 C CNN
+F 3 "" H 8825 3625 60  0001 C CNN
 	1    8825 3625
 	1    0    0    -1  
 $EndComp
@@ -741,6 +779,7 @@ P 8825 3375
 F 0 "C1213" H 8550 3275 50  0000 L CNN
 F 1 ".033uF" H 8625 3475 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8825 3375 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -764,6 +803,8 @@ U 1 1 4E39E9B8
 P 8675 2575
 F 0 "#PWR0163" H 8675 2575 30  0001 C CNN
 F 1 "GND" H 8675 2505 30  0001 C CNN
+F 2 "" H 8675 2575 60  0001 C CNN
+F 3 "" H 8675 2575 60  0001 C CNN
 	1    8675 2575
 	0    -1   -1   0   
 $EndComp
@@ -782,6 +823,7 @@ P 7100 3025
 F 0 "U1201" H 6950 3675 70  0000 C CNN
 F 1 "CJ125" H 7000 2325 70  0000 C CNN
 F 2 "SOIC24" H 7100 3025 60  0001 C CNN
+F 3 "" H 7100 3025 60  0001 C CNN
 F 4 "bosh,cj125" V 5655 4475 60  0001 C CNN "mfg,#"
 F 5 "future,8746778" V 5655 4475 60  0001 C CNN "vend,#"
 F 6 "-,-" V 5655 4475 60  0001 C CNN "Field3"
@@ -842,6 +884,7 @@ P 7100 5625
 F 0 "U1202" H 6950 6275 70  0000 C CNN
 F 1 "CJ125" H 7000 4925 70  0000 C CNN
 F 2 "SOIC24" H 7100 5625 60  0001 C CNN
+F 3 "" H 7100 5625 60  0001 C CNN
 F 4 "bosh,cj125" V 5655 7075 60  0001 C CNN "mfg,#"
 F 5 "future,8746778" V 5655 7075 60  0001 C CNN "vend,#"
 F 6 "-,-" V 5655 7075 60  0001 C CNN "Field3"
@@ -867,6 +910,8 @@ U 1 1 4C09CD98
 P 8675 5175
 F 0 "#PWR0164" H 8675 5175 30  0001 C CNN
 F 1 "GND" H 8675 5105 30  0001 C CNN
+F 2 "" H 8675 5175 60  0001 C CNN
+F 3 "" H 8675 5175 60  0001 C CNN
 	1    8675 5175
 	0    -1   -1   0   
 $EndComp
@@ -885,6 +930,7 @@ P 8825 5975
 F 0 "C1214" H 8575 5875 50  0000 L CNN
 F 1 ".033uF" H 8550 6075 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8825 5975 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -900,6 +946,8 @@ U 1 1 4C09CCDD
 P 8825 6225
 F 0 "#PWR0165" H 8825 6225 30  0001 C CNN
 F 1 "GND" H 8825 6155 30  0001 C CNN
+F 2 "" H 8825 6225 60  0001 C CNN
+F 3 "" H 8825 6225 60  0001 C CNN
 	1    8825 6225
 	1    0    0    -1  
 $EndComp
@@ -910,6 +958,7 @@ P 7950 5575
 F 0 "R1216" V 8000 5800 50  0000 C CNN
 F 1 "4.7k" V 7950 5575 50  0000 C CNN
 F 2 "SM0805" V 8130 5675 60  0001 C CNN
+F 3 "" H 7950 5575 60  0001 C CNN
 F 4 "panasonic,ERA6AEB472V" V 4130 7225 60  0001 C CNN "mfg,#"
 F 5 "newark,08N2175" V 4130 7225 60  0001 C CNN "vend,#"
 F 6 "-,-" V 4130 7225 60  0001 C CNN "Field3"
@@ -928,6 +977,7 @@ P 8550 5575
 F 0 "R1222" V 8600 5850 50  0000 C CNN
 F 1 "470k" V 8550 5575 50  0000 C CNN
 F 2 "SM0805" V 8730 5675 60  0001 C CNN
+F 3 "" H 8550 5575 60  0001 C CNN
 F 4 "vishay,CRCW0805470KFKEA" V 4730 7225 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0283" V 4730 7225 60  0001 C CNN "vend,#"
 F 6 "-,-" V 4730 7225 60  0001 C CNN "Field3"
@@ -946,6 +996,7 @@ P 7075 6975
 F 0 "R1214" V 7175 6950 50  0000 C CNN
 F 1 "82.5" V 7075 6975 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 7075 6975 60  0001 C CNN
 F 4 "vishay,CRCW080582R5FKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,53K0506" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -967,6 +1018,8 @@ U 1 1 4C09C98A
 P 5975 5475
 F 0 "#PWR0166" H 5975 5475 30  0001 C CNN
 F 1 "GND" H 5975 5405 30  0001 C CNN
+F 2 "" H 5975 5475 60  0001 C CNN
+F 3 "" H 5975 5475 60  0001 C CNN
 	1    5975 5475
 	0    1    1    0   
 $EndComp
@@ -976,6 +1029,8 @@ U 1 1 4C09C8AC
 P 6000 6825
 F 0 "#PWR0167" H 6000 6825 30  0001 C CNN
 F 1 "GND" H 6000 6755 30  0001 C CNN
+F 2 "" H 6000 6825 60  0001 C CNN
+F 3 "" H 6000 6825 60  0001 C CNN
 	1    6000 6825
 	1    0    0    -1  
 $EndComp
@@ -985,6 +1040,8 @@ U 1 1 4C09C872
 P 4950 6225
 F 0 "#PWR0168" H 4950 6225 30  0001 C CNN
 F 1 "GND" H 4950 6155 30  0001 C CNN
+F 2 "" H 4950 6225 60  0001 C CNN
+F 3 "" H 4950 6225 60  0001 C CNN
 	1    4950 6225
 	1    0    0    -1  
 $EndComp
@@ -995,6 +1052,7 @@ P 6150 5975
 F 0 "R1204" V 6200 6275 50  0000 C CNN
 F 1 "27k" V 6150 5975 50  0000 C CNN
 F 2 "SM0805" V 6330 6075 60  0001 C CNN
+F 3 "" H 6150 5975 60  0001 C CNN
 F 4 "vishay,CRCW080527K0FKEA" V 2330 7625 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0071" V 2330 7625 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2330 7625 60  0001 C CNN "Field3"
@@ -1013,6 +1071,7 @@ P 6100 6125
 F 0 "C1206" V 6000 5950 50  0000 L CNN
 F 1 "0.1uF" V 6000 6300 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6100 6125 60  0001 C CNN
 F 4 "AVX,08055C104KAT2A" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,27C8438" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1031,6 +1090,7 @@ P 4500 5775
 F 0 "R1202" V 4600 5775 50  0000 C CNN
 F 1 "10k" V 4500 5775 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 4500 5775 60  0001 C CNN
 F 4 "BOURNS,CR0805-FX-1002ELF" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,02J2368" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1048,6 +1108,8 @@ U 1 1 4C09C7B0
 P 6400 4725
 F 0 "#PWR0169" H 6400 4725 30  0001 C CNN
 F 1 "GND" H 6400 4655 30  0001 C CNN
+F 2 "" H 6400 4725 60  0001 C CNN
+F 3 "" H 6400 4725 60  0001 C CNN
 	1    6400 4725
 	-1   0    0    1   
 $EndComp
@@ -1058,6 +1120,7 @@ P 6400 4975
 F 0 "C1208" H 6150 5050 50  0000 L CNN
 F 1 "220pf" H 6150 4875 50  0000 L CNN
 F 2 "SM0805" V 3480 6075 60  0001 C CNN
+F 3 "" H 6400 4975 60  0001 C CNN
 F 4 "avx,08051A221JAT2A" V 3480 6075 60  0001 C CNN "mfg,#"
 F 5 "newark,96K4770" V 3480 6075 60  0001 C CNN "vend,#"
 F 6 "-,-" V 3480 6075 60  0001 C CNN "Field3"
@@ -1076,6 +1139,7 @@ P 6250 5675
 F 0 "R1210" V 6300 5975 50  0000 C CNN
 F 1 "6.8k" V 6250 5675 50  0000 C CNN
 F 2 "SM0805" V 6430 5775 60  0001 C CNN
+F 3 "" H 6250 5675 60  0001 C CNN
 F 4 "vishay,CRCW08056K80FKEA" V 2430 7325 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0372" V 2430 7325 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2430 7325 60  0001 C CNN "Field3"
@@ -1094,6 +1158,7 @@ P 4950 5975
 F 0 "C1202" H 4950 6100 50  0000 L CNN
 F 1 "1000pF" H 4650 5875 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 4950 5975 60  0001 C CNN
 F 4 "avx,08052C102KAT2A " V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "mouser,581-08052C102K" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1112,6 +1177,7 @@ P 8000 5175
 F 0 "R1218" V 7900 5150 50  0000 C CNN
 F 1 "100k" V 8000 5175 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8000 5175 60  0001 C CNN
 F 4 "vishay,CRCW0805100KFKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,52K9808" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1129,6 +1195,8 @@ U 1 1 4BF65418
 P 9775 5900
 F 0 "#PWR0170" H 9775 5900 30  0001 C CNN
 F 1 "GND" H 9775 5830 30  0001 C CNN
+F 2 "" H 9775 5900 60  0001 C CNN
+F 3 "" H 9775 5900 60  0001 C CNN
 	1    9775 5900
 	1    0    0    -1  
 $EndComp
@@ -1139,6 +1207,7 @@ P 6000 6575
 F 0 "C1204" H 6100 6475 50  0000 L CNN
 F 1 ".033uF" H 5725 6475 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6000 6575 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -1155,6 +1224,7 @@ P 6250 5475
 F 0 "R1209" V 6300 5175 50  0000 C CNN
 F 1 "10k" V 6250 5475 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6250 5475 60  0001 C CNN
 F 4 "BOURNS,CR0805-FX-1002ELF" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,02J2368" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1173,6 +1243,7 @@ P 6250 5275
 F 0 "R1208" V 6200 5575 50  0000 C CNN
 F 1 "61.9" V 6250 5275 50  0000 C CNN
 F 2 "SM0805" V 6430 5375 60  0001 C CNN
+F 3 "" H 6250 5275 60  0001 C CNN
 F 4 "vishay,CRCW080561R9FKEA" V 2430 6925 60  0001 C CNN "mfg,#"
 F 5 "newark,53K0407" V 2430 6925 60  0001 C CNN "vend,#"
 F 6 "-,-" V 2430 6925 60  0001 C CNN "Field3"
@@ -1190,6 +1261,8 @@ U 1 1 4BF650D1
 P 7650 4725
 F 0 "#PWR0171" H 7650 4725 30  0001 C CNN
 F 1 "GND" H 7650 4655 30  0001 C CNN
+F 2 "" H 7650 4725 60  0001 C CNN
+F 3 "" H 7650 4725 60  0001 C CNN
 	1    7650 4725
 	-1   0    0    1   
 $EndComp
@@ -1200,6 +1273,7 @@ P 6300 6375
 F 0 "R1212" V 6400 6375 50  0000 C CNN
 F 1 "1k" V 6300 6375 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 6300 6375 60  0001 C CNN
 F 4 "vishay,CRCW08051K00FKTA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,05F1507" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1220,6 +1294,7 @@ P 7100 4775
 F 0 "C1210" V 7025 4975 50  0000 L CNN
 F 1 ".033uF" V 7025 4575 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 7100 4775 60  0001 C CNN
 F 4 "yageo,CC0805KRX7R8BB333" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,69C9599" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "25V" V 1130 2600 60  0001 C CNN "V"
@@ -1236,6 +1311,7 @@ P 9775 5650
 F 0 "C1216" H 9850 5750 50  0000 L CNN
 F 1 "0.01uF" H 9500 5750 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 9775 5650 60  0001 C CNN
 F 4 "avx,08055C103JAT2A " V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,96M1408" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1254,6 +1330,7 @@ P 8550 5475
 F 0 "R1221" V 8500 5200 50  0000 C CNN
 F 1 "100k" V 8550 5475 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8550 5475 60  0001 C CNN
 F 4 "vishay,CRCW0805100KFKEA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,52K9808" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1272,6 +1349,7 @@ P 9450 5375
 F 0 "R1224" V 9350 5375 50  0000 C CNN
 F 1 "1k" V 9450 5375 50  0000 C CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 9450 5375 60  0001 C CNN
 F 4 "vishay,CRCW08051K00FKTA" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,05F1507" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
@@ -1292,6 +1370,7 @@ P 8375 5275
 F 0 "C1212" V 8400 5450 50  0000 L CNN
 F 1 "0.1uF" V 8400 5125 50  0000 L CNN
 F 2 "SM0805" V 1130 2600 60  0001 C CNN
+F 3 "" H 8375 5275 60  0001 C CNN
 F 4 "AVX,08055C104KAT2A" V 1130 2600 60  0001 C CNN "mfg,mfg#"
 F 5 "newark,27C8438" V 1130 2600 60  0001 C CNN "vend1,vend1#"
 F 6 "" V 1130 2600 60  0001 C CNN "Field6"
diff --git a/hardware/rusefi_lib/cj125.lib b/hardware/rusefi_lib/cj125.lib
new file mode 100644
index 0000000000..30087a9b38
--- /dev/null
+++ b/hardware/rusefi_lib/cj125.lib
@@ -0,0 +1,64 @@
+EESchema-LIBRARY Version 2.3  Date: 12.09.2015 21:32:13
+#encoding utf-8
+#
+# CJ125
+#
+DEF CJ125 U? 0 40 Y Y 1 F N
+F0 "U?" -150 650 70 H V C CNN
+F1 "CJ125" -100 -700 70 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+S 250 600 -250 -600 0 1 0 N
+X UB 1 -550 550 300 R 60 60 1 1 P
+X UN 2 -550 450 300 R 60 60 1 1 P
+X IP 3 -550 350 300 R 60 60 1 1 P
+X IA 4 -550 250 300 R 60 60 1 1 P
+X OSZ 5 -550 150 300 R 60 60 1 1 P
+X DIAHG 6 -550 50 300 R 60 60 1 1 P
+X DIAHD 7 -550 -50 300 R 60 60 1 1 P
+X RST 8 -550 -150 300 R 60 60 1 1 P I
+X RS 9 -550 -250 300 R 60 60 1 1 P
+X RM 10 -550 -350 300 R 60 60 1 1 P
+X UP 20 550 150 300 L 60 60 1 1 P
+X CM 11 -550 -450 300 R 60 60 1 1 P
+X UA 21 550 250 300 L 60 60 1 1 P
+X UR 12 -550 -550 300 R 60 60 1 1 P
+X CF 22 550 350 300 L 60 60 1 1 P
+X SCLK 13 550 -550 300 L 60 60 1 1 P
+X RF 23 550 450 300 L 60 60 1 1 P
+X SD 14 550 -450 300 L 60 60 1 1 P
+X GND 24 550 550 300 L 60 60 1 1 P
+X SI 15 550 -350 300 L 60 60 1 1 P
+X SS 16 550 -250 300 L 60 60 1 1 P
+X VCC 17 550 -150 300 L 60 60 1 1 P
+X VM 18 550 -50 300 L 60 60 1 1 P
+X US 19 550 50 300 L 60 60 1 1 P
+X UB 1 -800 550 300 R 60 60 1 2 P
+X UN 2 -800 450 300 R 60 60 1 2 P
+X IP 3 -800 350 300 R 60 60 1 2 P
+X IA 4 -800 250 300 R 60 60 1 2 P
+X OSZ 5 -800 150 300 R 60 60 1 2 P
+X DIAHG 6 -800 50 300 R 60 60 1 2 P
+X DIAHD 7 -800 -50 300 R 60 60 1 2 P
+X RST 8 -800 -150 300 R 60 60 1 2 P I
+X RS 9 -800 -250 300 R 60 60 1 2 P
+X RM 10 -800 -350 300 R 60 60 1 2 P
+X UP 20 800 150 300 L 60 60 1 2 P
+X CM 11 -800 -450 300 R 60 60 1 2 P
+X UA 21 800 250 300 L 60 60 1 2 P
+X UR 12 -800 -550 300 R 60 60 1 2 P
+X CF 22 800 350 300 L 60 60 1 2 P
+X SCLK 13 800 -550 300 L 60 60 1 2 P
+X RF 23 800 450 300 L 60 60 1 2 P
+X SD 14 800 -450 300 L 60 60 1 2 P
+X GND 24 800 550 300 L 60 60 1 2 P
+X SI 15 800 -350 300 L 60 60 1 2 P
+X SS 16 800 -250 300 L 60 60 1 2 P
+X VCC 17 800 -150 300 L 60 60 1 2 P
+X VM 18 800 -50 300 L 60 60 1 2 P
+X US 19 800 50 300 L 60 60 1 2 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp
index d39562ae27..54e28a6696 100644
--- a/unit_tests/test_trigger_decoder.cpp
+++ b/unit_tests/test_trigger_decoder.cpp
@@ -460,7 +460,7 @@ void testTriggerDecoder(void) {
 	testTriggerDecoder2("sachs", SACHS, 0, 0.4800, 0.000);
 
 	printTriggerDebug = true;
-//	testTriggerDecoder3("36+2+2+2", DODGE_STRATUS, 0, 0.8833, 0.0, CHRYSLER_NGC6_GAP);
+	testTriggerDecoder3("36+2+2+2", DAIHATSU,  28, 0.5000, 0.0, 0.5);
 	testTriggerDecoder3("stratus NGC6", DODGE_STRATUS, 0, 0.8833, 0.0, CHRYSLER_NGC6_GAP);
 
 	testTriggerDecoder2("vw ABA", VW_ABA, 114, 0.5000, 0.0);