Various tweaks for spot heater; version now as deployed in test unit; ready to be mounted. Assumes pin 25/26 to be corrected on the PCB during final install.

Author: dirkx

TelnetSerialStream.cpp

@@ -35,6 +35,7 @@ void TelnetSerialStream::stop() {
   for (int i = 0; i < MAX_SERIAL_TELNET_CLIENTS; i++) {
     if (_serverClients[i]) {
       _serverClients[i].println("Connection closed from remote end");
+      _serverClients[i].flush(); // appears to just flush the input buffer ???
       _serverClients[i].stop();
     }
   }

enclosure.scad

@@ -17,7 +17,17 @@ QUAD7_H_ASSYM=1;
 
 showdev=0;
 studs=0;
-version="v1.04";
+version="v1.05";
+
+// Two sizes possible -- outside dimensions
+//
+box_h= 98; box_w = 68; //  98 x 68 x 48mm
+// box_h=115; box_w = 90; // 115 x 90 x 55mm
+
+box_t=2;        // thickness walls
+box_space=1.5;  // space between the walls; as they are not that straight.
+
+
 /*
    v1.01   white print 15/10/2021 for box with transparant cover.
    v1.02   scanner 1mm lower, whole plate 2mm lower, rfid pillars narrower
@@ -28,6 +38,7 @@ version="v1.04";
    v1.04   Lowered main board by 2mm to prevent shorting 7x4 display 
            pins (Issue #2). Removed unused mid studs. Wider tiewrap
            holes for stud (Issue #3).
+   v1.05   flag for the 'larger' boxes; not yet correct.
 */
 module quad_holes(r=QUAD7_HD/2,h=10,top=1) {
    r2=r; r1=r*top;
@@ -132,8 +143,8 @@ translate([-WR_W/2,-WR_H/2,-WR_T]) {
 };
 
 
-MB_W=61;
-MB_H=91;
+MB_W=box_w-box_t*2-box_space*2;
+MB_H=box_h-box_t*2-box_space*2;
 MB_T=2;
 MB_P=45;
 MB_V=80;
@@ -154,6 +165,7 @@ module mb_pins(r=MB_HH/2,h=MB_T+0.01) {
    };
 };
 
+// Mounting board
 module mb(h=10) {
    difference() {
        union() {
@@ -187,6 +199,7 @@ module mb(h=10) {
            linear_extrude(height = 0.5)
            text("2021-10-15 / paymentnode",halign="center", valign="center",
                 size=2.5, font="Gill Sans:style=Bold");
+
 if (studs == 0) {
    translate([-70,0,0]) {
    difference() {

log.cpp

@@ -68,6 +68,11 @@ static double coreTemp() {
 }
 #endif
 
+void log_stop() {
+  Log.stop();
+  Debug.stop();
+}
+
 void log_loop() {
   static unsigned  long last_report = millis();
   static unsigned long cntr;

log.h

@@ -60,4 +60,5 @@ extern TLog Debug;
 
 void setupLog();
 void log_loop();
+void log_stop();
 #endif

makerspaceleiden-payment-node-7seg.ino

@@ -9,6 +9,13 @@
 //    MFRC522 (https://www.tinytronics.nl/shop/nl/communicatie-en-signalen/draadloos/rfid/rfid-kit-mfrc522-s50-mifare-met-kaart-en-key-tag)
 //    7 segment display ( https://www.hobbyelectronica.nl/product/4-digit-klok-display-module)
 //
+// Heater module
+//  ESP32 Dev Module
+//  MFRC522
+//  7 segment display
+//  NPN transistor, 10k, 1k resistor
+//  25Ampere, 5volt relay
+//
 // Additional Librariries (via Sketch -> library manager):
 //    MFRC522-spi-i2c-uart-async
 //    TM1637TinyDisplay
@@ -45,11 +52,14 @@
 // two wires. See https://www.mcielectronics.cl/website_MCI/static/documents/Datasheet_TM1637.pdf
 // and https://create.arduino.cc/projecthub/ryanchan/tm1637-digit-display-arduino-quick-tutorial-ca8a93
 //
-#define DISPLAY_CLK 25
-#define DISPLAY_DIO 26
+#define DISPLAY_CLK (25)
+#define DISPLAY_DIO (26)
 
 TM1637TinyDisplay display(DISPLAY_CLK, DISPLAY_DIO);
 
+// For the heater
+#define RELAY (12)
+
 // Very ugly global vars - used to communicate between the REST call and the rest.
 //
 char terminalName[64] = TERMINAL_NAME;
@@ -75,6 +85,21 @@ void setupDisplay() {
   Log.println("Display set to " VERSION);
 }
 
+void setupRelay() {
+  // relay is high-active; but there is a 10k
+  // pulldown past the 1k driving resistor to
+  // not let HiZ engage the relay.
+  //
+  digitalWrite(RELAY, 0);
+  pinMode(RELAY, OUTPUT);
+  digitalWrite(RELAY, 0);
+}
+
+
+void heatingOnOff(bool onOff) {
+  digitalWrite(RELAY, onOff ? HIGH : LOW);
+}
+
 void setup()
 {
   const char * p =  (const char*) __FILE__;
@@ -91,6 +116,7 @@ void setup()
   Serial.print("\n\nBuild: " __DATE__ " " __TIME__ "\nUnit: ");
   Serial.println(terminalName);
 
+  setupRelay();
   setupDisplay();
   setupAuth(terminalName);
 
@@ -151,10 +177,13 @@ void setup()
     Log.println("OTA started");
   })
   .onEnd([]() {
+    Log.println("OTA completed");
     // prevent a cleversod uplading a special binary. ignore the hardware/serial angle
     Log.println("OTA completed OK - need to wipe keystore before rebooting into new code.");
     wipekeys();
     display.showString("Done");
+    log_stop();
+    heatingOnOff(false);
   })
   .onProgress([](unsigned int progress, unsigned int total) {
     static int l = -100;
@@ -168,15 +197,18 @@ void setup()
   })
   .onError([](ota_error_t error) {
     const char * label;
-    if (error == OTA_AUTH_ERROR) label = (const char*) "Auth Failed";
-    else if (error == OTA_BEGIN_ERROR) label = (const char*) "Begin Failed";
-    else if (error == OTA_CONNECT_ERROR) label = (const char*) "Connect Failed";
-    else if (error == OTA_RECEIVE_ERROR) label = (const char*) "Receive Failed";
-    else if (error == OTA_END_ERROR) label = (const char*)  "End Failed";
-    else label = "Uknown error";
+    if (error == OTA_AUTH_ERROR) label = (const char*) "FO:AF";
+    else if (error == OTA_BEGIN_ERROR) label = (const char*) "FO:BF";
+    else if (error == OTA_CONNECT_ERROR) label = (const char*) "FO:CF";
+    else if (error == OTA_RECEIVE_ERROR) label = (const char*) "FO:RF";
+    else if (error == OTA_END_ERROR) label = (const char*)  "FO:EF";
+    else label = "FO:OF";
     display.showString(label);
-    Log.print("OTA error");
+    Log.print("OTA error: E=");
+    Log.print(error);
+    Log.print(" - ");
     Log.println(label);
+    delay(10 * 1000);
   });
 
   Debug.println("Starting loop");
@@ -205,10 +237,10 @@ static void loop_RebootAtMidnight() {
   // "Thu Nov  4 09:47:43\n\0" -> 09:47\0
   p += 11;
   p[5] = 0;
-  Debug.printf("strncmp(\"%s\",\"%s\",%d), %ld, %lu\n", p, AUTO_REBOOT_TIME, strlen(AUTO_REBOOT_TIME), now, millis());
 
-  if (strncmp(p, AUTO_REBOOT_TIME, strlen(AUTO_REBOOT_TIME)) == 0 && millis() > 3600 ) {
-    Log.println("Nightly reboot - also to fetch new pricelist and fix any memory eaks.");
+  if (strncmp(p, AUTO_REBOOT_TIME, strlen(AUTO_REBOOT_TIME)) == 0 && millis() > 3600 * 1000 ) {
+    Log.println("Nightly reboot - also to fetch new pricelist and fix any memory leaks.");
+    heatingOnOff(false);
     ESP.restart();
   }
 #endif
@@ -265,6 +297,16 @@ void loop()
   ArduinoOTA.handle();
   loop_RebootAtMidnight();
 
+  // flap relay every 5 seconds for testing.
+  //
+  if (0) {
+    static unsigned long t = millis();
+    if (millis() - t > 5000) {
+      digitalWrite(RELAY, !digitalRead(RELAY));
+      t = millis();
+    }
+  }
+
   switch (md) {
     case WAITING_FOR_NTP:
       display.showString("ntp");
@@ -315,20 +357,23 @@ void loop()
           lst += 1000;
         }
 
-        // flash display 1.5 times a second in last minute.
-        if (countdown < 60) {
-          display.setBrightness(((millis() / 300) & 1) ? BRIGHT_HIGH : BRIGHT_HIGH / 2);
+        // flash display 1.5 times towards the end
+        if (countdown <= 60) {
+          display.setBrightness(((millis() / 300) & 1) ? BRIGHT_HIGH : BRIGHT_1 );
         };
 
         if (countdown <= 0) {
+          heatingOnOff(false);
           countdown = 0;
-          display.showString("00:00");
 
           // flash aggressivily once time is up.
           //
-          for (int i = 0; i < 20; i++) {
-            display.setBrightness((i & 1) ? BRIGHT_HIGH : 0);
-            delay(200);
+          for (int i = 0; i < 30; i++) {
+            display.setBrightness((i & 1) ? BRIGHT_HIGH : BRIGHT_LOW);
+            display.showString("0000");
+            delay(100);
+            display.showString("----");
+            delay(100);
           };
 
           // go back to normal
@@ -340,8 +385,9 @@ void loop()
         countdown += checkcardswipe();
 
         char timeleft[32];
-        snprintf(timeleft, sizeof(timeleft) - 1, "%02d:%02d", countdown / 60, countdown % 60);
-        display.showString(timeleft);
+        snprintf(timeleft, sizeof(timeleft) - 1, "%02d%02d", countdown / 60, countdown % 60);
+        display.showString(timeleft, 4, 0 /*pos*/, 0b01000000 /* dots */);
+        heatingOnOff(true);
         break;
       }
     case WIFI_FAIL_REBOOT:

rest.cpp

@@ -251,6 +251,8 @@ bool registerDevice() {
 
   if (md == WAIT_FOR_REGISTER_SWIPE) {
     updateDisplay_progressText("sending credentials");
+    Log.println(nonce);
+    Log.println(tag);
 
     // Create the reply; SHA256(nonce, tag(secret), client, server);
     //
@@ -268,8 +270,24 @@ bool registerDevice() {
     sha256toHEX(sha256, (char*)tmp);
     mbedtls_sha256_free(&sha_ctx);
 
+
     snprintf((char *) buff, sizeof(buff),  PAY_URL REGISTER_PATH "?response=%s", (char *)tmp);
 
+    if (0) {
+      Debug.print("nonce=");
+      Debug.println(nonce);
+      Debug.print("tag=");
+      Debug.println(tag);
+      Debug.print("client=");
+      sha256toHEX(sha256_client, (char*)tmp);
+      Debug.println((char *)tmp);
+      Debug.print("server=");
+      sha256toHEX(sha256_server, (char*)tmp);
+      Debug.println((char *)tmp);
+      Debug.print("Result=");
+      Debug.println((char *)tmp);
+    };
+
     if (!https.begin(client, (char *)buff )) {
       Log.println("Failed to begin https");
       goto exit;
@@ -286,6 +304,9 @@ bool registerDevice() {
 
     if (httpCode != 200) {
       Log.println("Failed to register");
+      // make sure we get a fresh nonce. So it cannot be a nonce timeout.
+      //
+      md = REGISTER;
       goto exit;
     }
 
@@ -342,7 +363,8 @@ bool registerDevice() {
 
       Debug.printf("version:            0x%x\n", keystore.getUShort(KS_KEY_VERSION, -1));
       Debug.printf("client_cert_as_pem: 0x%x (len)\n", keystore.getBytesLength(KS_KEY_CLIENT_CRT));
-      Debug.printf("client_key_as_pem:  0x%x (len)\n", keystore.getBytesLength(KS_KEY_CLIENT_KEY));
+      if (0)
+        Debug.printf("client_key_as_pem:  0x%x (len)\n", keystore.getBytesLength(KS_KEY_CLIENT_KEY));
       Debug.printf("sha256_server_key:  0x%x (len)\n", keystore.getBytesLength(KS_KEY_SERVER_KEY));
 
       keystore.end();