From 8ed8b35d77b889c78e2fdf830392f94127980a90 Mon Sep 17 00:00:00 2001
From: hg <devnull@localhost>
Date: Wed, 17 Feb 2016 21:31:26 +0100
Subject: [PATCH] debug code

---
 src/debug.cpp  |  7 +++++++
 src/debug.h    |  1 +
 src/engine.cpp | 38 ++++++++++++++++++++++++--------------
 src/hmi.cpp    | 22 +++++++++++-----------
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/debug.cpp b/src/debug.cpp
index ad8bcc1..a11d113 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -34,3 +34,10 @@ void debugWrite(uint16_t o) {
   DEBUG_OUT_REG |= DEBUG_CS;
 #endif
 }
+
+void debugWrite32(uint32_t o)  {
+	uint16_t d1 = (uint16_t) (o & 0x0000ffff);
+	uint16_t d2 = (uint16_t) ((o & 0xffff0000) >> 16);
+	debugWrite(d1);
+	debugWrite(d2);
+}
diff --git a/src/debug.h b/src/debug.h
index 37101ac..5e98c69 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -22,6 +22,7 @@
 
 void debugInit();
 void debugWrite(uint16_t o);
+void debugWrite32(uint32_t o);
 
 
 #endif /* DEBUG_H_ */
diff --git a/src/engine.cpp b/src/engine.cpp
index 22f58ed..6e707cb 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include "engine.h"
+#include "debug.h"
 
 
 volatile uint32_t tickCnt = 0;
@@ -106,23 +107,11 @@ bool engineDecPwmValue() {
 	return res;
 }
 
-bool engineIncOffTime() {
-	offTime += STEP_100ms;
-	return false;
-}
-
 bool engineIncOnTime() {
 	return false;
 	onTime += STEP_100ms;
-}
-
-bool engineDecOffTime() {
-	bool res = true;
-	if (offTime != 0) {
-		offTime -= STEP_100ms;
-		res = false;
-	}
-	return res;
+	debugWrite(0x0001);
+	debugWrite32(onTime);
 }
 
 bool engineDecOnTime() {
@@ -131,9 +120,30 @@ bool engineDecOnTime() {
 		onTime -= STEP_100ms;
 		res = false;
 	}
+	debugWrite(0x0002);
+	debugWrite32(onTime);
 	return res;
 }
 
+bool engineIncOffTime() {
+	offTime += STEP_100ms;
+	debugWrite(0x0003);
+	debugWrite32(offTime);
+	return false;
+}
+
+bool engineDecOffTime() {
+	bool res = true;
+	if (offTime != 0) {
+		offTime -= STEP_100ms;
+		res = false;
+	}
+	debugWrite(0x0004);
+	debugWrite32(offTime);
+	return res;
+}
+
+
 uint32_t getMillis() {
 	return millis;
 }
diff --git a/src/hmi.cpp b/src/hmi.cpp
index 745c242..e73601c 100644
--- a/src/hmi.cpp
+++ b/src/hmi.cpp
@@ -33,20 +33,20 @@ public:
 			break;
 		case STATE_BUTTON_RELEASED:
 			duration = getMillis() - m_timestamp;
-			{
-				uint16_t d1 = (uint16_t) (duration & 0x0000ffff);
-				uint16_t d2 = (uint16_t) ((duration & 0xffff0000) >> 16);
-				debugWrite(d1);
-				debugWrite(d2);
-			}
+//			{
+//				uint16_t d1 = (uint16_t) (duration & 0x0000ffff);
+//				uint16_t d2 = (uint16_t) ((duration & 0xffff0000) >> 16);
+//				debugWrite(d1);
+//				debugWrite(d2);
+//			}
 			if ((duration >= LOWER_SHORT_TIME) && (duration <= UPPER_SHORT_TIME)) {
-				debugWrite(0x003);
+//				debugWrite(0x003);
 				m_state = STATE_SHORT;
 			} else if (duration > UPPER_SHORT_TIME) {
-				debugWrite(0x004);
+//				debugWrite(0x004);
 				m_state = STATE_LONG;
 			} else {
-				debugWrite(0x005);
+//				debugWrite(0x005);
 				m_state = STATE_IDLE;
 			}
 			break;
@@ -217,11 +217,11 @@ void hmiExec() {
 		while (! ledRed.isIdle()) {
 			ledRed.exec();
 		}
-		ledGreen.start(Led::FLASH_EXTRA_LONG);
+		ledGreen.start(Led::FLASH_LONG);
 		while (! ledGreen.isIdle()) {
 			ledGreen.exec();
 		}
-		ledRed.start(Led::FLASH_EXTRA_LONG);
+		ledRed.start(Led::FLASH_LONG);
 		while (! ledRed.isIdle()) {
 			ledRed.exec();
 		}