diff -r 3021fc79cc3b -r d0826e4a1ff7 src/main.cpp --- a/src/main.cpp Tue Jul 19 21:17:39 2016 +0200 +++ b/src/main.cpp Thu Sep 08 20:02:23 2016 +0200 @@ -12,13 +12,13 @@ #include "SPI8.h" #include "ILI9341.h" -Serial pc(USBTX, USBRX); -BufferedSerial hp(PA_0, PA_1, 32); // serial4 +//Serial pc(USBTX, USBRX); +BufferedSerial hp(NC, PA_1, 64, 0); // serial4 ILI9341 tft(SPI_8, 24000000, PA_7, PA_6, PA_5, PA_4, PB_6, PC_7, "myLCD"); // Spi 8bit, 24MHz, mosi, miso, sclk, cs, reset, dc //ILI9341 tft(SPI_8, 24000000, PA_7, PA_6, PA_5, PA_4, PB_6, PB_5, "myLCD"); -#define MAX_BUFF 13 +#define MAX_BUFF 16 uint8_t curchar; uint8_t cmd; uint8_t nchars; @@ -30,7 +30,7 @@ uint16_t color; uint16_t bgcolor; uint8_t y0; - uint8_t fmt; // 0=>ascii, 1=>hex, 2=>bits + uint8_t fmt; // 0=>ascii, 1=>hex, 2=>bits, 3=>flags uint8_t maxsize; const unsigned char* font; char buffer[MAX_BUFF+1]; @@ -38,13 +38,33 @@ static DSP table[] = { - { 0x00, Yellow, Red, 5, 0, MAX_BUFF, Arial28x28}, - { 0x0C, Red, Blue, 40, 0, 3, Arial28x28}, - { 0x01, Blue, Yellow, 75, 1, MAX_BUFF, Arial12x12}, - { 0x02, Blue, Yellow, 110, 1, MAX_BUFF, Arial12x12}, + { 0x00, Blue, Black, 5, 0, MAX_BUFF, Arial28x28}, + { 0x0C, Blue, Black, 40, 0, 3, Arial28x28}, + { 0x01, Green, Black, 95, 1, MAX_BUFF, Arial12x12}, + { 0x02, Green, Black, 110, 1, MAX_BUFF, Arial12x12}, { 0x0A, Blue, Yellow, 145, 2, 4, Arial12x12}, + { 0x0A, Yellow, Black, 70 , 3, 4, Arial12x12}, { 0xFF, Red, Black, 210, 0, MAX_BUFF, Arial12x12}, }; + +typedef struct _FLAG +{ + uint8_t flag; + uint8_t x; + uint8_t y; + const char* msg; +} FLAG; + +static const FLAG flags[] = + { + { 0x00, 0, 70, "Alarm"}, // F1.1 + { 0x01, 40, 70, "Mx+B"}, // F1.2 + { 0x03, 40, 70, "Channels"}, // F1.4 + { 0x14, 70, 70, "4W"}, // F2.5 + { 0x33, 90, 70, "VIEW"}, + { 0x34, 120, 70, "MON"}, + { 0x36, 150, 70, "CONFIG"}, + }; #define DEBUG #ifdef DEBUG #define DBGPIN PC_0 @@ -67,9 +87,9 @@ // init the LCD tft.set_orientation(3); - pc.baud (115200); - pc.printf("\n\nSystem Core Clock = %.3f MHZ\r\n", - (float)SystemCoreClock/1000000); + //pc.baud (115200); + //pc.printf("\n\nSystem Core Clock = %.3f MHZ\r\n", + // (float)SystemCoreClock/1000000); hp.baud(187500); @@ -104,42 +124,76 @@ tft.foreground(fgcolor); tft.locate(0, table[i].y0); tft.set_font((unsigned char*) table[i].font); - break; + oldv = table[i].buffer; + + switch (table[i].fmt) { + case 0: //ascii + tft.printf(txt); + for (uint8_t j=strlen(txt); j