From e249fb2aa2eca6ec9e8187d6558d08754a590604 Mon Sep 17 00:00:00 2001 From: t-moe Date: Mon, 27 Apr 2015 19:45:30 +0200 Subject: [PATCH 1/8] Added font support --- common/app/app.c | 6 +++--- common/lowlevel/ll_tft.h | 10 ++++++++++ common/tft/tft.c | 23 +++++++++++++++++++++++ common/tft/tft.h | 7 +++++++ discovery/src/ll_tft.c | 17 +++++++++++++++++ doc/docu.odt | Bin 653290 -> 653376 bytes emulator/qt/emulatorqt.pro | 3 ++- emulator/qt/ll_tft.cpp | 33 +++++++++++++++++++++++++++++++++ emulator/qt/mainwindow.cpp | 19 +++++++++++++++++++ emulator/qt/mainwindow.h | 2 +- 10 files changed, 115 insertions(+), 5 deletions(-) diff --git a/common/app/app.c b/common/app/app.c index 07d08b2..d440d2d 100644 --- a/common/app/app.c +++ b/common/app/app.c @@ -50,7 +50,7 @@ void app_init() { tft_draw_rectangle(40,210,60,235,BLUE); tft_fill_rectangle(100,215,200,225,GREEN); tft_draw_line(10,215,310,225,RGB(0xFF,0,0xFF)); - tft_draw_circle(10,10,100, RED); + tft_draw_circle(10,10,100, RED); a1.hookedActions = PEN_DOWN | PEN_UP | PEN_MOVE | PEN_ENTER | PEN_LEAVE; a1.x1 = 30; @@ -60,8 +60,8 @@ void app_init() { a1.callback = touchCB; touch_register_area(&a1); - tft_draw_rectangle(30,30,100,60,BLUE); - + tft_draw_rectangle(30,30,100,60,BLUE); + tft_print_line(30, 30, RED, BLUE, 0, "Hallo"); } diff --git a/common/lowlevel/ll_tft.h b/common/lowlevel/ll_tft.h index 8815d63..9ac9059 100644 --- a/common/lowlevel/ll_tft.h +++ b/common/lowlevel/ll_tft.h @@ -9,3 +9,13 @@ void ll_tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint void ll_tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color); void ll_tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *dat); void ll_tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color); + + +uint8_t ll_tft_num_fonts(); +uint8_t ll_tft_font_height(uint8_t fontnum); +uint8_t ll_tft_font_width(uint8_t fontnum); +void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, char c); + + + + diff --git a/common/tft/tft.c b/common/tft/tft.c index 2604be0..4522a20 100644 --- a/common/tft/tft.c +++ b/common/tft/tft.c @@ -1,5 +1,7 @@ #include "tft.h" #include "ll_tft.h" +#include + //it might seems pointless to forward all the functions but we might also introduce functions which have some logic here @@ -37,3 +39,24 @@ void tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t h void tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color) { ll_tft_draw_circle(x, y, r, color); } + +uint8_t tft_num_fonts() { + return ll_tft_num_fonts(); +} + +uint8_t tft_font_height(uint8_t fontnum) { + return ll_tft_font_height(fontnum); +} + +uint8_t tft_font_width(uint8_t fontnum) { + return ll_tft_font_width(fontnum); +} + +void tft_print_line(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, const char* text) { + if(font>=ll_tft_num_fonts()) return; + for(int i=0; i>16),((h)>>8),(h))) +#define TRANSPARENT ((uint16_t)0x80C2) bool tft_init(); @@ -19,3 +20,9 @@ void tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_ void tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color); void tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t* dat); void tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color); + + +uint8_t tft_num_fonts(); +uint8_t tft_font_height(uint8_t fontnum); +uint8_t tft_font_width(uint8_t fontnum); +void tft_print_line(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, const char* text); diff --git a/discovery/src/ll_tft.c b/discovery/src/ll_tft.c index 05bed62..33ff7f5 100644 --- a/discovery/src/ll_tft.c +++ b/discovery/src/ll_tft.c @@ -32,6 +32,23 @@ void ll_tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color) { } +uint8_t ll_tft_num_fonts() { + return 0; +} + +uint8_t ll_tft_font_height(uint8_t fontnum) { + return -1; +} + +uint8_t ll_tft_font_width(uint8_t fontnum) { + return -1; +} + +void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, char c) { + + +} + diff --git a/doc/docu.odt b/doc/docu.odt index b090e3f2434739a1d7fe7e03e1bf37981061e879..5915516507107af7917bd431b8f35edcbb5a7caa 100644 GIT binary patch delta 15416 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 HzIpn8z6Q!g delta 15293 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,y,r,color); } +uint8_t ll_tft_num_fonts() { + return 1; +} + +QFont get_font(uint8_t fontnum) { + switch(fontnum) { + case 0: + return QFont("Monospace",8); + default: + return QFont(); + } +} + + +uint8_t ll_tft_font_height(uint8_t fontnum) { + QFont f = get_font(fontnum); + if(f == QFont()) return -1; + QFontMetrics m(f); + return m.height(); +} + +uint8_t ll_tft_font_width(uint8_t fontnum) { + QFont f = get_font(fontnum); + if(f == QFont()) return -1; + QFontMetrics m(f); + return m.averageCharWidth(); +} + +void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, char c) { + QFont f = get_font(font); + if(f == QFont()) return; + mainwindow->draw_char(x,y,color,bgcolor,f,c); +} diff --git a/emulator/qt/mainwindow.cpp b/emulator/qt/mainwindow.cpp index 43493db..aa3fa5f 100644 --- a/emulator/qt/mainwindow.cpp +++ b/emulator/qt/mainwindow.cpp @@ -7,6 +7,7 @@ extern "C" { #include "touch.h" + #include "tft.h" } #define DISPLAY_WIDTH 320 @@ -110,6 +111,24 @@ void MainWindow::draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color) update(); } +void MainWindow::draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, QFont font, char c) +{ + //render_mutex.lock(); + QPainter painter(&(image)); + painter.setFont(font); + + if(bgcolor!=TRANSPARENT) { + painter.setBackgroundMode(Qt::OpaqueMode); + painter.setBackground(QColorFromRGB565(bgcolor)); + } + + painter.setPen(QColorFromRGB565(color)); + y+=QFontMetrics(font).ascent(); //use y pos as highest point of char, instead of baseline + painter.drawText(QPoint(x,y), QString(QChar(c))); + //render_mutex.unlock(); + update(); +} + void MainWindow::paintEvent(QPaintEvent *) { //render_mutex.lock(); diff --git a/emulator/qt/mainwindow.h b/emulator/qt/mainwindow.h index 397a5ad..c4c015b 100644 --- a/emulator/qt/mainwindow.h +++ b/emulator/qt/mainwindow.h @@ -22,7 +22,7 @@ public: void fill_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color); void draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *dat); void draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color); - + void draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, QFont font, char c); protected: void paintEvent(QPaintEvent * evt); From 7c9eabc6a383f8de863f430f7356558deb556b4d Mon Sep 17 00:00:00 2001 From: t-moe Date: Mon, 27 Apr 2015 20:45:07 +0200 Subject: [PATCH 2/8] Added button support. --- common/app/app.c | 33 ++++++-- common/gui/button.c | 189 ++++++++++++++++++++++++++++++++++++++++++++ common/gui/button.h | 35 ++++++++ 3 files changed, 252 insertions(+), 5 deletions(-) create mode 100644 common/gui/button.c create mode 100644 common/gui/button.h diff --git a/common/app/app.c b/common/app/app.c index d440d2d..d6cfd23 100644 --- a/common/app/app.c +++ b/common/app/app.c @@ -2,14 +2,15 @@ #include "tft.h" #include "system.h" #include "touch.h" +#include "button.h" #include "pixy.h" #include #include + bool pixy_connected = false; -TOUCH_AREA_STRUCT a1; - +/*TOUCH_AREA_STRUCT a1; void touchCB(void* touchArea, TOUCH_ACTION triggeredAction) { @@ -34,8 +35,17 @@ void touchCB(void* touchArea, TOUCH_ACTION triggeredAction) { printf("action %s\n",triggeredAction); break; } +}*/ + +BUTTON_STRUCT b1; + +void buttonCB(void* button) { + printf("button pressed\n"); } + + + void app_init() { system_init(); tft_init(); @@ -52,7 +62,7 @@ void app_init() { tft_draw_line(10,215,310,225,RGB(0xFF,0,0xFF)); tft_draw_circle(10,10,100, RED); - a1.hookedActions = PEN_DOWN | PEN_UP | PEN_MOVE | PEN_ENTER | PEN_LEAVE; + /*a1.hookedActions = PEN_DOWN | PEN_UP | PEN_MOVE | PEN_ENTER | PEN_LEAVE; a1.x1 = 30; a1.y1 = 30; a1.x2 = 100; @@ -61,7 +71,20 @@ void app_init() { touch_register_area(&a1); tft_draw_rectangle(30,30,100,60,BLUE); - tft_print_line(30, 30, RED, BLUE, 0, "Hallo"); + tft_print_line(30, 30, RED, BLUE, 0, "Hallo");*/ + + //b_alarm_ok + b1.base.x1=25; //Start X of Button + b1.base.y1=45; //Start Y of Button + b1.base.x2=AUTO; //b1.base.x1+160; //Auto Calculate X2 with String Width + b1.base.y2=AUTO; //Auto Calculate Y2 with String Height + b1.txtcolor=WHITE; //Set foreground color + b1.bgcolor=HEX(0xDE1010); //Set background color (Don't take 255 or 0 on at least one channel, to make shadows possible) + b1.font=0; //Select Font + b1.text="Hallo"; //Set Text (For formatted strings take sprintf) + b1.callback=buttonCB; //Call b1_cb as Callback + gui_button_add(&b1); //Register Button (and run the callback from now on) + } @@ -74,7 +97,7 @@ int pixy_frame_test(); void app_process() { system_process(); //Let the system handle it's pending events - + gui_button_redraw(&b1); //Note: The only way to detect that pixy has been disconnected is if a command fails. There's no pixy_is_connected method yet :'( diff --git a/common/gui/button.c b/common/gui/button.c new file mode 100644 index 0000000..e450b58 --- /dev/null +++ b/common/gui/button.c @@ -0,0 +1,189 @@ +#include "tft.h" +#include "touch.h" +#include "button.h" +#include + +#define BRIGHTNESS_VAL 3 //How much the Brightness is in/decreased for button shadows (3 -> Add 1/3 off Full Value) + +void buttons_cb(void* touchArea, TOUCH_ACTION triggeredAction) +//Method shared between normal Buttons and Bitmap Buttons-> Look at comment in headerfile for explanation. +{ + TOUCH_AREA_STRUCT * area = (TOUCH_AREA_STRUCT*)touchArea; + BUTTON_STRUCT* button = (BUTTON_STRUCT*)touchArea; + unsigned int c1,c2; + unsigned char r,g,b; + r=(button->bgcolor&0xF800)>>11; + g=(button->bgcolor&0x07E0)>>5; + b=(button->bgcolor&0x001F)>>0; + if((r + 0x1F/BRIGHTNESS_VAL) >0x1F) + c1=0xF800; + else + c1=(r+0x1F/BRIGHTNESS_VAL)<<11; + if((g + 0x3F/BRIGHTNESS_VAL) >0x3F) + c1|=0x07E0; + else + c1|=(g+0x3F/BRIGHTNESS_VAL)<<5; + if((b + 0x1F/BRIGHTNESS_VAL) >0x1F) + c1|=0x0018; + else + c1|=(b+0x1F/BRIGHTNESS_VAL)<<0; + if(r > (0x1F/BRIGHTNESS_VAL)) + c2=(r-0x1F/BRIGHTNESS_VAL)<<11; + else + c2=0x0000; + if(g > (0x3F/BRIGHTNESS_VAL)) + c2|=(g-0x3F/BRIGHTNESS_VAL)<<5; + if(b > (0x1F/BRIGHTNESS_VAL)) + c2|=(b-0x1F/BRIGHTNESS_VAL)<<0; + switch(triggeredAction) + { + case PEN_DOWN: + area->hookedActions=PEN_UP|PEN_LEAVE; + tft_draw_line(button->base.x1+1,button->base.y1,button->base.x2-1,button->base.y1,c2); //Nord + tft_draw_line(button->base.x1,button->base.y1+1,button->base.x1,button->base.y2-1,c2);//West + tft_draw_line(button->base.x1+1,button->base.y2,button->base.x2-1,button->base.y2,c1); //Süd + tft_draw_line(button->base.x2,button->base.y1+1,button->base.x2,button->base.y2-1,c1); //Ost + break; + case PEN_UP: + case PEN_LEAVE: + area->hookedActions=PEN_DOWN; + tft_draw_line(button->base.x1+1,button->base.y1,button->base.x2-1,button->base.y1,c1); //Nord + tft_draw_line(button->base.x1,button->base.y1+1,button->base.x1,button->base.y2-1,c1);//West + tft_draw_line(button->base.x1+1,button->base.y2,button->base.x2-1,button->base.y2,c2); //Süd + tft_draw_line(button->base.x2,button->base.y1+1,button->base.x2,button->base.y2-1,c2); //Ost + if(triggeredAction==PEN_UP && button->callback!=NULL) + button->callback(button); + break; + default:break; + } +} + + +bool gui_button_add(BUTTON_STRUCT* button)//Registers a button (fill Struct first). Return false if no more Space in the Pointertable (-->Change NUM_AREAS). +{ + if(touch_have_empty(1)) + { + unsigned int strwidth=tft_font_width(button->font)*strlen(button->text); + unsigned char strheight=tft_font_height(button->font); + button->base.hookedActions=PEN_DOWN; + button->base.callback = buttons_cb; + if(button->base.x2==AUTO) + button->base.x2= button->base.x1 -1 + strwidth+(tft_font_width(button->font)/2); + else if((button->base.x2-button->base.x1+1)<(strwidth+2)) + return false; + + if(button->base.y2==AUTO) + button->base.y2=button->base.y1 -1 +strheight+(strheight/2); + else if((button->base.y2-button->base.y1+1)<(strheight+2)) + return false; + gui_button_redraw(button); + return touch_register_area(&button->base); + } + return false; +} + +void gui_button_redraw(BUTTON_STRUCT* button) +{ + unsigned int strwidth=tft_font_width(button->font)*strlen(button->text); + unsigned char strheight=tft_font_height(button->font); + unsigned char r,g,b; + unsigned int c; + r=(button->bgcolor&0xF800)>>11; + g=(button->bgcolor&0x07E0)>>5; + b=(button->bgcolor&0x001F)>>0; + tft_fill_rectangle(button->base.x1+1,button->base.y1+1,button->base.x2-1,button->base.y2-1,button->bgcolor); + if((r + 0x1F/BRIGHTNESS_VAL) >0x1F) + c=0xF800; + else + c=(r+0x1F/BRIGHTNESS_VAL)<<11; + if((g + 0x3F/BRIGHTNESS_VAL) >0x3F) + c|=0x07E0; + else + c|=(g+0x3F/BRIGHTNESS_VAL)<<5; + if((b + 0x1F/BRIGHTNESS_VAL) >0x1F) + c|=0x0018; + else + c|=(b+0x1F/BRIGHTNESS_VAL)<<0; + tft_draw_line(button->base.x1+1,button->base.y1,button->base.x2-1,button->base.y1,c); //Nord + tft_draw_line(button->base.x1,button->base.y1+1,button->base.x1,button->base.y2-1,c);//West + if(r > (0x1F/BRIGHTNESS_VAL)) + c=(r-0x1F/BRIGHTNESS_VAL)<<11; + else + c=0x0000; + if(g > (0x3F/BRIGHTNESS_VAL)) + c|=(g-0x3F/BRIGHTNESS_VAL)<<5; + if(b > (0x1F/BRIGHTNESS_VAL)) + c|=(b-0x1F/BRIGHTNESS_VAL)<<0; + tft_draw_line(button->base.x1+1,button->base.y2,button->base.x2-1,button->base.y2,c); //Süd + tft_draw_line(button->base.x2,button->base.y1+1,button->base.x2,button->base.y2-1,c); //Ost + tft_print_line(button->base.x1+(button->base.x2-button->base.x1+1-strwidth)/2,button->base.y1+(button->base.y2-button->base.y1+1-strheight)/2,button->txtcolor,button->bgcolor,button->font,button->text); + +} +void gui_button_remove(BUTTON_STRUCT* button) +{ + touch_unregister_area((TOUCH_AREA_STRUCT*)button); +} + +/* +bool guiAddBitmapButton (BITMAPBUTTON_STRUCT* button) +{ + if(touchHaveEmpty(1)) + { + button->base.hookedActions=PEN_DOWN; + button->base.callback = buttons_cb; + if(button->base.x2==AUTO) + button->base.x2= button->base.x1 -1 + button->imgwidth + button->imgwidth/4; + else if((button->base.x2-button->base.x1+1)<(button->imgwidth+2)) + return false; + + if(button->base.y2==AUTO) + button->base.y2=button->base.y1 -1 +button->imgheight + button->imgheight/4; + else if((button->base.y2-button->base.y1+1)<(button->imgheight+2)) + return false; + guiRedrawBitmapButton(button); + return touchRegisterArea(&button->base); + } + return false; +} + +void guiRedrawBitmapButton(BITMAPBUTTON_STRUCT* button) +{ + + unsigned char r,g,b; + unsigned int c; + r=(button->bgcolor&0xF800)>>11; + g=(button->bgcolor&0x07E0)>>5; + b=(button->bgcolor&0x001F)>>0; + tftFillRectangle(button->base.x1+1,button->base.y1+1,button->base.x2-1,button->base.y2-1,button->bgcolor); + if((r + 0x1F/BRIGHTNESS_VAL) >0x1F) + c=0xF800; + else + c=(r+0x1F/BRIGHTNESS_VAL)<<11; + if((g + 0x3F/BRIGHTNESS_VAL) >0x3F) + c|=0x07E0; + else + c|=(g+0x3F/BRIGHTNESS_VAL)<<5; + if((b + 0x1F/BRIGHTNESS_VAL) >0x1F) + c|=0x0018; + else + c|=(b+0x1F/BRIGHTNESS_VAL)<<0; + tft_draw_line(button->base.x1+1,button->base.y1,button->base.x2-1,button->base.y1,c); //Nord + tft_draw_line(button->base.x1,button->base.y1+1,button->base.x1,button->base.y2-1,c);//West + if(r > (0x1F/BRIGHTNESS_VAL)) + c=(r-0x1F/BRIGHTNESS_VAL)<<11; + else + c=0x0000; + if(g > (0x3F/BRIGHTNESS_VAL)) + c|=(g-0x3F/BRIGHTNESS_VAL)<<5; + if(b > (0x1F/BRIGHTNESS_VAL)) + c|=(b-0x1F/BRIGHTNESS_VAL)<<0; + tft_draw_line(button->base.x1+1,button->base.y2,button->base.x2-1,button->base.y2,c); //Süd + tft_draw_line(button->base.x2,button->base.y1+1,button->base.x2,button->base.y2-1,c); //Ost + tftDrawBitmapUnscaledStreamedRaw(button->base.x1+(button->base.x2-button->base.x1+1-button->imgwidth)/2,button->base.y1+(button->base.y2-button->base.y1+1-button->imgheight)/2,button->imgwidth,button->imgheight,button->filename); +} +void guiRemoveBitmapButton(BITMAPBUTTON_STRUCT* button) +{ + touchUnregisterArea((TOUCH_AREA_STRUCT*)button); +} + +*/ diff --git a/common/gui/button.h b/common/gui/button.h new file mode 100644 index 0000000..1b347d4 --- /dev/null +++ b/common/gui/button.h @@ -0,0 +1,35 @@ + +typedef void (*BUTTON_CALLBACK)(void *button); //!< Function pointer used... +typedef struct { + TOUCH_AREA_STRUCT base; + uint16_t bgcolor; + BUTTON_CALLBACK callback; //Callback + uint16_t txtcolor; + uint8_t font; + const char *text; + +} BUTTON_STRUCT; +/* +typedef struct { + TOUCH_AREA_STRUCT base; + unsigned int bgcolor; + BUTTON_CALLBACK callback; //Callback + unsigned char imgwidth; + unsigned char imgheight; + char* filename; +} BITMAPBUTTON_STRUCT; +*/ +//Notice that the first 3 Members are Equal, so it's possible to cast it to a BUTTON_STRUCT even if it's a BITMAPBUTTON_STRUCT (when changeing only the first 3 Members). + +#define AUTO 0 + +bool gui_button_add(BUTTON_STRUCT* button); +void gui_button_remove(BUTTON_STRUCT* button); +void gui_button_redraw(BUTTON_STRUCT* button); + +/* +bool guiAddBitmapButton(BITMAPBUTTON_STRUCT* button); +void guiRemoveBitmapButton(BITMAPBUTTON_STRUCT* button); +void guiRedrawBitmapButton(BITMAPBUTTON_STRUCT* button); + +*/ From b300ac58905b43e1f9134e291e804918f8fc3fdf Mon Sep 17 00:00:00 2001 From: t-moe Date: Mon, 27 Apr 2015 21:28:05 +0200 Subject: [PATCH 3/8] Added Checkbox support --- common/app/app.c | 23 +++++++++-- common/gui/checkbox.c | 88 +++++++++++++++++++++++++++++++++++++++++++ common/gui/checkbox.h | 15 ++++++++ 3 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 common/gui/checkbox.c create mode 100644 common/gui/checkbox.h diff --git a/common/app/app.c b/common/app/app.c index d6cfd23..f333d78 100644 --- a/common/app/app.c +++ b/common/app/app.c @@ -3,6 +3,7 @@ #include "system.h" #include "touch.h" #include "button.h" +#include "checkbox.h" #include "pixy.h" #include #include @@ -43,8 +44,11 @@ void buttonCB(void* button) { printf("button pressed\n"); } +CHECKBOX_STRUCT c1; - +void checkboxCB(void *checkbox, bool checked) { + printf("Checkbox %s\n",(checked?"checked":"unchecked")); +} void app_init() { system_init(); @@ -73,8 +77,8 @@ void app_init() { tft_draw_rectangle(30,30,100,60,BLUE); tft_print_line(30, 30, RED, BLUE, 0, "Hallo");*/ - //b_alarm_ok - b1.base.x1=25; //Start X of Button + //button test + b1.base.x1=25; //Start X of Button b1.base.y1=45; //Start Y of Button b1.base.x2=AUTO; //b1.base.x1+160; //Auto Calculate X2 with String Width b1.base.y2=AUTO; //Auto Calculate Y2 with String Height @@ -85,6 +89,16 @@ void app_init() { b1.callback=buttonCB; //Call b1_cb as Callback gui_button_add(&b1); //Register Button (and run the callback from now on) + //Checkbox test + c1.base.x1=220; + c1.base.y1=45; + c1.base.x2=c1.base.x1+16; + c1.base.y2=c1.base.y1+16; + c1.fgcolor = GREEN; + c1.checked = true; + c1.callback = checkboxCB; + gui_checkbox_add(&c1); + } @@ -97,7 +111,8 @@ int pixy_frame_test(); void app_process() { system_process(); //Let the system handle it's pending events - gui_button_redraw(&b1); + //gui_button_redraw(&b1); + ///gui_checkbox_redraw(&c1); //Note: The only way to detect that pixy has been disconnected is if a command fails. There's no pixy_is_connected method yet :'( diff --git a/common/gui/checkbox.c b/common/gui/checkbox.c new file mode 100644 index 0000000..96325a6 --- /dev/null +++ b/common/gui/checkbox.c @@ -0,0 +1,88 @@ +#include "tft.h" +#include "touch.h" +#include "checkbox.h" +#include + +#define BRIGHTNESS_VAL 2 //How much the Brightness is in/decreased for checkbox shadows (3 -> Add 1/3 off Full Value) +#define ACTIVE_COLOR RGB(251,208,123) +#define BORDER_COLOR RGB(29,82,129) +#define BACKGROUND_COLOR WHITE + +void checkboxes_cb(void* touchArea, TOUCH_ACTION triggeredAction) +{ + TOUCH_AREA_STRUCT * area = (TOUCH_AREA_STRUCT*)touchArea; + CHECKBOX_STRUCT* checkbox = (CHECKBOX_STRUCT*)touchArea; + switch(triggeredAction) + { + case PEN_DOWN: + area->hookedActions=PEN_UP|PEN_LEAVE; + tft_draw_rectangle(checkbox->base.x1+1,checkbox->base.y1+1,checkbox->base.x2-1,checkbox->base.y2-1,ACTIVE_COLOR); + tft_draw_rectangle(checkbox->base.x1+2,checkbox->base.y1+2,checkbox->base.x2-2,checkbox->base.y2-2,ACTIVE_COLOR); + break; + case PEN_UP: + checkbox->checked=!checkbox->checked; + gui_checkbox_update(checkbox); + if(checkbox->callback!=NULL) + checkbox->callback(checkbox,checkbox->checked); + case PEN_LEAVE: + area->hookedActions=PEN_DOWN; + tft_draw_rectangle(checkbox->base.x1+1,checkbox->base.y1+1,checkbox->base.x2-1,checkbox->base.y2-1,BACKGROUND_COLOR); + tft_draw_rectangle(checkbox->base.x1+2,checkbox->base.y1+2,checkbox->base.x2-2,checkbox->base.y2-2,BACKGROUND_COLOR); + break; + default:break; + } +} + +bool gui_checkbox_add(CHECKBOX_STRUCT* checkbox) +{ + if(touch_have_empty(1)) + { + unsigned char size=0; + checkbox->base.hookedActions=PEN_DOWN; + checkbox->base.callback = checkboxes_cb; + if(checkbox->base.x2>checkbox->base.x1) + size = checkbox->base.x2 - checkbox->base.x1; + if(checkbox->base.y2>checkbox->base.y1) + { + if((checkbox->base.y2 - checkbox->base.y1)>size) + size = checkbox->base.y2 - checkbox->base.y1; + } + if((size&0x01)) + size++; + checkbox->base.x2 = checkbox->base.x1 + size; + checkbox->base.y2 = checkbox->base.y1 + size; + gui_checkbox_redraw(checkbox); + return touch_register_area(&checkbox->base); + } + return false; +} + +void gui_checkbox_redraw(CHECKBOX_STRUCT* checkbox) +{ + tft_fill_rectangle(checkbox->base.x1+1,checkbox->base.y1+1,checkbox->base.x2-1,checkbox->base.y2-1,BACKGROUND_COLOR); + tft_draw_rectangle(checkbox->base.x1,checkbox->base.y1,checkbox->base.x2,checkbox->base.y2,BORDER_COLOR); + if(checkbox->checked) + gui_checkbox_update(checkbox); +} + +void gui_checkbox_remove(CHECKBOX_STRUCT* checkbox) +{ + touch_unregister_area((TOUCH_AREA_STRUCT*)checkbox); +} + +void gui_checkbox_update(CHECKBOX_STRUCT* checkbox) +{ + unsigned int c = (checkbox->checked)? checkbox->fgcolor:BACKGROUND_COLOR; + unsigned int xcent = checkbox->base.x1+(checkbox->base.x2-checkbox->base.x1)*6/14; + unsigned int yleft = checkbox->base.y2 - (xcent- checkbox->base.x1) - 1 ; + unsigned int yright = checkbox->base.y2 - (checkbox->base.x2 - xcent) - 1 ; + unsigned int ybot = checkbox->base.y2 - 4; + tft_draw_line(checkbox->base.x1+3,yleft-1,xcent,ybot -1,c); + tft_draw_line(checkbox->base.x1+3,yleft,xcent,ybot ,c); + tft_draw_line(checkbox->base.x1+3,yleft+1,xcent,ybot + 1,c); + xcent++; + ybot--; + tft_draw_line(xcent,ybot-1,checkbox->base.x2-3,yright-1,c); + tft_draw_line(xcent,ybot,checkbox->base.x2-3,yright+0,c); + tft_draw_line(xcent,ybot+1,checkbox->base.x2-3,yright+1,c); +} diff --git a/common/gui/checkbox.h b/common/gui/checkbox.h new file mode 100644 index 0000000..1a063ab --- /dev/null +++ b/common/gui/checkbox.h @@ -0,0 +1,15 @@ + +typedef void (*CHECKBOX_CALLBACK)(void *checkbox, bool checked); //!< Function pointer used... +typedef struct { + TOUCH_AREA_STRUCT base; + uint16_t fgcolor; + bool checked; + CHECKBOX_CALLBACK callback; //Callback +} CHECKBOX_STRUCT; + + +bool gui_checkbox_add(CHECKBOX_STRUCT* checkbox); +void gui_checkbox_remove(CHECKBOX_STRUCT* checkbox); +void gui_checkbox_update(CHECKBOX_STRUCT* checkbox); +void gui_checkbox_redraw(CHECKBOX_STRUCT* checkbox); +#define CHECKBOX_WIN_FG_COLOR RGB(32,161,34) From cf72baaa3ad3b71c4e1a369008746f2762a4f1bf Mon Sep 17 00:00:00 2001 From: t-moe Date: Mon, 27 Apr 2015 23:37:54 +0200 Subject: [PATCH 4/8] Introduced a Screen (sub) module and divided app into multiple screens. --- common/app/app.c | 274 +---------------------------------- common/app/screen_guitest.c | 119 +++++++++++++++ common/app/screen_guitest.h | 3 + common/app/screen_main.c | 72 +++++++++ common/app/screen_main.h | 3 + common/app/screen_pixytest.c | 240 ++++++++++++++++++++++++++++++ common/app/screen_pixytest.h | 3 + common/gui/button.h | 11 +- common/gui/screen.c | 58 ++++++++ common/gui/screen.h | 25 ++++ common/touch/touch.h | 5 + 11 files changed, 541 insertions(+), 272 deletions(-) create mode 100644 common/app/screen_guitest.c create mode 100644 common/app/screen_guitest.h create mode 100644 common/app/screen_main.c create mode 100644 common/app/screen_main.h create mode 100644 common/app/screen_pixytest.c create mode 100644 common/app/screen_pixytest.h create mode 100644 common/gui/screen.c create mode 100644 common/gui/screen.h diff --git a/common/app/app.c b/common/app/app.c index f333d78..cb7bcf9 100644 --- a/common/app/app.c +++ b/common/app/app.c @@ -2,291 +2,23 @@ #include "tft.h" #include "system.h" #include "touch.h" -#include "button.h" -#include "checkbox.h" -#include "pixy.h" -#include -#include +#include "screen_main.h" -bool pixy_connected = false; - -/*TOUCH_AREA_STRUCT a1; - -void touchCB(void* touchArea, TOUCH_ACTION triggeredAction) { - - switch(triggeredAction) { - case PEN_DOWN: - printf("action PEN_DOWN\n"); - break; - - case PEN_UP: - printf("action PEN_UP\n"); - break; - case PEN_MOVE: - printf("action PEN_MOVE\n"); - break; - case PEN_ENTER: - printf("action PEN_ENTER\n"); - break; - case PEN_LEAVE: - printf("action PEN_LEAVE\n"); - break; - default: - printf("action %s\n",triggeredAction); - break; - } -}*/ - -BUTTON_STRUCT b1; - -void buttonCB(void* button) { - printf("button pressed\n"); -} - -CHECKBOX_STRUCT c1; - -void checkboxCB(void *checkbox, bool checked) { - printf("Checkbox %s\n",(checked?"checked":"unchecked")); -} - void app_init() { system_init(); tft_init(); touch_init(); - pixy_connected = (pixy_init()==0); //try to connect to pixy - - //only testwise - tft_clear(WHITE); - tft_draw_pixel(10,210,BLUE); - tft_draw_pixel(12,210,BLUE); - tft_draw_rectangle(40,210,60,235,BLUE); - tft_fill_rectangle(100,215,200,225,GREEN); - tft_draw_line(10,215,310,225,RGB(0xFF,0,0xFF)); - tft_draw_circle(10,10,100, RED); - - /*a1.hookedActions = PEN_DOWN | PEN_UP | PEN_MOVE | PEN_ENTER | PEN_LEAVE; - a1.x1 = 30; - a1.y1 = 30; - a1.x2 = 100; - a1.y2 = 60; - a1.callback = touchCB; - touch_register_area(&a1); - - tft_draw_rectangle(30,30,100,60,BLUE); - tft_print_line(30, 30, RED, BLUE, 0, "Hallo");*/ - - //button test - b1.base.x1=25; //Start X of Button - b1.base.y1=45; //Start Y of Button - b1.base.x2=AUTO; //b1.base.x1+160; //Auto Calculate X2 with String Width - b1.base.y2=AUTO; //Auto Calculate Y2 with String Height - b1.txtcolor=WHITE; //Set foreground color - b1.bgcolor=HEX(0xDE1010); //Set background color (Don't take 255 or 0 on at least one channel, to make shadows possible) - b1.font=0; //Select Font - b1.text="Hallo"; //Set Text (For formatted strings take sprintf) - b1.callback=buttonCB; //Call b1_cb as Callback - gui_button_add(&b1); //Register Button (and run the callback from now on) - - //Checkbox test - c1.base.x1=220; - c1.base.y1=45; - c1.base.x2=c1.base.x1+16; - c1.base.y2=c1.base.y1+16; - c1.fgcolor = GREEN; - c1.checked = true; - c1.callback = checkboxCB; - gui_checkbox_add(&c1); - + gui_screen_navigate(get_screen_main()); } - - -int pixy_led_test(); -int pixy_frame_test(); - //app event loop void app_process() { system_process(); //Let the system handle it's pending events - //gui_button_redraw(&b1); - ///gui_checkbox_redraw(&c1); - - //Note: The only way to detect that pixy has been disconnected is if a command fails. There's no pixy_is_connected method yet :'( - - if(!pixy_connected) { //Pixy not connected - pixy_close(); //Ensure that all pixy resources are freed (failsafe) - if(pixy_init()==0) { //try to connect to pixy - pixy_connected=true; - } - } - - if(pixy_connected) { - pixy_service(); //Send/receive event data from/to pixy failed - - //Code for tests see below - if(pixy_led_test()!=0) { - pixy_connected=false; - } - - /*if(pixy_frame_test()!=0) { - pixy_connected=false; - }*/ - system_delay(500); - } + gui_screen_update(); //update the currently active screen } -//----------------------------------------------------------------------------------------------------------------- - -int colorind; -const uint32_t colors [] = {0xFF0000, 0x00FF00,0x0000FF,0xFFFF00,0x00FFFF,0xFF00FF,0xFFFFFF,0x000000}; -const int num_colors = sizeof(colors)/sizeof(uint32_t); - -int pixy_led_test() { - if(colorind==0) { - pixy_led_set_max_current(5); - } - - int32_t response; - int return_value; - return_value = pixy_command("led_set", INT32(colors[colorind++]), END_OUT_ARGS, &response, END_IN_ARGS); - colorind%=num_colors; - - if(return_value!=0) { - colorind=0; //reset color ind, to start at zero when plugging pixy in again - } - - return return_value; -} - -//---------------------------------------------------------------------------------------------------------------------------- - -int renderBA81(uint8_t renderFlags, uint16_t width, uint16_t height, uint32_t frameLen, uint8_t *frame); - - -int pixy_frame_test() { - - uint8_t* videodata; - int32_t response; - int32_t fourccc; - int8_t renderflags; - uint16_t xwidth; - uint16_t ywidth; - uint32_t size; - - - int return_value = pixy_command("cam_getFrame", // String id for remote procedure - INT8(0x21), // mode - INT16(0), // xoffset - INT16(0), // yoffset - INT16(320), // width - INT16(200), // height - END_OUT_ARGS, // separator - &response, // pointer to mem address for return value - &fourccc, - &renderflags, - &xwidth, - &ywidth, - &size, - &videodata, // pointer to mem address for returned frame - END_IN_ARGS); - - if(return_value==0) { - return_value = renderBA81(renderflags,xwidth,ywidth,size,videodata); - } - - return return_value; -} - - - -void interpolateBayer(uint16_t width, uint16_t x, uint16_t y, uint8_t *pixel, uint8_t* r, uint8_t* g, uint8_t* b) -{ - if (y&1) - { - if (x&1) - { - *r = *pixel; - *g = (*(pixel-1)+*(pixel+1)+*(pixel+width)+*(pixel-width))>>2; - *b = (*(pixel-width-1)+*(pixel-width+1)+*(pixel+width-1)+*(pixel+width+1))>>2; - } - else - { - *r = (*(pixel-1)+*(pixel+1))>>1; - *g = *pixel; - *b = (*(pixel-width)+*(pixel+width))>>1; - } - } - else - { - if (x&1) - { - *r = (*(pixel-width)+*(pixel+width))>>1; - *g = *pixel; - *b = (*(pixel-1)+*(pixel+1))>>1; - } - else - { - *r = (*(pixel-width-1)+*(pixel-width+1)+*(pixel+width-1)+*(pixel+width+1))>>2; - *g = (*(pixel-1)+*(pixel+1)+*(pixel+width)+*(pixel-width))>>2; - *b = *pixel; - } - } - -} - - - -int renderBA81(uint8_t renderFlags, uint16_t width, uint16_t height, uint32_t frameLen, uint8_t *frame) -{ - uint16_t x, y; - uint8_t r, g, b; - - - // skip first line - frame += width; - - // don't render top and bottom rows, and left and rightmost columns because of color - // interpolation - //uint32_t decodedimage[(width-2)*(height-2)]; - uint16_t* decodedimage = malloc(sizeof(uint16_t)*(width-2)*(height-2)); - - if(decodedimage==NULL) { //not enough free space to decode image in memory - //decode & render image pixel by pixel - uint16_t* line = decodedimage; - for (y=1; y +#include "system.h" + +static bool pixy_connected = false; + + +static BUTTON_STRUCT b_back; + +static void b_back_cb(void* button) { + gui_screen_back(); +} + + +static void enter(void* screen) { + tft_clear(WHITE); + + //Back button + b_back.base.x1=10; //Start X of Button + b_back.base.y1=210; //Start Y of Button + b_back.base.x2=AUTO; //b_back.base.x1+160; //Auto Calculate X2 with String Width + b_back.base.y2=AUTO; //Auto Calculate Y2 with String Height + b_back.txtcolor=WHITE; //Set foreground color + b_back.bgcolor=HEX(0xAE1010); //Set background color (Don't take 255 or 0 on at least one channel, to make shadows possible) + b_back.font=0; //Select Font + b_back.text="Back"; //Set Text (For formatted strings take sprintf) + b_back.callback=b_back_cb; //Call b_back_cb as Callback + gui_button_add(&b_back); //Register Button (and run the callback from now on) + + + //Pixy stuff + pixy_connected = (pixy_init()==0); //try to connect to pixy + +} + +static void leave(void* screen) { + gui_button_remove(&b_back); +} + +int pixy_led_test(); +int pixy_frame_test(); + +static void update(void* screen) { + + //Note: The only way to detect that pixy has been disconnected is if a command fails. There's no pixy_is_connected method yet :'( + + if(!pixy_connected) { //Pixy not connected + pixy_close(); //Ensure that all pixy resources are freed (failsafe) + if(pixy_init()==0) { //try to connect to pixy + pixy_connected=true; + printf("pixy reinitialized\n"); + } + } + + if(pixy_connected) { + pixy_service(); //Send/receive event data from/to pixy failed + + //Code for tests see below + if(pixy_led_test()!=0) { + pixy_connected=false; + } + + if(pixy_frame_test()!=0) { + pixy_connected=false; + } + //system_delay(500); + } +} + + +static SCREEN_STRUCT screen = { + enter, + leave, + update +}; + + +SCREEN_STRUCT* get_screen_pixytest() { + return &screen; +} + + + +//----------------------------------------------------------------------------------------------------------------- + +int colorind; +const uint32_t colors [] = {0xFF0000, 0x00FF00,0x0000FF,0xFFFF00,0x00FFFF,0xFF00FF,0xFFFFFF,0x000000}; +const int num_colors = sizeof(colors)/sizeof(uint32_t); + +int pixy_led_test() { + if(colorind==0) { + pixy_led_set_max_current(5); + } + + int32_t response; + int return_value; + return_value = pixy_command("led_set", INT32(colors[colorind++]), END_OUT_ARGS, &response, END_IN_ARGS); + colorind%=num_colors; + + if(return_value!=0) { + colorind=0; //reset color ind, to start at zero when plugging pixy in again + } + + return return_value; +} + +//---------------------------------------------------------------------------------------------------------------------------- + +int renderBA81(uint8_t renderFlags, uint16_t width, uint16_t height, uint32_t frameLen, uint8_t *frame); + + +int pixy_frame_test() { + + uint8_t* videodata; + int32_t response; + int32_t fourccc; + int8_t renderflags; + uint16_t xwidth; + uint16_t ywidth; + uint32_t size; + + + int return_value = pixy_command("cam_getFrame", // String id for remote procedure + INT8(0x21), // mode + INT16(0), // xoffset + INT16(0), // yoffset + INT16(320), // width + INT16(200), // height + END_OUT_ARGS, // separator + &response, // pointer to mem address for return value + &fourccc, + &renderflags, + &xwidth, + &ywidth, + &size, + &videodata, // pointer to mem address for returned frame + END_IN_ARGS); + + if(return_value==0) { + return_value = renderBA81(renderflags,xwidth,ywidth,size,videodata); + } + + return return_value; +} + + + + +void interpolateBayer(uint16_t width, uint16_t x, uint16_t y, uint8_t *pixel, uint8_t* r, uint8_t* g, uint8_t* b) +{ + if (y&1) + { + if (x&1) + { + *r = *pixel; + *g = (*(pixel-1)+*(pixel+1)+*(pixel+width)+*(pixel-width))>>2; + *b = (*(pixel-width-1)+*(pixel-width+1)+*(pixel+width-1)+*(pixel+width+1))>>2; + } + else + { + *r = (*(pixel-1)+*(pixel+1))>>1; + *g = *pixel; + *b = (*(pixel-width)+*(pixel+width))>>1; + } + } + else + { + if (x&1) + { + *r = (*(pixel-width)+*(pixel+width))>>1; + *g = *pixel; + *b = (*(pixel-1)+*(pixel+1))>>1; + } + else + { + *r = (*(pixel-width-1)+*(pixel-width+1)+*(pixel+width-1)+*(pixel+width+1))>>2; + *g = (*(pixel-1)+*(pixel+1)+*(pixel+width)+*(pixel-width))>>2; + *b = *pixel; + } + } + +} + + + + + + +int renderBA81(uint8_t renderFlags, uint16_t width, uint16_t height, uint32_t frameLen, uint8_t *frame) +{ + uint16_t x, y; + uint8_t r, g, b; + + + // skip first line + frame += width; + + // don't render top and bottom rows, and left and rightmost columns because of color + // interpolation + //uint32_t decodedimage[(width-2)*(height-2)]; + uint16_t* decodedimage = malloc(sizeof(uint16_t)*(width-2)*(height-2)); + + if(decodedimage==NULL) { //not enough free space to decode image in memory + //decode & render image pixel by pixel + uint16_t* line = decodedimage; + for (y=1; yon_update(screen_current); + } +} + + + +bool gui_screen_navigate(SCREEN_STRUCT* screen) { + if(screen==NULL) return false; + screen->next = NULL; + if(screen_current!=NULL) { + screen_current->on_leave(screen_current); + screen_current->next = screen; + } else { + screen_list=screen; + } + screen->on_enter(screen); + screen_current = screen; + return true; +} + + + +bool gui_screen_back() { + if(screen_list==NULL) return false; + SCREEN_STRUCT* current = screen_list; + SCREEN_STRUCT* last = NULL; + while(current->next != NULL) { + last = current; + current = current->next; + } + if(last==NULL) return false; //There's only a single screen. + if(current!=screen_current) return false; //List corrupted? + current->on_leave(current); + last->next=NULL; + last->on_enter(last); + screen_current=last; + return true; +} + + + + + + + diff --git a/common/gui/screen.h b/common/gui/screen.h new file mode 100644 index 0000000..3689007 --- /dev/null +++ b/common/gui/screen.h @@ -0,0 +1,25 @@ +#ifndef SCREEN_H +#define SCREEN_H + + +#include +#include + +typedef void (*SCREEN_CALLBACK)(void* screen); //!< Function pointer used... + +typedef struct SCREEN_S{ + SCREEN_CALLBACK on_enter; + SCREEN_CALLBACK on_leave; + SCREEN_CALLBACK on_update; + + + struct SCREEN_S* next; //Used internally. do not modify + +} SCREEN_STRUCT; + +bool gui_screen_navigate(SCREEN_STRUCT* screen); +bool gui_screen_back(); +SCREEN_STRUCT* gui_screen_get_current(); +void gui_screen_update(); + +#endif /* SCREEN_H */ diff --git a/common/touch/touch.h b/common/touch/touch.h index 4fd5c25..329538b 100644 --- a/common/touch/touch.h +++ b/common/touch/touch.h @@ -1,3 +1,7 @@ +#ifndef TOUCH_H +#define TOUCH_H + + #include #include @@ -25,3 +29,4 @@ bool touch_register_area(TOUCH_AREA_STRUCT* area); void touch_unregister_area(TOUCH_AREA_STRUCT* area); +#endif /* TOUCH_H */ From 77e6d0e0617b3f26ca77f3c939f24059f1b3422d Mon Sep 17 00:00:00 2001 From: t-moe Date: Mon, 27 Apr 2015 23:59:00 +0200 Subject: [PATCH 5/8] Fixed screen implementation. --- common/gui/screen.c | 46 +++++++++++++++++++++++++++------------------ common/gui/screen.h | 8 ++++++++ 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/common/gui/screen.c b/common/gui/screen.c index 23c1498..a8a34ea 100644 --- a/common/gui/screen.c +++ b/common/gui/screen.c @@ -1,17 +1,36 @@ #include "screen.h" -static SCREEN_STRUCT* screen_list = NULL; -static SCREEN_STRUCT* screen_current = NULL; - +static volatile SCREEN_STRUCT* screen_list = NULL; +static volatile SCREEN_STRUCT* screen_current = NULL; +static volatile SCREEN_STRUCT* screen_goto = NULL; SCREEN_STRUCT* gui_screen_get_current() { return screen_current; } void gui_screen_update() { - if(screen_current!=NULL) { - screen_current->on_update(screen_current); + if(screen_goto!=NULL) { //we received the task to switch the screen + SCREEN_STRUCT* go = screen_goto; //Backup volatile variable + screen_goto=NULL; + if(go->next!=NULL) { //we're going back + if(go->next!=screen_current) return; //list corrupted? + screen_current->on_leave(screen_current); + go->next=NULL; + } else { //we're going forward + if(screen_current!=NULL) { //this is not the first screen + screen_current->on_leave(screen_current); + screen_current->next = go; + } else { //first screen ever seen + screen_list=go; + } + } + go->on_enter(go); + screen_current = go; + } + + if(screen_current!=NULL) { //A screen has been set + screen_current->on_update(screen_current); //Update current screen } } @@ -20,14 +39,7 @@ void gui_screen_update() { bool gui_screen_navigate(SCREEN_STRUCT* screen) { if(screen==NULL) return false; screen->next = NULL; - if(screen_current!=NULL) { - screen_current->on_leave(screen_current); - screen_current->next = screen; - } else { - screen_list=screen; - } - screen->on_enter(screen); - screen_current = screen; + screen_goto=screen; //send message to main loop, to switch the screen return true; } @@ -37,17 +49,15 @@ bool gui_screen_back() { if(screen_list==NULL) return false; SCREEN_STRUCT* current = screen_list; SCREEN_STRUCT* last = NULL; + //Find second last element in list while(current->next != NULL) { last = current; current = current->next; } if(last==NULL) return false; //There's only a single screen. if(current!=screen_current) return false; //List corrupted? - current->on_leave(current); - last->next=NULL; - last->on_enter(last); - screen_current=last; - return true; + screen_goto=last; //send message to main loop, to switch the screen + return true; } diff --git a/common/gui/screen.h b/common/gui/screen.h index 3689007..375ccbf 100644 --- a/common/gui/screen.h +++ b/common/gui/screen.h @@ -17,9 +17,17 @@ typedef struct SCREEN_S{ } SCREEN_STRUCT; + +//Navigate to the given string as soon as the app enters the main loop again. Method can be called from an interrupt bool gui_screen_navigate(SCREEN_STRUCT* screen); + +//Navigate one screen back as soon as the app enters the main loop again. Method can be called from an interrupt bool gui_screen_back(); + +//Returns the current active screen SCREEN_STRUCT* gui_screen_get_current(); + +//Updates/switches the screens. Call this from the app main loop, as fast as you can. void gui_screen_update(); #endif /* SCREEN_H */ From 76ea9d89727ffd88cd4f78e289837119d61a7c6d Mon Sep 17 00:00:00 2001 From: t-moe Date: Thu, 30 Apr 2015 23:22:30 +0200 Subject: [PATCH 6/8] Added num up down support. --- common/app/screen_guitest.c | 20 +++++- common/gui/numupdown.c | 121 ++++++++++++++++++++++++++++++++++++ common/gui/numupdown.h | 22 +++++++ common/tft/tft.c | 12 +++- common/tft/tft.h | 1 + 5 files changed, 170 insertions(+), 6 deletions(-) create mode 100644 common/gui/numupdown.c create mode 100644 common/gui/numupdown.h diff --git a/common/app/screen_guitest.c b/common/app/screen_guitest.c index f4f40cd..d2d93e3 100644 --- a/common/app/screen_guitest.c +++ b/common/app/screen_guitest.c @@ -2,11 +2,12 @@ #include "button.h" #include "tft.h" #include "checkbox.h" - +#include "numupdown.h" static BUTTON_STRUCT b_back; static TOUCH_AREA_STRUCT a_area; static CHECKBOX_STRUCT c_cbox; +static NUMUPDOWN_STRUCT n_updown; static void checkboxCB(void *checkbox, bool checked) { printf("Checkbox %s\n",(checked?"checked":"unchecked")); @@ -16,6 +17,10 @@ static void b_back_cb(void* button) { gui_screen_back(); } +static void n_updown_cb(void* numupdown, int16_t value) { + printf("New NumUpDown Value %d\n",value); +} + static void touchCB(void* touchArea, TOUCH_ACTION triggeredAction) { switch(triggeredAction) { @@ -87,15 +92,24 @@ static void enter(void* screen) { c_cbox.checked = true; c_cbox.callback = checkboxCB; gui_checkbox_add(&c_cbox); + - - + //Num up down test + n_updown.x=200; + n_updown.y=120; + n_updown.fgcolor=RED; + n_updown.value = -3; + n_updown.max=11; + n_updown.min =-5; + n_updown.callback=n_updown_cb; + gui_numupdown_add(&n_updown); } static void leave(void* screen) { gui_button_remove(&b_back); gui_checkbox_remove(&c_cbox); + gui_numupdown_remove(&n_updown); touch_unregister_area(&a_area); } diff --git a/common/gui/numupdown.c b/common/gui/numupdown.c new file mode 100644 index 0000000..15ea0a8 --- /dev/null +++ b/common/gui/numupdown.c @@ -0,0 +1,121 @@ +#include "tft.h" +#include "touch.h" +#include "button.h" +#include "numupdown.h" +#include //for sprintf +#include //for offsetof macro +#include //for abs + + +#define BASE_COLOR RGB(90,90,90) +void button_up_cb(void* button) +{ + NUMUPDOWN_STRUCT* element = button-offsetof(NUMUPDOWN_STRUCT,buttonUp); + if(element->valuemax) { + element->value++; + gui_numupdown_update(element); + if(element->callback!=NULL) { + element->callback(element,element->value); + } + } +} + +void button_down_cb(void* button) +{ + NUMUPDOWN_STRUCT* element = button-offsetof(NUMUPDOWN_STRUCT,buttonDown); + if(element->value>element->min) { + element->value--; + gui_numupdown_update(element); + if(element->callback!=NULL) { + element->callback(element,element->value); + } + } +} + + +static uint8_t calc_text_width(int16_t val) { + uint8_t width = 1 + (val<0); //1 if positive, 2 if negative (to let space for sign) + val=abs(val); + while(val>=10) { + val/=10; + width++; + } + return width; +} + + +bool gui_numupdown_add(NUMUPDOWN_STRUCT* numupdown) +{ + if(touch_have_empty(2)) //We require 2 TouchAreas (for Buttons) + { + if(numupdown->min > numupdown->max) return false; + + if(numupdown->value > numupdown->max) { + numupdown->value = numupdown->max; + } + if(numupdown->value < numupdown->min) { + numupdown->value = numupdown->min; + } else if(numupdown->value > numupdown->max) { + numupdown->value = numupdown->max; + } + + uint8_t tw1 = calc_text_width(numupdown->max); + uint8_t tw2 = calc_text_width(numupdown->min); + if(tw2 > tw1) tw1 = tw2; + uint8_t width= tft_font_width(0)*(tw1+1); + + numupdown->buttonUp.base.x1=numupdown->x; + numupdown->buttonUp.base.y1=numupdown->y; + numupdown->buttonUp.base.x2=numupdown->x+width; + numupdown->buttonUp.base.y2=AUTO; + numupdown->buttonUp.text="+"; + numupdown->buttonUp.font=0; + numupdown->buttonUp.bgcolor=BASE_COLOR; + numupdown->buttonUp.txtcolor=WHITE; + numupdown->buttonUp.callback = button_up_cb; + gui_button_add(&numupdown->buttonUp); + numupdown->buttonDown.base.x1=numupdown->x; + numupdown->buttonDown.base.y1=numupdown->buttonUp.base.y2+2*tft_font_height(0); + numupdown->buttonDown.base.x2=numupdown->x+width; + numupdown->buttonDown.base.y2=AUTO; + numupdown->buttonDown.text="-"; + numupdown->buttonDown.font=0; + numupdown->buttonDown.bgcolor=BASE_COLOR; + numupdown->buttonDown.txtcolor=WHITE; + numupdown->buttonDown.callback = button_down_cb; + gui_button_add(&numupdown->buttonDown); + + tft_fill_rectangle(numupdown->x,numupdown->buttonUp.base.y2+1,numupdown->x+width,numupdown->buttonDown.base.y1-1,BASE_COLOR); + tft_print_formatted(numupdown->x+tft_font_width(0)/2,numupdown->buttonUp.base.y2+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); + + return true; + } + return false; + } + +void gui_numupdown_remove(NUMUPDOWN_STRUCT* numupdown) + { + gui_button_remove(&numupdown->buttonUp); + gui_button_remove(&numupdown->buttonDown); + } + +void gui_numupdown_update(NUMUPDOWN_STRUCT* numupdown) + { + + + uint8_t tw1 = calc_text_width(numupdown->max); + uint8_t tw2 = calc_text_width(numupdown->min); + if(tw2 > tw1) tw1 = tw2; + uint8_t width= tft_font_width(0)*(tw1+1); + + + tft_fill_rectangle(numupdown->x,numupdown->buttonUp.base.y2+1,numupdown->x+width,numupdown->buttonDown.base.y1-1,BASE_COLOR); + tft_print_formatted(numupdown->x+tft_font_width(0)/2,numupdown->buttonUp.base.y2+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); + } + + void gui_numupdown_redraw(NUMUPDOWN_STRUCT* numupdown) + { + gui_button_redraw(&numupdown->buttonUp); + gui_button_redraw(&numupdown->buttonDown); + gui_numupdown_update(numupdown); + } diff --git a/common/gui/numupdown.h b/common/gui/numupdown.h new file mode 100644 index 0000000..09a4abb --- /dev/null +++ b/common/gui/numupdown.h @@ -0,0 +1,22 @@ +#include "button.h" + +typedef void (*NUMUPDOWN_CALLBACK)(void *numupdown, int16_t value); //!< Function pointer used... +typedef struct { + uint16_t x; + uint16_t y; + uint16_t fgcolor; + int16_t value; + int16_t min; + int16_t max; + NUMUPDOWN_CALLBACK callback; //Callback + + //Internally used: + BUTTON_STRUCT buttonUp; + BUTTON_STRUCT buttonDown; +} NUMUPDOWN_STRUCT; + + +bool gui_numupdown_add(NUMUPDOWN_STRUCT* numupdown); +void gui_numupdown_remove(NUMUPDOWN_STRUCT* numupdown); +void gui_numupdown_update(NUMUPDOWN_STRUCT* numupdown); +void gui_numupdown_redraw(NUMUPDOWN_STRUCT* numupdown); diff --git a/common/tft/tft.c b/common/tft/tft.c index 4522a20..67fc977 100644 --- a/common/tft/tft.c +++ b/common/tft/tft.c @@ -1,9 +1,7 @@ #include "tft.h" #include "ll_tft.h" #include - - -//it might seems pointless to forward all the functions but we might also introduce functions which have some logic here +#include bool tft_init() { return ll_tft_init(); @@ -60,3 +58,11 @@ void tft_print_line(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, ui } } +void tft_print_formatted(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, const char* format, ...) { + static char buffer[256]; //not sure if that's the best solution. It would propbably better to implement putchar and use vprintf + va_list args; + va_start (args, format); + vsprintf(buffer,format,args); + tft_print_line(x,y,color,bgcolor,font,buffer); + va_end(args); +} diff --git a/common/tft/tft.h b/common/tft/tft.h index 558f88e..42484a8 100644 --- a/common/tft/tft.h +++ b/common/tft/tft.h @@ -26,3 +26,4 @@ uint8_t tft_num_fonts(); uint8_t tft_font_height(uint8_t fontnum); uint8_t tft_font_width(uint8_t fontnum); void tft_print_line(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, const char* text); +void tft_print_formatted(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, uint8_t font, const char* format, ...); From b491b7858945198a46454a8fa42f083d76820632 Mon Sep 17 00:00:00 2001 From: t-moe Date: Thu, 30 Apr 2015 23:39:07 +0200 Subject: [PATCH 7/8] Made numupdown horizontal --- common/gui/numupdown.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/common/gui/numupdown.c b/common/gui/numupdown.c index 15ea0a8..a6c8024 100644 --- a/common/gui/numupdown.c +++ b/common/gui/numupdown.c @@ -64,29 +64,29 @@ bool gui_numupdown_add(NUMUPDOWN_STRUCT* numupdown) if(tw2 > tw1) tw1 = tw2; uint8_t width= tft_font_width(0)*(tw1+1); - numupdown->buttonUp.base.x1=numupdown->x; - numupdown->buttonUp.base.y1=numupdown->y; - numupdown->buttonUp.base.x2=numupdown->x+width; - numupdown->buttonUp.base.y2=AUTO; - numupdown->buttonUp.text="+"; - numupdown->buttonUp.font=0; - numupdown->buttonUp.bgcolor=BASE_COLOR; - numupdown->buttonUp.txtcolor=WHITE; - numupdown->buttonUp.callback = button_up_cb; - gui_button_add(&numupdown->buttonUp); numupdown->buttonDown.base.x1=numupdown->x; - numupdown->buttonDown.base.y1=numupdown->buttonUp.base.y2+2*tft_font_height(0); - numupdown->buttonDown.base.x2=numupdown->x+width; - numupdown->buttonDown.base.y2=AUTO; + numupdown->buttonDown.base.y1=numupdown->y; + numupdown->buttonDown.base.x2=AUTO; + numupdown->buttonDown.base.y2=numupdown->y+tft_font_height(0)*2; numupdown->buttonDown.text="-"; numupdown->buttonDown.font=0; numupdown->buttonDown.bgcolor=BASE_COLOR; numupdown->buttonDown.txtcolor=WHITE; numupdown->buttonDown.callback = button_down_cb; gui_button_add(&numupdown->buttonDown); + numupdown->buttonUp.base.x1=numupdown->buttonDown.base.x2+width+2; + numupdown->buttonUp.base.y1=numupdown->y; + numupdown->buttonUp.base.x2=AUTO; + numupdown->buttonUp.base.y2=numupdown->y +tft_font_height(0)*2; + numupdown->buttonUp.text="+"; + numupdown->buttonUp.font=0; + numupdown->buttonUp.bgcolor=BASE_COLOR; + numupdown->buttonUp.txtcolor=WHITE; + numupdown->buttonUp.callback = button_up_cb; + gui_button_add(&numupdown->buttonUp); - tft_fill_rectangle(numupdown->x,numupdown->buttonUp.base.y2+1,numupdown->x+width,numupdown->buttonDown.base.y1-1,BASE_COLOR); - tft_print_formatted(numupdown->x+tft_font_width(0)/2,numupdown->buttonUp.base.y2+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); + tft_fill_rectangle(numupdown->buttonDown.base.x2+2,numupdown->y,numupdown->buttonDown.base.x2+width,numupdown->buttonUp.base.y2,BASE_COLOR); + tft_print_formatted(numupdown->buttonDown.base.x2+2+tft_font_width(0)/2,numupdown->y+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); return true; } @@ -108,9 +108,8 @@ void gui_numupdown_update(NUMUPDOWN_STRUCT* numupdown) if(tw2 > tw1) tw1 = tw2; uint8_t width= tft_font_width(0)*(tw1+1); - - tft_fill_rectangle(numupdown->x,numupdown->buttonUp.base.y2+1,numupdown->x+width,numupdown->buttonDown.base.y1-1,BASE_COLOR); - tft_print_formatted(numupdown->x+tft_font_width(0)/2,numupdown->buttonUp.base.y2+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); + tft_fill_rectangle(numupdown->buttonDown.base.x2+2,numupdown->y,numupdown->buttonDown.base.x2+width,numupdown->buttonUp.base.y2,BASE_COLOR); + tft_print_formatted(numupdown->buttonDown.base.x2+2+tft_font_width(0)/2,numupdown->y+tft_font_height(0)/2,numupdown->fgcolor,BASE_COLOR,0,"%*d",tw1,numupdown->value); } void gui_numupdown_redraw(NUMUPDOWN_STRUCT* numupdown) From 328161602609e2b1f82fbf9897ee4002f77df6ce Mon Sep 17 00:00:00 2001 From: t-moe Date: Sat, 2 May 2015 11:58:44 +0200 Subject: [PATCH 8/8] Added some more touch functions. Improved pixy test. Drag the Image around! --- common/app/screen_pixytest.c | 61 ++++++++++++++++++++++++++++++++++-- common/touch/touch.c | 16 +++++++--- common/touch/touch.h | 15 ++++++--- 3 files changed, 81 insertions(+), 11 deletions(-) diff --git a/common/app/screen_pixytest.c b/common/app/screen_pixytest.c index 5f07c69..9c2709b 100644 --- a/common/app/screen_pixytest.c +++ b/common/app/screen_pixytest.c @@ -1,19 +1,57 @@ #include "screen_pixytest.h" #include "button.h" #include "tft.h" +#include "touch.h" #include "pixy.h" #include #include "system.h" -static bool pixy_connected = false; +static volatile bool pixy_connected = false; static BUTTON_STRUCT b_back; +static TOUCH_AREA_STRUCT a_area; static void b_back_cb(void* button) { gui_screen_back(); } +POINT_STRUCT pixy_pos; +POINT_STRUCT old_pos; +static void touchCB(void* touchArea, TOUCH_ACTION triggeredAction) { + POINT_STRUCT p = touch_get_last_point(); + switch(triggeredAction) { + case PEN_ENTER: + case PEN_DOWN: + old_pos = p; + break; + case PEN_MOVE: + { + int16_t deltaX = p.x - old_pos.x; + int16_t deltaY = p.y - old_pos.y; + old_pos=p; + printf("%d %d\n",deltaX,deltaY); + if(pixy_connected) { + int16_t new_x = pixy_pos.x+deltaX*2; + int16_t new_y = pixy_pos.y-deltaY*2; + if(new_x<0) new_x=0; + if(new_x>1000) new_x=1000; + if(new_y<0) new_y=0; + if(new_y>1000) new_y=1000; + pixy_pos.x = new_x; + pixy_pos.y= new_y; + } + } + break; + case PEN_UP: + case PEN_LEAVE: + printf("Leave/up\n"); + default: break; + } + + +} + static void enter(void* screen) { tft_clear(WHITE); @@ -30,14 +68,27 @@ static void enter(void* screen) { b_back.callback=b_back_cb; //Call b_back_cb as Callback gui_button_add(&b_back); //Register Button (and run the callback from now on) + //Area test + a_area.hookedActions = PEN_DOWN | PEN_MOVE | PEN_ENTER | PEN_UP | PEN_LEAVE; + a_area.x1 = 0; + a_area.y1 = 0; + a_area.x2 = 317; + a_area.y2 = 197; + a_area.callback = touchCB; + touch_register_area(&a_area); + + //Pixy stuff pixy_connected = (pixy_init()==0); //try to connect to pixy - + if(pixy_connected) { + pixy_pos.x=pixy_pos.y=500; + } } static void leave(void* screen) { gui_button_remove(&b_back); + touch_unregister_area(&a_area); } int pixy_led_test(); @@ -51,6 +102,7 @@ static void update(void* screen) { pixy_close(); //Ensure that all pixy resources are freed (failsafe) if(pixy_init()==0) { //try to connect to pixy pixy_connected=true; + pixy_pos.x=pixy_pos.y=500; printf("pixy reinitialized\n"); } } @@ -66,6 +118,11 @@ static void update(void* screen) { if(pixy_frame_test()!=0) { pixy_connected=false; } + + + pixy_rcs_set_position(0,pixy_pos.x); + pixy_rcs_set_position(1,pixy_pos.y); + //system_delay(500); } } diff --git a/common/touch/touch.c b/common/touch/touch.c index dbecbc6..ad8c589 100644 --- a/common/touch/touch.c +++ b/common/touch/touch.c @@ -5,8 +5,7 @@ #define NUM_AREAS 50 //Number of Structs Reserved in Memory for TouchAreas (e.g Buttons) TOUCH_AREA_STRUCT* areas[NUM_AREAS] = {NULL}; -volatile int touchY=0; //Last Y Coordinate in pixels -volatile int touchX=0; //Last X Coordinate in pixels +volatile POINT_STRUCT pos; volatile TOUCH_STATE oldState=TOUCH_UP; bool touch_init() { @@ -14,12 +13,12 @@ bool touch_init() { } -bool touch_add_raw_event(uint16_t x, uint16_t y, TOUCH_STATE state) { +bool touch_add_raw_event(uint16_t touchX, uint16_t touchY, TOUCH_STATE state) { bool penDown = (state==TOUCH_DOWN); bool oldPenDown = (oldState==TOUCH_DOWN); oldState=state; - uint16_t touchX = x; - uint16_t touchY = y; + pos.x=touchX; + pos.y=touchY; if(penDown) { // tftDrawPixel(touchX,touchY,WHITE); @@ -127,3 +126,10 @@ void touch_unregister_area(TOUCH_AREA_STRUCT* area)//Unregisters an Area } } } + + +POINT_STRUCT touch_get_last_point() { + return pos; +} + + diff --git a/common/touch/touch.h b/common/touch/touch.h index 329538b..603a83a 100644 --- a/common/touch/touch.h +++ b/common/touch/touch.h @@ -13,20 +13,27 @@ typedef void (*TOUCH_CALLBACK)(void* touchArea, TOUCH_ACTION triggeredAction); typedef struct { TOUCH_ACTION hookedActions; //Actions to listen to - unsigned int x1; //Top Left X Coordiate of Area - unsigned int y1; //Top Left Y Coordiate of Area - unsigned int x2; //Bottom Right X Coordiate of Area - unsigned int y2; //Bottom Right Y Coordiate of Area + uint16_t x1; //Top Left X Coordiate of Area + uint16_t y1; //Top Left Y Coordiate of Area + uint16_t x2; //Bottom Right X Coordiate of Area + uint16_t y2; //Bottom Right Y Coordiate of Area TOUCH_CALLBACK callback; //Callback uint8_t flags; //Internal Used, don't change } TOUCH_AREA_STRUCT; +typedef struct { + uint16_t x; + uint16_t y; +} POINT_STRUCT; + + bool touch_init(); bool touch_add_raw_event(uint16_t x, uint16_t y,TOUCH_STATE state); bool touch_have_empty(unsigned char num); bool touch_register_area(TOUCH_AREA_STRUCT* area); void touch_unregister_area(TOUCH_AREA_STRUCT* area); +POINT_STRUCT touch_get_last_point(); #endif /* TOUCH_H */