uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

added wheel as GUI type

Browse source
This commit is contained in:
Tectu 2012-06-26 21:43:21 +02:00
parent f4917beb6a
commit a1cc224472
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gui.c
View file

@ -103,6 +103,11 @@ static void guiThread(const uint16_t interval) {
} }
// we got a wheel
if(node->type == wheel) {
}
// we got a keymatrix // we got a keymatrix
if(node->type == keymatrix) { if(node->type == keymatrix) {
@ -129,11 +134,11 @@ uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *
if(newNode == NULL) if(newNode == NULL)
return 0; return 0;
newNode->type = button;
newNode->x0 = x0; newNode->x0 = x0;
newNode->y0 = y0; newNode->y0 = y0;
newNode->x1 = x1; newNode->x1 = x1;
newNode->y1 = y1; newNode->y1 = y1;
newNode->type = button;
newNode->name = str; newNode->name = str;
newNode->active = active; newNode->active = active;
newNode->state = state; newNode->state = state;
@ -148,3 +153,29 @@ uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *
return 1; return 1;
} }
uint8_t guiDrawSlider(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t orientation, uint16_t frameColor, uint16_t bkColor, uint16_t valueColor, uint8_t *active, uint8_t *value) {
struct guiNode_t *newNode;
newNode = chHeapAlloc(NULL, sizeof(struct guiNode_t));
if(newNode == NULL)
return 0;
newNode->type = slider;
newNode->x0 = x0;
newNode->y0 = y0;
newNode->x1 = x1;
newNode->y1 = y1;
newNode->state = value;
newNode->active = active;
newNode->orientation = orientation;
if(addNode(newNode) != 1)
return 0;
// lcdDraw functions
chHeapFree(newNode);
return 1;
}

5
gui.h
View file

@ -12,6 +12,7 @@ static struct guiNode_t {
uint16_t y0; uint16_t y0;
uint16_t x1; uint16_t x1;
uint16_t y1; uint16_t y1;
uint8_t orientation;
uint8_t *active; uint8_t *active;
uint8_t *state; uint8_t *state;
char *name; char *name;
@ -22,7 +23,7 @@ static struct guiNode_t {
extern "C" { extern "C" {
#endif #endif
enum {button, slider, keymatrix}; enum {button, slider, wheel, keymatrix};
enum {horizontal, vertical}; enum {horizontal, vertical};
enum {inactive, active}; enum {inactive, active};
@ -59,6 +60,8 @@ void guiPrintNode(BaseSequentialStream *chp);
*/ */
uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *str, uint16_t fontColor, uint16_t buttonColor, uint8_t *active, uint8_t *state); uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *str, uint16_t fontColor, uint16_t buttonColor, uint8_t *active, uint8_t *state);
uint8_t guiDrawSlider(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t orientation, uint16_t frameColor, uint16_t bkColor, uint16_t valueColor, uint8_t *active, uint8_t *value);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif