MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Color UI circular task queue (#19918)

Browse Source
This commit is contained in:
Victor Oliveira 2020-10-27 23:54:30 -03:00 committed by Scott Lahteine
parent 2a4cdf5a5d
commit d08511c5dc
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Marlin/src/lcd/tft/tft_queue.cpp
View File

@ -32,6 +32,7 @@ uint8_t TFT_Queue::queue[];
uint8_t *TFT_Queue::end_of_queue = queue; uint8_t *TFT_Queue::end_of_queue = queue;
uint8_t *TFT_Queue::current_task = nullptr; uint8_t *TFT_Queue::current_task = nullptr;
uint8_t *TFT_Queue::last_task = nullptr; uint8_t *TFT_Queue::last_task = nullptr;
uint8_t *TFT_Queue::last_parameter = nullptr;
void TFT_Queue::reset() { void TFT_Queue::reset() {
tft.abort(); tft.abort();
@ -39,6 +40,7 @@ void TFT_Queue::reset() {
end_of_queue = queue; end_of_queue = queue;
current_task = nullptr; current_task = nullptr;
last_task = nullptr; last_task = nullptr;
last_parameter = nullptr;
} }
void TFT_Queue::async() { void TFT_Queue::async() {
@ -113,49 +115,28 @@ void TFT_Queue::canvas(queueTask_t *task) {
switch (*item) { switch (*item) {
case CANVAS_SET_BACKGROUND: case CANVAS_SET_BACKGROUND:
Canvas.SetBackground(((parametersCanvasBackground_t *)item)->color); Canvas.SetBackground(((parametersCanvasBackground_t *)item)->color);
item += sizeof(parametersCanvasBackground_t);
break; break;
case CANVAS_ADD_TEXT: case CANVAS_ADD_TEXT:
Canvas.AddText(((parametersCanvasText_t *)item)->x, ((parametersCanvasText_t *)item)->y, ((parametersCanvasText_t *)item)->color, item + sizeof(parametersCanvasText_t), ((parametersCanvasText_t *)item)->maxWidth); Canvas.AddText(((parametersCanvasText_t *)item)->x, ((parametersCanvasText_t *)item)->y, ((parametersCanvasText_t *)item)->color, item + sizeof(parametersCanvasText_t), ((parametersCanvasText_t *)item)->maxWidth);
item += sizeof(parametersCanvasText_t) + ((parametersCanvasText_t *)item)->stringLength;
break; break;
case CANVAS_ADD_IMAGE: case CANVAS_ADD_IMAGE:
MarlinImage image; MarlinImage image;
uint16_t *colors; uint16_t *colors;
colorMode_t color_mode;
image = ((parametersCanvasImage_t *)item)->image; image = ((parametersCanvasImage_t *)item)->image;
colors = (uint16_t *)(item + sizeof(parametersCanvasImage_t)); colors = (uint16_t *)(item + sizeof(parametersCanvasImage_t));
Canvas.AddImage(((parametersCanvasImage_t *)item)->x, ((parametersCanvasImage_t *)item)->y, image, colors); Canvas.AddImage(((parametersCanvasImage_t *)item)->x, ((parametersCanvasImage_t *)item)->y, image, colors);
item = (uint8_t *)colors;
color_mode = Images[image].colorMode;
switch (color_mode) {
case GREYSCALE1:
item += sizeof(uint16_t);
break;
case GREYSCALE2:
item += sizeof(uint16_t) * 3;
break;
case GREYSCALE4:
item += sizeof(uint16_t) * 15;
break;
default:
break;
}
break; break;
case CANVAS_ADD_BAR: case CANVAS_ADD_BAR:
Canvas.AddBar(((parametersCanvasBar_t *)item)->x, ((parametersCanvasBar_t *)item)->y, ((parametersCanvasBar_t *)item)->width, ((parametersCanvasBar_t *)item)->height, ((parametersCanvasBar_t *)item)->color); Canvas.AddBar(((parametersCanvasBar_t *)item)->x, ((parametersCanvasBar_t *)item)->y, ((parametersCanvasBar_t *)item)->width, ((parametersCanvasBar_t *)item)->height, ((parametersCanvasBar_t *)item)->color);
item += sizeof(parametersCanvasBar_t);
break; break;
case CANVAS_ADD_RECTANGLE: case CANVAS_ADD_RECTANGLE:
Canvas.AddRectangle(((parametersCanvasRectangle_t *)item)->x, ((parametersCanvasRectangle_t *)item)->y, ((parametersCanvasRectangle_t *)item)->width, ((parametersCanvasRectangle_t *)item)->height, ((parametersCanvasRectangle_t *)item)->color); Canvas.AddRectangle(((parametersCanvasRectangle_t *)item)->x, ((parametersCanvasRectangle_t *)item)->y, ((parametersCanvasRectangle_t *)item)->width, ((parametersCanvasRectangle_t *)item)->height, ((parametersCanvasRectangle_t *)item)->color);
item += sizeof(parametersCanvasRectangle_t);
break; break;
} }
item = ((parametersCanvasBackground_t *)item)->nextParameter;
} }
if (Canvas.ToScreen()) task->state = TASK_STATE_COMPLETED; if (Canvas.ToScreen()) task->state = TASK_STATE_COMPLETED;
@ -172,6 +153,7 @@ void TFT_Queue::fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, ui
parametersFill_t *task_parameters = (parametersFill_t *)end_of_queue; parametersFill_t *task_parameters = (parametersFill_t *)end_of_queue;
end_of_queue += sizeof(parametersFill_t); end_of_queue += sizeof(parametersFill_t);
last_parameter = end_of_queue;
task_parameters->x = x; task_parameters->x = x;
task_parameters->y = y; task_parameters->y = y;
task_parameters->width = width; task_parameters->width = width;
@ -201,6 +183,7 @@ void TFT_Queue::canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height)
parametersCanvas_t *task_parameters = (parametersCanvas_t *)end_of_queue; parametersCanvas_t *task_parameters = (parametersCanvas_t *)end_of_queue;
end_of_queue += sizeof(parametersCanvas_t); end_of_queue += sizeof(parametersCanvas_t);
last_parameter = end_of_queue;
task_parameters->x = x; task_parameters->x = x;
task_parameters->y = y; task_parameters->y = y;
task_parameters->width = width; task_parameters->width = width;
@ -211,19 +194,33 @@ void TFT_Queue::canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height)
} }
void TFT_Queue::set_background(uint16_t color) { void TFT_Queue::set_background(uint16_t color) {
handle_queue_overflow(sizeof(parametersCanvasBackground_t));
parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t)); parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
parametersCanvasBackground_t *parameters = (parametersCanvasBackground_t *)end_of_queue; parametersCanvasBackground_t *parameters = (parametersCanvasBackground_t *)end_of_queue;
last_parameter = end_of_queue;
parameters->type = CANVAS_SET_BACKGROUND; parameters->type = CANVAS_SET_BACKGROUND;
parameters->color = color; parameters->color = color;
end_of_queue += sizeof(parametersCanvasBackground_t); end_of_queue += sizeof(parametersCanvasBackground_t);
task_parameters->count++; task_parameters->count++;
parameters->nextParameter = end_of_queue;
}
#define QUEUE_SAFETY_FREE_SPACE 100
void TFT_Queue::handle_queue_overflow(uint16_t sizeNeeded) {
if (uintptr_t(end_of_queue) + sizeNeeded + (QUEUE_SAFETY_FREE_SPACE) - uintptr_t(queue) >= QUEUE_SIZE) {
end_of_queue = queue;
((parametersCanvasText_t *)last_parameter)->nextParameter = end_of_queue;
}
} }
void TFT_Queue::add_text(uint16_t x, uint16_t y, uint16_t color, uint8_t *string, uint16_t maxWidth) { void TFT_Queue::add_text(uint16_t x, uint16_t y, uint16_t color, uint8_t *string, uint16_t maxWidth) {
handle_queue_overflow(sizeof(parametersCanvasText_t) + maxWidth);
parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t)); parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
parametersCanvasText_t *parameters = (parametersCanvasText_t *)end_of_queue; parametersCanvasText_t *parameters = (parametersCanvasText_t *)end_of_queue;
last_parameter = end_of_queue;
uint8_t *pointer = string; uint8_t *pointer = string;
@ -239,13 +236,16 @@ void TFT_Queue::add_text(uint16_t x, uint16_t y, uint16_t color, uint8_t *string
/* TODO: Deal with maxWidth */ /* TODO: Deal with maxWidth */
while ((*(end_of_queue++) = *pointer++) != 0x00); while ((*(end_of_queue++) = *pointer++) != 0x00);
parameters->nextParameter = end_of_queue;
parameters->stringLength = pointer - string; parameters->stringLength = pointer - string;
task_parameters->count++; task_parameters->count++;
} }
void TFT_Queue::add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors) { void TFT_Queue::add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors) {
handle_queue_overflow(sizeof(parametersCanvasImage_t));
parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t)); parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
parametersCanvasImage_t *parameters = (parametersCanvasImage_t *)end_of_queue; parametersCanvasImage_t *parameters = (parametersCanvasImage_t *)end_of_queue;
last_parameter = end_of_queue;
parameters->type = CANVAS_ADD_IMAGE; parameters->type = CANVAS_ADD_IMAGE;
parameters->x = x; parameters->x = x;
@ -254,6 +254,7 @@ void TFT_Queue::add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *col
end_of_queue += sizeof(parametersCanvasImage_t); end_of_queue += sizeof(parametersCanvasImage_t);
task_parameters->count++; task_parameters->count++;
parameters->nextParameter = end_of_queue;
colorMode_t color_mode = Images[image].colorMode; colorMode_t color_mode = Images[image].colorMode;
@ -275,6 +276,7 @@ void TFT_Queue::add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *col
} }
end_of_queue = (uint8_t *)color; end_of_queue = (uint8_t *)color;
parameters->nextParameter = end_of_queue;
} }
uint16_t gradient(uint16_t colorA, uint16_t colorB, uint16_t factor) { uint16_t gradient(uint16_t colorA, uint16_t colorB, uint16_t factor) {
@ -314,8 +316,10 @@ void TFT_Queue::add_image(int16_t x, int16_t y, MarlinImage image, uint16_t colo
} }
void TFT_Queue::add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { void TFT_Queue::add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) {
handle_queue_overflow(sizeof(parametersCanvasBar_t));
parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t)); parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
parametersCanvasBar_t *parameters = (parametersCanvasBar_t *)end_of_queue; parametersCanvasBar_t *parameters = (parametersCanvasBar_t *)end_of_queue;
last_parameter = end_of_queue;
parameters->type = CANVAS_ADD_BAR; parameters->type = CANVAS_ADD_BAR;
parameters->x = x; parameters->x = x;
@ -326,11 +330,14 @@ void TFT_Queue::add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
end_of_queue += sizeof(parametersCanvasBar_t); end_of_queue += sizeof(parametersCanvasBar_t);
task_parameters->count++; task_parameters->count++;
parameters->nextParameter = end_of_queue;
} }
void TFT_Queue::add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { void TFT_Queue::add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) {
handle_queue_overflow(sizeof(parametersCanvasRectangle_t));
parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t)); parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
parametersCanvasRectangle_t *parameters = (parametersCanvasRectangle_t *)end_of_queue; parametersCanvasRectangle_t *parameters = (parametersCanvasRectangle_t *)end_of_queue;
last_parameter = end_of_queue;
parameters->type = CANVAS_ADD_RECTANGLE; parameters->type = CANVAS_ADD_RECTANGLE;
parameters->x = x; parameters->x = x;
@ -341,6 +348,7 @@ void TFT_Queue::add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t h
end_of_queue += sizeof(parametersCanvasRectangle_t); end_of_queue += sizeof(parametersCanvasRectangle_t);
task_parameters->count++; task_parameters->count++;
parameters->nextParameter = end_of_queue;
} }
#endif // HAS_GRAPHICAL_TFT #endif // HAS_GRAPHICAL_TFT

