From 5e7d9127db16d714c5d4ee03118ebe04a02b52dc Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Thu, 12 Jan 2017 09:02:19 -0500
Subject: [PATCH] auto-sync

---
 firmware/development/wave_analyzer.cpp | 12 +++++++++---
 firmware/development/wave_analyzer.h   |  4 +++-
 firmware/rusefi.cpp                    |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp
index 59d9759c6c..6abfc4de5e 100644
--- a/firmware/development/wave_analyzer.cpp
+++ b/firmware/development/wave_analyzer.cpp
@@ -57,7 +57,7 @@ static void ensureInitialized(WaveReader *reader) {
 
 static void waAnaWidthCallback(WaveReader *reader) {
 	efitick_t nowUs = getTimeNowUs();
-	reader->eventCounter++;
+	reader->riseEventCounter++;
 	reader->lastActivityTimeUs = nowUs;
 	addEngineSniffferEvent(reader->name, WC_UP);
 
@@ -70,7 +70,7 @@ static void waAnaWidthCallback(WaveReader *reader) {
 
 void WaveReader::onFallEvent() {
 	efitick_t nowUs = getTimeNowUs();
-	eventCounter++;
+	fallEventCounter++;
 	lastActivityTimeUs = nowUs;
 	addEngineSniffferEvent(name, WC_DOWN);
 
@@ -140,7 +140,7 @@ WaveReader::WaveReader() {
 	hw = NULL;
 	last_wave_high_widthUs = 0;
 	name = NULL;
-	eventCounter = 0;
+	fallEventCounter = riseEventCounter = 0;
 	currentRevolutionCounter = 0;
 	prevTotalOnTimeUs = 0;
 	totalOnTimeAccumulatorUs = 0;
@@ -254,6 +254,10 @@ void printWave(Logging *logging) {
 	reportWave(logging, 1);
 }
 
+void showWaveInfo(void) {
+	scheduleMsg(logger, "logic input #1: %d/%d", readers[0].fallEventCounter, readers[0].riseEventCounter);
+}
+
 void initWaveAnalyzer(Logging *sharedLogger) {
 	logger = sharedLogger;
 	if (hasFirmwareError()) {
@@ -265,6 +269,8 @@ void initWaveAnalyzer(Logging *sharedLogger) {
 
 	addTriggerEventListener(waTriggerEventListener, "wave analyzer", engine);
 
+	addConsoleAction("waveinfo", showWaveInfo);
+
 	addConsoleActionII("set_logic_input_mode", setWaveModeSilent);
 
 	chThdCreateStatic(waThreadStack, sizeof(waThreadStack), NORMALPRIO, (tfunc_t)waThread, NULL);
diff --git a/firmware/development/wave_analyzer.h b/firmware/development/wave_analyzer.h
index c9e8dc1166..57378eec60 100644
--- a/firmware/development/wave_analyzer.h
+++ b/firmware/development/wave_analyzer.h
@@ -30,7 +30,8 @@ public:
 
 	digital_input_s *hw;
 	const char *name;
-	volatile int eventCounter;
+	volatile int fallEventCounter;
+	volatile int riseEventCounter;
 
 	int currentRevolutionCounter;
 
@@ -60,6 +61,7 @@ public:
 
 void initWaveAnalyzer(Logging *sharedLogger);
 void printWave(Logging *logging);
+void showWaveInfo(void);
 
 #endif
 
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index accafb0584..af3fbee748 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -249,5 +249,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 20170111;
+	return 20170112;
 }