From d371657ab37056de64eb7199a3fef8c7af53ae4e Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Mon, 11 Sep 2023 18:04:36 +0200
Subject: [PATCH] version ccu4_83

---
 ccu4_82.ino => ccu4_83.ino |  3 +--
 config.ino                 |  2 --
 dipdisplay.h               |  1 -
 dipdisplay.ino             |  1 -
 he.ino                     | 12 ++++++------
 instr.ino                  |  2 --
 motor.h                    |  1 -
 motor.ino                  |  1 -
 n2.ino                     |  2 --
 par.h                      |  1 -
 par.ino                    |  1 -
 parser.h                   |  2 --
 parser.ino                 |  1 -
 ramtest.ino                |  2 --
 utils.ino                  |  2 --
 valve.h                    |  1 -
 16 files changed, 7 insertions(+), 28 deletions(-)
 rename ccu4_82.ino => ccu4_83.ino (99%)

diff --git a/ccu4_82.ino b/ccu4_83.ino
similarity index 99%
rename from ccu4_82.ino
rename to ccu4_83.ino
index 8156238..eae1f0f 100644
--- a/ccu4_82.ino
+++ b/ccu4_83.ino
@@ -11,7 +11,7 @@
 // define SERIALCOMMON 1 for testing the serial connection over usb
 #define SERIALCOMMON 0
 
-PAR_TEXT configSoft[16] = "8.2";
+PAR_TEXT configSoft[16] = "8.3";
 
 long now; // global variable, updated by FastHandler
 byte inside;
@@ -590,4 +590,3 @@ void loop() {
   ParHandler();
   if (displayAvailable) DisplayHandler();
 }
-
diff --git a/config.ino b/config.ino
index e5cb31c..70db025 100644
--- a/config.ino
+++ b/config.ino
@@ -831,5 +831,3 @@ void ConfigSpecial(EeMode mode) {
 
   }
 }
-
-
diff --git a/dipdisplay.h b/dipdisplay.h
index e9fb3ff..80f57fa 100644
--- a/dipdisplay.h
+++ b/dipdisplay.h
@@ -2,4 +2,3 @@ enum {fmt_none, fmt_lsmall, fmt_rsmall, fmt_medium, fmt_large, fmt_big};
 enum {disp_no = 0, disp_yes=1, disp_once = 2}; // value for showState
 
 uint8_t DispInit(void (*handler)(), uint8_t homescreen);
-
diff --git a/dipdisplay.ino b/dipdisplay.ino
index c3aa3e7..71af40e 100644
--- a/dipdisplay.ino
+++ b/dipdisplay.ino
@@ -880,4 +880,3 @@ void DispDebug(boolean on) {
   disp.commdebug = on;
   SerialD.commdebug = on;
 }
-
diff --git a/he.ino b/he.ino
index 0807eb0..7f9b3a5 100644
--- a/he.ino
+++ b/he.ino
@@ -564,6 +564,11 @@ void HeHandler() {
       sump += aRead(a_levb_vplus);
     }
   } else {
+    if (heAvailable != 1) {  // ext only
+      // should not happen, but may be ...
+      ParSet(heMeas, 2); // check
+      return;
+    }
     for (i = 0 ; i < 20; i++) {
       sump += aRead(a_lev_vplus);
       summ += aRead(a_lev_vminus);
@@ -661,7 +666,7 @@ void HeHandler() {
     HeEndMeas();
     return;
   }
-  if (HEDEBUG) { Serial.print(" stab"); Serial.print(stab, DEC); }
+  if (HEDEBUG) { if (stab) {Serial.print(" stab"); Serial.print(stab, DEC);} else {Serial.print("~");} }
   if (stab < 8) return; // not yet finished
   heIntState = he_sens_ok;
   
@@ -905,8 +910,3 @@ void HeConfig(byte avail, byte cur, int wires, int empty, int full) {
     */
   }
 }
-
-
-
-
-
diff --git a/instr.ino b/instr.ino
index d51212f..1d464dd 100644
--- a/instr.ino
+++ b/instr.ino
@@ -136,5 +136,3 @@ void InstrCmd(byte cmd) {
     instrState = instr_idle;
   }
 }
-
-
diff --git a/motor.h b/motor.h
index 431fb30..4ab76f9 100644
--- a/motor.h
+++ b/motor.h
@@ -1,4 +1,3 @@
 typedef enum {zero_current, std_current, freeOpen_current, freeClose_current} MotorCurrentType;
 
 typedef enum {pulse_off, pulse_check0, pulse_check, pulse_before, pulse_running, pulse_after} MotorState;
-
diff --git a/motor.ino b/motor.ino
index ab905f3..91b510f 100644
--- a/motor.ino
+++ b/motor.ino
@@ -597,4 +597,3 @@ void FlowStateDisp() {
   }
   DispTextRow(fmt_lsmall, "n.v. ", text);
 }
-
diff --git a/n2.ino b/n2.ino
index 6010708..e037a21 100644
--- a/n2.ino
+++ b/n2.ino
@@ -278,5 +278,3 @@ void N2StateDisp(const char *title) {
   }
   DispTextRow(fmt_lsmall, title, text);
 }
-
-
diff --git a/par.h b/par.h
index c1f888f..5e5428c 100644
--- a/par.h
+++ b/par.h
@@ -68,4 +68,3 @@ typedef struct {
 #define ParSet(variable, value) ParSet_(p_##variable, (void *)&variable, sizeof variable, value)
 #define ParArraySet(variable, index, value) ParSet_(p_##variable + index, (void *)(variable + index), sizeof (*variable), value)
 //#define ParNrSet(nr, variable, value) ParSet_(nr, (void *)&(variable), sizeof variable, value)
-
diff --git a/par.ino b/par.ino
index 9754624..a15f650 100644
--- a/par.ino
+++ b/par.ino
@@ -377,4 +377,3 @@ byte ParText_(byte nr, name_t name, char *ptr, byte siz, boolean update) {
   }
   return result;
 }
-
diff --git a/parser.h b/parser.h
index 10e7994..071ed00 100644
--- a/parser.h
+++ b/parser.h
@@ -1,3 +1 @@
 typedef enum {parser_none, parser_ident, parser_value, parser_symbol, parser_error} ParserType;
-
-
diff --git a/parser.ino b/parser.ino
index a5b1e83..4be4cba 100644
--- a/parser.ino
+++ b/parser.ino
@@ -129,4 +129,3 @@ char *ParserText() {
 char ParserSymbol() {
   return parser.symbol;
 }
-
diff --git a/ramtest.ino b/ramtest.ino
index 8e6890c..689473c 100644
--- a/ramtest.ino
+++ b/ramtest.ino
@@ -60,5 +60,3 @@ void RamTest() {
   }
   Serial.println();
 }
-
-
diff --git a/utils.ino b/utils.ino
index 1f88733..6fe9886 100644
--- a/utils.ino
+++ b/utils.ino
@@ -334,5 +334,3 @@ long text2fix(const char *str, byte dig, byte *len) {
   if (neg) res = -res;
   return res;
 }
-
-
diff --git a/valve.h b/valve.h
index 6f3e3d9..928d994 100644
--- a/valve.h
+++ b/valve.h
@@ -4,4 +4,3 @@
 #define valve_text F("fill valve off|~filling|no fill valve|timeout|timeout1|boost")
 enum {valve_off, valve_on, no_valve, valve_timeout, valve_timeout1, valve_boost};
 #endif
-