7
Marlin/src/lcd/tft/tft_queue.h
View File

@ -73,11 +73,13 @@ typedef struct __attribute__((__packed__)) {
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
CanvasSubtype type; CanvasSubtype type;
uint8_t *nextParameter;
uint16_t color; uint16_t color;
} parametersCanvasBackground_t; } parametersCanvasBackground_t;
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
CanvasSubtype type; CanvasSubtype type;
uint8_t *nextParameter;
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
uint16_t color; uint16_t color;
@ -88,6 +90,7 @@ typedef struct __attribute__((__packed__)) {
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
CanvasSubtype type; CanvasSubtype type;
uint8_t *nextParameter;
int16_t x; int16_t x;
int16_t y; int16_t y;
MarlinImage image; MarlinImage image;
@ -95,6 +98,7 @@ typedef struct __attribute__((__packed__)) {
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
CanvasSubtype type; CanvasSubtype type;
uint8_t *nextParameter;
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
uint16_t width; uint16_t width;
@ -104,6 +108,7 @@ typedef struct __attribute__((__packed__)) {
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
CanvasSubtype type; CanvasSubtype type;
uint8_t *nextParameter;
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
uint16_t width; uint16_t width;
@ -117,10 +122,12 @@ class TFT_Queue {
static uint8_t *end_of_queue; static uint8_t *end_of_queue;
static uint8_t *current_task; static uint8_t *current_task;
static uint8_t *last_task; static uint8_t *last_task;
static uint8_t *last_parameter;
static void finish_sketch(); static void finish_sketch();
static void fill(queueTask_t *task); static void fill(queueTask_t *task);
static void canvas(queueTask_t *task); static void canvas(queueTask_t *task);
static void handle_queue_overflow(uint16_t sizeNeeded);
public: public:
static void reset(); static void reset();