logging: send to console on uCs / LED control

Author: folkertvanheusden

ESP32/console_esp32.cpp

@@ -26,6 +26,10 @@
 console_esp32::console_esp32(kek_event_t *const stop_event, comm *const io_port, const int t_width, const int t_height) :
 	console_comm(stop_event, io_port, t_width, t_height)
 {
+#if defined(WAVESHARE_S3_ETH)
+	rgb_led.begin();
+	rgb_led.setBrightness(50);
+#endif
 }
 
 console_esp32::~console_esp32()
@@ -188,22 +192,24 @@ void console_esp32::panel_update_thread()
 
 	pixels.clear();
 	pixels.show();
-#elif defined(HEARTBEAT_PIN) && !defined(WAVESHARE_S3_ETH)
-	uint64_t prev_count = 0;
-	bool     led_state  = true;
-
-	while(!stop_panel) {
-		vTaskDelay(333 / portTICK_PERIOD_MS);
+#endif
 
-		uint64_t current_count = c->get_trap_counter();
-		if (prev_count != current_count) {
-			prev_count = current_count;
+	DOLOG(info, false, "panel task terminating");
+}
 
-			digitalWrite(HEARTBEAT_PIN, led_state ? HIGH : LOW);
-			led_state = !led_state;
-		}
-	}
+void console_esp32::set_LED_state(const bool state)
+{
+#if defined(WAVESHARE_S3_ETH)
+	uint8_t brightness = state ? 255 : 0;
+	rgb_led.setPixelColor(0, brightness, brightness, brightness);
+	rgb_led.show();
+#else
+	digitalWrite(HEARTBEAT_PIN, state);
 #endif
+	prev_led_state = state;
+}
 
-	DOLOG(info, false, "panel task terminating");
+void console_esp32::toggle_LED_state()
+{
+	set_LED_state(!prev_led_state);
 }

ESP32/console_esp32.h

@@ -1,6 +1,9 @@
 // (C) 2018-2026 by Folkert van Heusden
 // Released under MIT license
 
+#if defined(WAVESHARE_S3_ETH)
+#include <Adafruit_NeoPixel.h>
+#endif
 #include <vector>
 
 #include "comm.h"
@@ -9,6 +12,12 @@
 
 class console_esp32 : public console_comm
 {
+private:
+#if defined(WAVESHARE_S3_ETH)
+	Adafruit_NeoPixel rgb_led        { Adafruit_NeoPixel(1, 21, NEO_GRB + NEO_KHZ800) };
+#endif
+	bool              prev_led_state { false };
+
 protected:
 	int wait_for_char_ll(const short timeout) override;
 	void put_char_ll    (const char c) override;
@@ -17,13 +26,13 @@ class console_esp32 : public console_comm
 	console_esp32(kek_event_t *const stop_event, comm *const io_port, const int t_width, const int t_height);
 	virtual ~console_esp32();
 
-	void set_panel_mode(const panel_mode_t pm);
-
 	void put_string_lf(const std::string & what) override;
 
 	void resize_terminal() override;
-
 	void refresh_virtual_terminal() override;
 
+	void set_panel_mode(const panel_mode_t pm);
 	void panel_update_thread() override;
+	void set_LED_state   (const bool state) override;
+	void toggle_LED_state(                ) override;
 };

ESP32/main.ino

