version ccu4_83

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();
 }
-

config.ino

@@ -831,5 +831,3 @@ void ConfigSpecial(EeMode mode) {
 
   }
 }
-
-

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);
-

dipdisplay.ino

@@ -880,4 +880,3 @@ void DispDebug(boolean on) {
   disp.commdebug = on;
   SerialD.commdebug = on;
 }
-

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) {
     */
   }
 }
-
-
-
-
-

instr.ino

@@ -136,5 +136,3 @@ void InstrCmd(byte cmd) {
     instrState = instr_idle;
   }
 }
-
-

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;
-

motor.ino

@@ -597,4 +597,3 @@ void FlowStateDisp() {
   }
   DispTextRow(fmt_lsmall, "n.v. ", text);
 }
-

n2.ino

@@ -278,5 +278,3 @@ void N2StateDisp(const char *title) {
   }
   DispTextRow(fmt_lsmall, title, text);
 }
-
-

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)
-

par.ino

@@ -377,4 +377,3 @@ byte ParText_(byte nr, name_t name, char *ptr, byte siz, boolean update) {
   }
   return result;
 }
-

parser.h

@@ -1,3 +1 @@
 typedef enum {parser_none, parser_ident, parser_value, parser_symbol, parser_error} ParserType;
-
-

parser.ino

@@ -129,4 +129,3 @@ char *ParserText() {
 char ParserSymbol() {
   return parser.symbol;
 }
-

ramtest.ino

@@ -60,5 +60,3 @@ void RamTest() {
   }
   Serial.println();
 }
-
-

utils.ino

@@ -334,5 +334,3 @@ long text2fix(const char *str, byte dig, byte *len) {
   if (neg) res = -res;
   return res;
 }
-
-

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
-