Mercurial > hp34970-firmware / changeset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/display.cpp	Mon Oct 26 00:16:13 2020 +0100
@@ -0,0 +1,236 @@
+#include "stdio.h"
+#include <mbed.h>
+#include <rtos.h>
+#include "display.h"
+
+
+Display::Display(int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC,
+				 const char* name)
+		: SSD1322(Hz, mosi, miso, sclk, CS, reset, DC, name)
+{
+	must_refresh = 0;
+}
+
+Display::~Display()
+{
+}
+
+void Display::show_splashscreen()
+{
+	locate(30, 10);
+	set_font((unsigned char*)Mono19x27);
+	this->printf("HP34970A");
+	set_font((unsigned char*)Terminal6x8);
+	locate(90, 40);
+	this->printf("David Douard");
+	locate(0, 52);
+	this->printf("Clock = %ld ", SystemCoreClock);
+
+	RCC_OscInitTypeDef cfg;
+	HAL_RCC_GetOscConfig(&cfg);
+	if (cfg.HSEState == RCC_HSE_BYPASS)
+		this->printf("HSE:EXT ");
+	else if (cfg.HSEState == RCC_HSE_ON)
+		this->printf("HSE:XTAL ");
+	else
+		this->printf("HSE:OFF ");
+
+	if (cfg.HSIState == RCC_HSI_ON)
+		this->printf("HSI:ON ");
+	else
+		this->printf("HSI:OFF ");
+
+	copy_to_lcd();
+}
+
+
+void Display::show(uint8_t cmd, const char *intxt, uint8_t nchar=0)
+{
+	uint8_t i;
+	// uint8_t len;
+	uint16_t bgcolor, fgcolor;
+	char *oldv;
+	// char *txt;
+	char *txtp;
+	static char txt[256];
+
+
+	if (cmd == 0xFF) // cls
+	{
+		clrbuff();
+	}
+	else
+	{
+		//txt = (char *)malloc(strlen(intxt)+1);
+		strcpy(txt, intxt);
+		txtp = txt;
+
+		for (i=0; i<sizeof(table)/sizeof(table[0]); ++i) {
+			if (table[i].cmd == cmd) {
+				bgcolor = table[i].bgcolor;
+				fgcolor = table[i].color;
+				background(bgcolor);
+				foreground(fgcolor);
+				set_font((unsigned char*) table[i].font);
+				oldv = table[i].buffer;
+
+				locate(table[i].x0, table[i].y0);
+
+				if (table[i].fmt & 0x01)  // ASCII text
+				{
+					if (strncmp(oldv, txt, table[i].maxsize) != 0)
+					{
+						if (table[i].width > 0)
+							fillrect(table[i].x0,
+														table[i].y0,
+														table[i].x0 + table[i].width,
+														table[i].y0 + table[i].font[2],
+														bgcolor);
+						for (uint8_t k=0; ;k++)
+						{
+							if (txtp[k] == 0x00)
+							{
+								this->printf(txtp);
+								break;
+							}
+							if (txtp[k] == 0x09)
+							{ // \t is a special char for 'unselected' display value
+								txtp[k] = 0x00;
+								this->printf(txtp);
+
+								if (fgcolor == table[i].color)
+									fgcolor /= 2;
+								else
+									fgcolor = table[i].color;
+								foreground(fgcolor);
+								txtp = &(txtp[k+1]);
+								k = 0;
+							}
+						}
+						if (cmd == 0x00) // main area
+							must_refresh |= 0x01;
+						if (cmd == 0x0C) // channels area
+							must_refresh |= 0x04;
+					}
+				}
+				/*
+					if (table[i].fmt & 0x02 ) {
+					// hex
+					for (uint8_t j=0;; j++) {
+					if (txt[j] == 0x00)
+					break;
+					this->printf("%02X ", txt[j]);
+					}
+					for (uint8_t j=3*strlen(txt); j<table[i].maxsize; j++)
+					this->printf(" ");
+					}
+				*/
+				if (table[i].fmt & 0x08 )  // flag indicators
+				{
+					// flags
+					for (uint8_t j=0; j<max(nchar, table[i].maxsize) ; j++)
+					{
+						for (uint8_t k=0; k<8; k++)
+						{
+							if (1)
+							{ //(txt[j] & (1 << k) ) != (oldv[j] & (1 << k))) {
+								for (uint8_t l=0;
+										 l<(sizeof(flags)/sizeof(flags[0])); ++l)
+								{
+									if (flags[l].flag == ((j<<4) + k)) {
+										if (txtp[j] & (1 << k))
+										{
+											foreground(flags[l].reverse ? bgcolor : fgcolor);
+											background(flags[l].reverse ? fgcolor : bgcolor);
+										}
+										else
+										{
+											foreground(bgcolor);
+											background(bgcolor);
+										}
+										if (flags[l].msg != NULL)
+										{ // a string
+											locate(flags[l].x, flags[l].y);
+											this->printf(flags[l].msg);}
+										else
+										{ // an icon
+											Bitmap_s pic = {9, 10, 2, (char*) flags[l].icon};
+											Bitmap_BW(pic, flags[l].x, flags[l].y);
+										}
+										must_refresh = 1; //|= zones[m].flag;
+										break;
+									}
+								}
+							}
+						}
+					}
+
+					// draw frames (Alarm and Channel)
+					for (uint8_t l=0;
+							 l<(sizeof(frames)/sizeof(frames[0])); ++l)
+					{
+						uint16_t color;
+						if (frames[l].flag & txt[0]) // frame flags are on the 1st byte only
+							color = fgcolor/6;
+						else
+							color = bgcolor;
+						hline(frames[l].x0+1, frames[l].x0+3, frames[l].y0, color);
+						hline(frames[l].x1-3, frames[l].x1-1, frames[l].y0, color);
+						hline(frames[l].x0+1, frames[l].x1-1, frames[l].y1, color);
+
+						vline(frames[l].x0, frames[l].y0+1, frames[l].y1-1, color);
+						vline(frames[l].x1, frames[l].y0+1, frames[l].y1-1, color);
+					}
+				}
+
+				for(uint8_t j=0; j<table[i].maxsize; j++)
+					oldv[j] = txt[j];
+				break;
+			}
+		}
+		//free(txt);
+		//this->copy_to_lcd();
+	}
+}
+
+
+void Display::test_dsp()
+{
+	const FRAME *z;
+	printf("TEST DSP\r\n");
+	cls();
+	printf("TEST DSP #2\r\n");
+	show(0x00, "8g8g8g8g8g8g8", 13); // main dsp
+	show(0x0C, "888", 3); // channel dsp
+	show(0x0A, "\xFF\xFF\xFF\xFF", 4); // all flags
+	copy_to_lcd();
+	ThisThread::sleep_for(3ms);
+	cls();
+	printf("TEST DSP #3\r\n");
+
+	for (uint8_t i=0; i<(sizeof(zones)/sizeof(zones[0])); i++)
+	{
+		z = &zones[i];
+		fillrect(z->x0, z->y0, z->x1, z->y1, 4+i);
+		locate(z->x0+1, z->y0+1);
+		this->printf("%d", i);
+	}
+
+	/*
+		for (uint8_t i=0; i<(sizeof(zones)/sizeof(zones[0])); i++)
+		{
+		z = &zones[i];
+		printf("Zone %d [%x]: %d, %d, %d, %d\n", i, z->flag,
+		z->x0, z->y0, z->x1, z->y1);
+		must_refresh = z->flag;
+		wait(1);
+		}
+		printf("Done\n");
+		wait(2);
+		printf("Copy ALL\n");
+		copy_to_lcd();
+	*/
+	ThisThread::sleep_for(2ms);
+	cls();
+	printf("TEST DSP DONE\r\n");
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/display.h	Mon Oct 26 00:16:13 2020 +0100
@@ -0,0 +1,164 @@
+#ifndef DISPLAY_H
+#define DISPLAY_H
+
+#include "Terminal6x8.h"
+#include "Mono19x27.h"
+#include "Mono15x22.h"
+#include "Arial12x12.h"
+#include "SSD1322.h"
+#include "hp34comm.h"
+
+typedef struct _DSP
+{
+	uint8_t cmd;
+	uint8_t color;
+	uint8_t bgcolor;
+	uint8_t x0;
+	uint8_t y0;
+	uint8_t fmt; // 0x01=>ascii, 0x02=>hex, 0x04=>bits, 0x08=>flags, 0x80=>ignore
+	uint8_t maxsize;
+	uint8_t width;
+	const unsigned char* font;
+	char buffer[MAX_BUFF+1];
+} DSP;
+
+static DSP table[] =
+{
+		{ 0x00, 0xF, 0x0,  0,  0, 0x01, MAX_BUFF, 245, Mono19x27}, // main display
+		{ 0x0C, 0xF, 0x0,196, 34, 0x01, 3,        45,  Mono15x22}, // channels display
+		{ 0x0A, 0xF, 0x0,  0, 57, 0x08, 4,        0, Terminal6x8}, // flags + bits
+};
+
+// 9x10
+const unsigned char icon_alarm[] __attribute__((aligned (2))) =
+{
+		0x1c, 0x0,
+		0x3e, 0x0,
+		0x7f, 0x0,
+		0x7f, 0x0,
+		0x7f, 0x0,
+		0x7f, 0x0,
+		0x7f, 0x0,
+		0x7f, 0x0,
+		0xff, 0x80,
+		0x10, 0x0
+};
+
+const unsigned char icon_curve[] __attribute__((aligned (2))) =
+{
+		0x80, 0x0,
+		0x80, 0x0,
+		0x80, 0x80,
+		0x81, 0x0,
+		0x9e, 0x0,
+		0xa0, 0x0,
+		0xc0, 0x0,
+		0x80, 0x0,
+		0x80, 0x0,
+		0xff, 0x80
+};
+
+typedef struct _FLAG
+{
+	uint8_t flag;
+	uint8_t x;
+	uint8_t y;
+	bool reverse;
+	const char* msg;
+	const unsigned char* icon;
+} FLAG;
+
+typedef struct _FRAME
+{
+	uint16_t flag;
+	uint8_t x0;
+	uint8_t y0;
+	uint8_t x1;
+	uint8_t y1;
+} FRAME;
+
+static const FLAG flags[] =
+{
+    // flag, zone, x0, y0, reverse, msg, icon
+    // right-side icons area
+		{ 0x00, 246, 0,  false, NULL, icon_alarm}, // F1.0
+    { 0x01, 246, 11, false, NULL, icon_curve}, // F1.1
+
+    // F1.2 == Channel frame
+    { 0x03, 197, 27, false, "Channel"},  // F1.3
+    // F1.7 == Alarm frame
+
+    { 0x34, 0,  28+8,  false, "MON"},    // F4.4
+    { 0x33, 0,  28+16, false, "VIEW"},   // F4.3
+    { 0x35, 0,  28,    true, "SCAN"},   // F4.5
+    { 0x36, 0,  28+25, true, "CONFIG"},    // F4.6
+
+    { 0x32, 40, 52,    false, "*"},      // F4.2
+    { 0x31, 50, 52,    false, "ADRS"},   // F4.1
+    { 0x30, 80, 52,    false, "RMT"},    // F4.0
+    { 0x27, 104, 52,   true, "ERROR"},    // F3.7
+
+    { 0x26, 140, 52,   false, "EXT"},    // F3.6
+    { 0x25, 164, 52,   false, "ONCE"},   // F3.5
+
+    { 0x23, 104, 28+16, false, "MEM"},    // F3.3
+
+
+    // col 5
+    { 0x14, 244, 22,  false, "4W"},     // F2.4
+    { 0x15, 244, 30,  false, "OC"},     // F2.5
+    { 0x22, 129, 28+16, false, "LAST"},   // F3.2
+    { 0x21, 129, 28+16, false, "MIN"},    // F3.1
+    { 0x20, 129, 28+16, false, "MAX"},    // F3.0
+    { 0x17, 129, 28+16, false, "AVG"},    // F2.7
+
+    { 0x05, 154+0,  17+10, false, "Alarm"},  // F1.5
+    { 0x06, 154+0,  17+20, false, "H"},      // F1.6
+    { 0x13, 154+6,  17+20, false, "1"},      // F2.3
+    { 0x10, 154+12, 17+20, false, "2"},      // F2.0
+    { 0x12, 154+18, 17+20, false, "3"},      // F2.2
+    { 0x11, 154+24, 17+20, false, "4"},      // F2.1
+    { 0x04, 154+30, 17+20, false, "L"},      // F1.4
+
+};
+
+static const FRAME zones[] =
+{ // flag, x0, y0, x1, y1
+    { 0x001, 0,   0, 245, 27}, // main display area
+    { 0x002, 246, 0, 255, 27}, // right notif area
+    { 0x004, 208, 35, 254, 62}, // channels display area
+    { 0x008, 160, 28, 202, 54}, // alarms area
+    { 0x010, 0,   28, 32,  54}, // flags col1
+    { 0x020, 33,  28, 70,  54}, // flags col2
+    { 0x040, 71,  28, 103, 54}, // flags col3
+    { 0x080, 104, 28, 128, 54}, // flags col4
+    { 0x100, 129, 28, 159, 54}, // flags col5
+
+//    { 0x8000, 0, 55, 255, 63}, // flags bits display area
+};
+
+static const FRAME frames[] =
+{
+    { 0x02, 194, 30, 243, 53}, // F1.2 - channel frame
+    { 0x07, 151, 30, 192, 46}, // F1.7 - alarm frame
+};
+
+
+class Display: public SSD1322
+{
+public:
+	Display(int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC,
+					const char* name);
+
+	virtual ~Display();
+
+	void test_dsp();
+	void show(uint8_t, const char*, uint8_t);
+	void show_splashscreen();
+
+private:
+	uint8_t must_refresh;
+
+};
+
+#endif

--- a/src/hp34comm.cpp	Sun Oct 25 23:00:17 2020 +0100
+++ b/src/hp34comm.cpp	Mon Oct 26 00:16:13 2020 +0100
@@ -13,7 +13,7 @@
 
 DigitalOut lled(LED3);
 
-#define RXTIMEOUT 0.05
+#define RXTIMEOUT 50ms
 #define STARTUPRETRY 0.5
 
 const uint8_t startup_seq[] = {
@@ -31,10 +31,11 @@
   &HPSerial::do_state_eot,
 };
 
+
 HPSerial::HPSerial(PinName tx, PinName rx):
   serial(tx, rx),
-  cur_gstate(GSTATE_IDLE),
-  ncmd(0)
+  ncmd(0),
+  cur_gstate(GSTATE_IDLE)
 {
   serial.baud(187500);
   cur_state = STATE_IDLE;
@@ -43,7 +44,7 @@
 
 void HPSerial::startup(void) {
   cur_gstate = GSTATE_STARTING;
-  set_timer(0.002); // launch the startup in 10ms
+  set_timer(10ms); // launch the startup in 10ms
 }
 
 void HPSerial::_startup(void)

--- a/src/hp34comm.h	Sun Oct 25 23:00:17 2020 +0100
+++ b/src/hp34comm.h	Mon Oct 26 00:16:13 2020 +0100
@@ -38,9 +38,9 @@
   void pushCmd(uint8_t cmd, uint8_t size, char *payload);
   void rxIrq(void);
   void timeout(void);
-  void set_timer(float v=0.0) {
+  void set_timer(Kernel::Clock::duration_u32 v=0ms) {
     timeouter.detach();
-    if (v > 0.0)
+    if (v > 0ms)
       timeouter.attach(callback(this, &HPSerial::timeout), v);
   }
 

--- a/src/main.cpp	Sun Oct 25 23:00:17 2020 +0100
+++ b/src/main.cpp	Mon Oct 26 00:16:13 2020 +0100
@@ -4,13 +4,8 @@
 #include <rtos.h>
 #include <string>
 
-#include "Terminal6x8.h"
-#include "Mono19x27.h"
-#include "Mono15x22.h"
-#include "Arial12x12.h"
-
-#include "SSD1322.h"
 #include "hp34comm.h"
+#include "display.h"
 
 #include "QEI.h"
 #include "Keypad.h"
@@ -25,9 +20,9 @@
 #include "platform/CircularBuffer.h"
 
 
-SSD1322 *dsp;
+Display *dsp;
+volatile bool splashscreen;
 HPSerial *hp;
-volatile uint8_t must_refresh;
 Thread tdsp, tloop;
 Ticker blinker;
 Timeout rst_delay;
@@ -37,8 +32,6 @@
 QEI qenc(KP_ENC1, KP_ENC2, NC, 16);
 volatile uint8_t knob;
 bool shift;  // true when kp is shifted, cleared by command 0x01 from Unit
-volatile bool splashscreen;
-
 
 typedef enum {
 		KEY_NONE=0,
@@ -110,148 +103,14 @@
 uint8_t nchars;
 char buffer[MAX_BUFF+1];
 
+void refresh_display(void);
+
 void timeout_h() {
 #if defined(HAS_LED)
 	led = !led;
 #endif
 }
 
-typedef struct _DSP
-{
-	uint8_t cmd;
-	uint8_t color;
-	uint8_t bgcolor;
-	uint8_t x0;
-	uint8_t y0;
-	uint8_t fmt; // 0x01=>ascii, 0x02=>hex, 0x04=>bits, 0x08=>flags, 0x80=>ignore
-	uint8_t maxsize;
-	uint8_t width;
-	const unsigned char* font;
-	char buffer[MAX_BUFF+1];
-} DSP;
-
-static DSP table[] =
-{
-		{ 0x00, 0xF, 0x0,  0,  0, 0x01, MAX_BUFF, 245, Mono19x27}, // main display
-		{ 0x0C, 0xF, 0x0,196, 34, 0x01, 3,        45,  Mono15x22}, // channels display
-		{ 0x0A, 0xF, 0x0,  0, 57, 0x08, 4,        0, Terminal6x8}, // flags + bits
-};
-
-// 9x10
-const unsigned char icon_alarm[] __attribute__((aligned (2))) =
-{
-		0x1c, 0x0,
-		0x3e, 0x0,
-		0x7f, 0x0,
-		0x7f, 0x0,
-		0x7f, 0x0,
-		0x7f, 0x0,
-		0x7f, 0x0,
-		0x7f, 0x0,
-		0xff, 0x80,
-		0x10, 0x0
-};
-
-const unsigned char icon_curve[] __attribute__((aligned (2))) =
-{
-		0x80, 0x0,
-		0x80, 0x0,
-		0x80, 0x80,
-		0x81, 0x0,
-		0x9e, 0x0,
-		0xa0, 0x0,
-		0xc0, 0x0,
-		0x80, 0x0,
-		0x80, 0x0,
-		0xff, 0x80
-};
-
-typedef struct _FLAG
-{
-	uint8_t flag;
-	uint8_t x;
-	uint8_t y;
-	bool reverse;
-	const char* msg;
-	const unsigned char* icon;
-} FLAG;
-
-typedef struct _FRAME
-{
-	uint16_t flag;
-	uint8_t x0;
-	uint8_t y0;
-	uint8_t x1;
-	uint8_t y1;
-} FRAME;
-
-static const FLAG flags[] =
-{
-    // flag, zone, x0, y0, reverse, msg, icon
-    // right-side icons area
-		{ 0x00, 246, 0,  false, NULL, icon_alarm}, // F1.0
-    { 0x01, 246, 11, false, NULL, icon_curve}, // F1.1
-
-    // F1.2 == Channel frame
-    { 0x03, 197, 27, false, "Channel"},  // F1.3
-    // F1.7 == Alarm frame
-
-    { 0x34, 0,  28+8,  false, "MON"},    // F4.4
-    { 0x33, 0,  28+16, false, "VIEW"},   // F4.3
-    { 0x35, 0,  28,    true, "SCAN"},   // F4.5
-    { 0x36, 0,  28+25, true, "CONFIG"},    // F4.6
-
-    { 0x32, 40, 52,    false, "*"},      // F4.2
-    { 0x31, 50, 52,    false, "ADRS"},   // F4.1
-    { 0x30, 80, 52,    false, "RMT"},    // F4.0
-    { 0x27, 104, 52,   true, "ERROR"},    // F3.7
-
-    { 0x26, 140, 52,   false, "EXT"},    // F3.6
-    { 0x25, 164, 52,   false, "ONCE"},   // F3.5
-
-    { 0x23, 104, 28+16, false, "MEM"},    // F3.3
-
-
-    // col 5
-    { 0x14, 244, 22,  false, "4W"},     // F2.4
-    { 0x15, 244, 30,  false, "OC"},     // F2.5
-    { 0x22, 129, 28+16, false, "LAST"},   // F3.2
-    { 0x21, 129, 28+16, false, "MIN"},    // F3.1
-    { 0x20, 129, 28+16, false, "MAX"},    // F3.0
-    { 0x17, 129, 28+16, false, "AVG"},    // F2.7
-
-    { 0x05, 154+0,  17+10, false, "Alarm"},  // F1.5
-    { 0x06, 154+0,  17+20, false, "H"},      // F1.6
-    { 0x13, 154+6,  17+20, false, "1"},      // F2.3
-    { 0x10, 154+12, 17+20, false, "2"},      // F2.0
-    { 0x12, 154+18, 17+20, false, "3"},      // F2.2
-    { 0x11, 154+24, 17+20, false, "4"},      // F2.1
-    { 0x04, 154+30, 17+20, false, "L"},      // F1.4
-
-};
-
-static const FRAME zones[] =
-{ // flag, x0, y0, x1, y1
-    { 0x001, 0,   0, 245, 27}, // main display area
-    { 0x002, 246, 0, 255, 27}, // right notif area
-    { 0x004, 208, 35, 254, 62}, // channels display area
-    { 0x008, 160, 28, 202, 54}, // alarms area
-    { 0x010, 0,   28, 32,  54}, // flags col1
-    { 0x020, 33,  28, 70,  54}, // flags col2
-    { 0x040, 71,  28, 103, 54}, // flags col3
-    { 0x080, 104, 28, 128, 54}, // flags col4
-    { 0x100, 129, 28, 159, 54}, // flags col5
-
-//    { 0x8000, 0, 55, 255, 63}, // flags bits display area
-};
-
-static const FRAME frames[] =
-{
-    { 0x02, 194, 30, 243, 53}, // F1.2 - channel frame
-    { 0x07, 151, 30, 192, 46}, // F1.7 - alarm frame
-};
-
-
 #ifdef DEBUG
 
 DigitalOut dbgpin(DBGPIN);
@@ -276,13 +135,10 @@
 
 // callbacks & thread functions
 void loop();
-void copy_to_lcd(void);
-void test_dsp();
 void reset(void);
 void reset_irq(void);
 void qei_cb(int dir);
 void end_splashscreen(void);
-void show(uint8_t, const char*, uint8_t);
 
 /*
 	#if defined(HAVE_PC)
@@ -361,13 +217,8 @@
 	printf("     DSP_CS=%d\r\n", DSP_CS);
 	printf("     DSP_RST=%d\r\n", DSP_RST);
 	printf("     DSP_DC=%d\r\n", DSP_DC);
-	dsp = new SSD1322(20000000, DSP_MOSI, DSP_MISO, DSP_SCLK, DSP_CS,
-										DSP_RST, DSP_DC, "SSD1322");
-
-	printf("  configure DSP\r\n");
-	dsp->background(Black);    // set background to black
-	dsp->foreground(0xF);
-	dsp->cls();
+	dsp = new Display(20000000, DSP_MOSI, DSP_MISO, DSP_SCLK, DSP_CS,
+					  DSP_RST, DSP_DC, "SSD1322");
 
 	//curcmd = 0xFF;
 	curchar = 0;
@@ -377,36 +228,13 @@
 		memset(table[i].buffer, 0, MAX_BUFF+1);
 
 	printf("  display splash screen\r\n");
-	dsp->locate(30, 10);
-	dsp->set_font((unsigned char*)Mono19x27);
-	dsp->printf("HP34970A");
-	dsp->set_font((unsigned char*)Terminal6x8);
-	dsp->locate(90, 40);
-	dsp->printf("David Douard");
-	dsp->locate(0, 52);
-	dsp->printf("Clock = %d ", SystemCoreClock);
-
-	RCC_OscInitTypeDef cfg;
-	HAL_RCC_GetOscConfig(&cfg);
-	if (cfg.HSEState == RCC_HSE_BYPASS)
-		dsp->printf("HSE:EXT ");
-	else if (cfg.HSEState == RCC_HSE_ON)
-		dsp->printf("HSE:XTAL ");
-	else
-		dsp->printf("HSE:OFF ");
-
-	if (cfg.HSIState == RCC_HSI_ON)
-		dsp->printf("HSI:ON ");
-	else
-		dsp->printf("HSI:OFF ");
-
-	dsp->copy_to_lcd();
+	dsp->show_splashscreen();
 
 	printf("Starting LCD thread\r\n");
-	tdsp.start(&copy_to_lcd);
+	tdsp.start(&refresh_display);
 
-	printf("Starting Event thread\r\n");
-	tloop.start(&loop);
+	//printf("Starting Event thread\r\n");
+	//tloop.start(&loop);
 
 	/*
 		dsp->clrbuff();
@@ -417,7 +245,7 @@
 
 	printf("Attaching timers\r\n");
 	splashscreen = true;
-	splashscreen_timer.attach(callback(&end_splashscreen), 2);
+	splashscreen_timer.attach(callback(&end_splashscreen), 2ms);
 	rst.fall(&reset_irq);
 
 	printf("SETUP DONE\r\n");
@@ -432,7 +260,7 @@
 
 void reset_irq(void)
 {
-	rst_delay.attach(callback(&reset), 0.1);
+	rst_delay.attach(callback(&reset), 1ms);
 }
 
 void reset(void)
@@ -450,13 +278,12 @@
 	}
 }
 
-void copy_to_lcd(void) {
+void refresh_display(void) {
 	//uint8_t mask=1;
 
 	while(1) {
 		pulse(0, true);
-		if ((splashscreen == false) && (must_refresh)) {
-			must_refresh = 0;
+		if (splashscreen == false) {
 			//Thread::wait(20); // give a bit of time for some more cmds
 			dsp->copy_to_lcd();
 		}
@@ -478,209 +305,13 @@
 		*/
 		pulse(0, false);
 
-		ThisThread::sleep_for(30);
+		ThisThread::sleep_for(30ms);
 	}
 }
 
-void show(uint8_t cmd, const char *intxt, uint8_t nchar=0)
-{
-	uint8_t i;
-	// uint8_t len;
-	uint16_t bgcolor, fgcolor;
-	char *oldv;
-	// char *txt;
-	char *txtp;
-	static char txt[256];
-
-
-	if (cmd == 0xFF) // cls
-	{
-		dsp->clrbuff();
-	}
-	else
-	{
-		//txt = (char *)malloc(strlen(intxt)+1);
-		strcpy(txt, intxt);
-		txtp = txt;
-
-		pulse(1, true);
-
-		// len = MAX_BUFF;
-
-		for (i=0; i<sizeof(table)/sizeof(table[0]); ++i) {
-			if (table[i].cmd == cmd) {
-				bgcolor = table[i].bgcolor;
-				fgcolor = table[i].color;
-				dsp->background(bgcolor);
-				dsp->foreground(fgcolor);
-				dsp->set_font((unsigned char*) table[i].font);
-				oldv = table[i].buffer;
-
-				dsp->locate(table[i].x0, table[i].y0);
-
-				if (table[i].fmt & 0x01)  // ASCII text
-				{
-					if (strncmp(oldv, txt, table[i].maxsize) != 0)
-					{
-						if (table[i].width > 0)
-							dsp->fillrect(table[i].x0,
-														table[i].y0,
-														table[i].x0 + table[i].width,
-														table[i].y0 + table[i].font[2],
-														bgcolor);
-						for (uint8_t k=0; ;k++)
-						{
-							if (txtp[k] == 0x00)
-							{
-								dsp->printf(txtp);
-								break;
-							}
-							if (txtp[k] == 0x09)
-							{ // \t is a special char for 'unselected' display value
-								txtp[k] = 0x00;
-								dsp->printf(txtp);
-
-								if (fgcolor == table[i].color)
-									fgcolor /= 2;
-								else
-									fgcolor = table[i].color;
-								dsp->foreground(fgcolor);
-								txtp = &(txtp[k+1]);
-								k = 0;
-							}
-						}
-						if (cmd == 0x00) // main area
-							must_refresh |= 0x01;
-						if (cmd == 0x0C) // channels area
-							must_refresh |= 0x04;
-					}
-				}
-				/*
-					if (table[i].fmt & 0x02 ) {
-					// hex
-					for (uint8_t j=0;; j++) {
-					if (txt[j] == 0x00)
-					break;
-					dsp->printf("%02X ", txt[j]);
-					}
-					for (uint8_t j=3*strlen(txt); j<table[i].maxsize; j++)
-					dsp->printf(" ");
-					}
-				*/
-				if (table[i].fmt & 0x08 )  // flag indicators
-				{
-					// flags
-					for (uint8_t j=0; j<max(nchar, table[i].maxsize) ; j++)
-					{
-						for (uint8_t k=0; k<8; k++)
-						{
-							if (1)
-							{ //(txt[j] & (1 << k) ) != (oldv[j] & (1 << k))) {
-								for (uint8_t l=0;
-										 l<(sizeof(flags)/sizeof(flags[0])); ++l)
-								{
-									if (flags[l].flag == ((j<<4) + k)) {
-										if (txtp[j] & (1 << k))
-										{
-											dsp->foreground(flags[l].reverse ? bgcolor : fgcolor);
-											dsp->background(flags[l].reverse ? fgcolor : bgcolor);
-										}
-										else
-										{
-											dsp->foreground(bgcolor);
-											dsp->background(bgcolor);
-										}
-										if (flags[l].msg != NULL)
-										{ // a string
-											dsp->locate(flags[l].x, flags[l].y);
-											dsp->printf(flags[l].msg);}
-										else
-										{ // an icon
-											Bitmap_s pic = {9, 10, 2, (char*) flags[l].icon};
-											dsp->Bitmap_BW(pic, flags[l].x, flags[l].y);
-										}
-										must_refresh = 1; //|= zones[m].flag;
-										break;
-									}
-								}
-							}
-						}
-					}
-
-					// draw frames (Alarm and Channel)
-					for (uint8_t l=0;
-							 l<(sizeof(frames)/sizeof(frames[0])); ++l)
-					{
-						uint16_t color;
-						if (frames[l].flag & txt[0]) // frame flags are on the 1st byte only
-							color = fgcolor/6;
-						else
-							color = bgcolor;
-						dsp->hline(frames[l].x0+1, frames[l].x0+3, frames[l].y0, color);
-						dsp->hline(frames[l].x1-3, frames[l].x1-1, frames[l].y0, color);
-						dsp->hline(frames[l].x0+1, frames[l].x1-1, frames[l].y1, color);
-
-						dsp->vline(frames[l].x0, frames[l].y0+1, frames[l].y1-1, color);
-						dsp->vline(frames[l].x1, frames[l].y0+1, frames[l].y1-1, color);
-					}
-				}
-
-				for(uint8_t j=0; j<table[i].maxsize; j++)
-					oldv[j] = txt[j];
-				break;
-			}
-		}
-		//free(txt);
-		//dsp->copy_to_lcd();
-		pulse(1, false);
-	}
-}
-
-void test_dsp()
-{
-	const FRAME *z;
-	printf("TEST DSP\r\n");
-	dsp->cls();
-	printf("TEST DSP #2\r\n");
-	show(0x00, "8g8g8g8g8g8g8", 13); // main dsp
-	show(0x0C, "888", 3); // channel dsp
-	show(0x0A, "\xFF\xFF\xFF\xFF", 4); // all flags
-	dsp->copy_to_lcd();
-	ThisThread::sleep_for(3);
-	dsp->cls();
-	printf("TEST DSP #3\r\n");
-
-	for (uint8_t i=0; i<(sizeof(zones)/sizeof(zones[0])); i++)
-	{
-		z = &zones[i];
-		dsp->fillrect(z->x0, z->y0, z->x1, z->y1, 4+i);
-		dsp->locate(z->x0+1, z->y0+1);
-		dsp->printf("%d", i);
-	}
-
-	/*
-		for (uint8_t i=0; i<(sizeof(zones)/sizeof(zones[0])); i++)
-		{
-		z = &zones[i];
-		printf("Zone %d [%x]: %d, %d, %d, %d\n", i, z->flag,
-		z->x0, z->y0, z->x1, z->y1);
-		must_refresh = z->flag;
-		wait(1);
-		}
-		printf("Done\n");
-		wait(2);
-		printf("Copy ALL\n");
-		dsp->copy_to_lcd();
-	*/
-	ThisThread::sleep_for(2);
-	dsp->cls();
-	printf("TEST DSP DONE\r\n");
-}
-
-
 void loop()
 { // run over and over
-	keycode_t key;
+	keycode_t key = {0, 0, KEY_NONE};
 
 	unsigned int err[8];
 	for (uint8_t i=0; i<8; i++)
@@ -734,10 +365,10 @@
 			{
 				dsp->locate(140, 0);
 				dsp->printf("KC: %dx%d[0x%s%X] %s",
-										key.row, key.col,
-										kp_mapping[key.row][key.col] <= 0x0F ? "0" : "",
-										kp_mapping[key.row][key.col],
-										key.keyevent==KEY_PRESSED ? "PRE" : "REL");
+							key.row, key.col,
+							kp_mapping[key.row][key.col] <= 0x0F ? "0" : "",
+							kp_mapping[key.row][key.col],
+							key.keyevent==KEY_PRESSED ? "PRE" : "REL");
 				dsp->copy_to_lcd();
 			}
 			// cur_keycode.keyevent = KEY_NONE;
@@ -792,7 +423,7 @@
 					// TODO
 				} else {
           // display related commands
-					show(cmd.cmd, cmd.value, cmd.size);
+					dsp->show(cmd.cmd, cmd.value, cmd.size);
 				}
 #if defined(HAS_LED)
 				led = 0;
@@ -800,7 +431,7 @@
 			}
 		}
 		//else
-		ThisThread::sleep_for(1);
+		ThisThread::sleep_for(1ms);
 	}
 }
 
@@ -836,9 +467,12 @@
 {
 	setup();
 	printf("Main loop (noop)\r\n");
+	loop();
+	/*
 	while(1)
 	{
 		timeout_h();
-		ThisThread::sleep_for(1);
+		ThisThread::sleep_for(1ms);
 	}
+	*/
 }