@@ -517,6 +517,10 @@ void setup() {
 #endif
 	cnsl->set_bus(b);
 	cnsl->begin();
+  c->set_console(cnsl);
+
+  set_terminal(cnsl);
+  DOLOG(info, true, "Logging enabled");
 
 	running = cnsl->get_running_flag();
 

console.cpp

@@ -218,7 +218,7 @@ void console::put_char(const char c)
 	else if (c == 13)
 		tx = 0;
 	else if (c == 10) {
-		if (debug_buffer.empty() == false) {
+		if (debug_buffer.empty() == false && is_terminal_set() == false) {
 			DOLOG(debug, false, "TTY: %s", debug_buffer.c_str());
 			debug_buffer.clear();
 		}
@@ -304,3 +304,11 @@ void console::set_blinkenlights_panel(blinkenlights *const p_blinkenlights)
 {
 	this->p_blinkenlights = p_blinkenlights;
 }
+
+void console::set_LED_state(const bool state)
+{
+}
+
+void console::toggle_LED_state()
+{
+}

console.h

@@ -106,4 +106,7 @@ class console
 	virtual void panel_update_thread() = 0;
 	int          get_refreshrate(              ) const { return refreshrate; }
 	void         set_refreshrate(const int rate)       { refreshrate = rate; }
+
+	virtual void set_LED_state   (const bool state);
+	virtual void toggle_LED_state();
 };

cpu.cpp

@@ -342,17 +342,18 @@ void cpu::execute_any_pending_interrupt()
 			auto     vector = queued_interrupts[i].begin();
 			uint16_t v      = *vector;
 			queued_interrupts[i].erase(vector);
-#if defined(ESP32)
-			if (v == 0100) {  // 50 Hz interrupt
-				if (++kw11l_counter >= 25) {
-					kw11l_counter = 0;
-					digitalWrite(HEARTBEAT_PIN, !digitalRead(HEARTBEAT_PIN));
+
+			if (cnsl) {
+				if (v == 0100) {  // 50 Hz interrupt
+					if (++kw11l_counter >= 25) {
+						kw11l_counter = 0;
+						cnsl->toggle_LED_state();
+					}
+				}
+				else {
+					cnsl->toggle_LED_state();
 				}
 			}
-			else {
-				digitalWrite(HEARTBEAT_PIN, !digitalRead(HEARTBEAT_PIN));
-			}
-#endif
 
 			TRACE("Invoking interrupt vector %o (IPL %d, current: %d)", v, i, current_level);
 			trap(v, i, true);

cpu.h

@@ -79,6 +79,7 @@ class cpu
 	mmu *const mmu_ { nullptr };
 
 	kek_event_t *const event { nullptr };
+	console     *cnsl        { nullptr };
 
 	bool     check_pending_interrupts() const;  // needs the 'qi_lock'-lock
 	void     execute_any_pending_interrupt();
@@ -120,6 +121,8 @@ class cpu
 	explicit cpu(bus *const b, kek_event_t *const event);
 	~cpu();
 
+	void set_console(console *const cnsl) { this->cnsl = cnsl; }
+
 	JsonDocument serialize();
 	static cpu *deserialize(const JsonVariantConst j, bus *const b, kek_event_t *const event);
 

debugger.cpp

@@ -1383,13 +1383,17 @@ bool debugger_do(debugger_state *const state, console *const cnsl, bus *const b,
 			if (false) {
 			}
 #if !defined(WAVESHARE_S3_ETH)
-			if (!network_configured)
+			else if (!network_configured)
 				cnsl->put_string_lf("Please configure network first (cfgnet)");
 #endif
-			else if (dev->begin())
+			else if (dev->begin()) {
 				b->add_DEQNA(new deqna(b, mac, dev));
-			else
+				cnsl->put_string_lf("DEQNA emulation initialized");
+			}
+			else {
 				delete dev;
+				cnsl->put_string_lf("DEQNA emulation initialization failed");
+			}
 		}
 
 		return true;
@@ -1681,7 +1685,7 @@ void debugger(console *const cnsl, bus *const b, kek_event_t *const stop_event,
 			if (state.marker)
 				cnsl->put_string_lf("---");
 
-			std::string cmd = cnsl->read_line(format("%d", int(*stop_event)));
+			std::string cmd = cnsl->read_line(std::to_string(int(*stop_event)));
 
 			if (debugger_do(&state, cnsl, b, stop_event, cmd) == false)
 				break;

log.cpp

@@ -77,6 +77,11 @@ void set_terminal(console *const cnsl)
 	log_cnsl = cnsl;
 }
 
+bool is_terminal_set()
+{
+	return log_cnsl;
+}
+
 void settrace(const bool on)
 {
 	log_trace_enabled = on;

log.h

@@ -26,6 +26,7 @@ bool gettrace();
 void set_clock_reference(const char *const ntp_server);
 #endif
 void set_terminal(console *const cnsl);
+bool is_terminal_set();
 
 #ifdef TURBO
 #define DOLOG(ll, always, fmt, ...) do { } while(0)