From bbbf17b5ca4ff5311eb0d3b69d733b805d3d25c2 Mon Sep 17 00:00:00 2001 From: RobinVdB8 Date: Mon, 20 Nov 2023 13:20:46 +0100 Subject: [PATCH] Added styleguid.xml to editor --- project/Core/Src/mug.c | 318 +++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 158 deletions(-) diff --git a/project/Core/Src/mug.c b/project/Core/Src/mug.c index f116a7a..4e2bbf1 100644 --- a/project/Core/Src/mug.c +++ b/project/Core/Src/mug.c @@ -31,7 +31,7 @@ static int inpub_id; static const char *TAG = "mug"; static uint16_t xpos; static uint16_t ypos; -static sFONT* font = LCD_FONT16; +static sFONT* font; static uint32_t color; static uint32_t bgcolor; @@ -54,102 +54,103 @@ static void example_publish(mqtt_client_t *client, void *arg) { num_files = llfs_file_list(file_list, max_files, "*.png"); if(num_files == 0) { - strcpy(pub_payload, "No images found"); + strcpy(pub_payload, "No images found"); } else { - for (size_t i = 0; i < num_files; i++) { - // Concatenate file names into the payload string - strcat(pub_payload, file_list[i].name); - strcat(pub_payload, ", "); // Add a space between file names - } + for (size_t i = 0; i < num_files; i++) { + // Concatenate file names into the payload string + strcat(pub_payload, file_list[i].name); + strcat(pub_payload, ", "); // Add a space between file names + } } err = mqtt_publish(client, "getImageList", pub_payload, strlen(pub_payload), qos, retain, mqtt_pub_request_cb, arg); if(err != ERR_OK) { - LOG_INFO(TAG, "Publish err: %d", err); + LOG_INFO(TAG, "Publish err: %d", err); } } static void mqtt_incoming_publish_cb(void *arg, const char *topic, u32_t tot_len) { - LOG_INFO(TAG, "Incoming publish at topic %s with total length %u", topic, (unsigned int)tot_len); - //check for which topic a publish was received - if(strcmp(topic, "input/setText") == 0) { - inpub_id = 0; - } else if(strcmp(topic, "input/setImage") == 0) { - inpub_id = 1; - } else if(strcmp(topic, "input/setTextColor") == 0) { - inpub_id = 2; - } else if(strcmp(topic, "input/setColor") == 0) { - inpub_id = 3; - } else { - //in case of wrong topic - inpub_id = 4; - } + LOG_INFO(TAG, "Incoming publish at topic %s with total length %u", topic, (unsigned int)tot_len); + //check for which topic a publish was received + if(strcmp(topic, "input/setText") == 0) { + inpub_id = 0; + } else if(strcmp(topic, "input/setImage") == 0) { + inpub_id = 1; + } else if(strcmp(topic, "input/setTextColor") == 0) { + inpub_id = 2; + } else if(strcmp(topic, "input/setColor") == 0) { + inpub_id = 3; + } else { + //in case of wrong topic + inpub_id = 4; + } } static void mqtt_incoming_data_cb(void *arg, const u8_t *data, u16_t len, u8_t flags) { - uint8_t data_buffer[len + 1]; - LOG_INFO(TAG, "Incoming publish payload with length %d, flags %u", len, (unsigned int)flags); - if(flags & MQTT_DATA_FLAG_LAST) { - memcpy(data_buffer, data, len); - data_buffer[len] = '\0'; - switch(inpub_id) { - case 0: - //lcd_display_text("teststring", xpos, ypos, color, bgcolor, font); - LOG_INFO(TAG, "incoming data on input/setText:\n %s.", data); - lcd_display_text(data_buffer, xpos, ypos, color, bgcolor, font); - break; - case 1: - //places an image on the lcd - LOG_INFO(TAG, "incoming data on input/setImage:\n %s.", data); - break; - case 2: - //changes the text color on the lcd - LOG_INFO(TAG, "incoming data on input/setTextColor:\n %s.", data); - color = color_picker(data_buffer); - break; - case 3: - //changes the background color - LOG_INFO(TAG, "incoming data on input/setColor:\n %s.", data); - bgcolor = color_picker(data_buffer); - break; - default: - LOG_INFO(TAG, "Publish received on wrong topic, incoming data ignored."); - } - } else { + uint8_t data_buffer[len + 1]; + LOG_INFO(TAG, "Incoming publish payload with length %d, flags %u", len, (unsigned int)flags); + if(flags & MQTT_DATA_FLAG_LAST) { + memcpy(data_buffer, data, len); + data_buffer[len] = '\0'; + switch(inpub_id) { + case 0: + //lcd_display_text("teststring", xpos, ypos, color, bgcolor, font); + LOG_INFO(TAG, "incoming data on input/setText: %s.", data); + lcd_display_text(data_buffer, xpos, ypos, color, bgcolor, font); + break; + case 1: + //places an image on the lcd + LOG_INFO(TAG, "incoming data on input/setImage: %s.", data); + //call function here + break; + case 2: + //changes the text color on the lcd + LOG_INFO(TAG, "incoming data on input/setTextColor: %s.", data); + color = color_picker(data_buffer); + break; + case 3: + //changes the background color + LOG_INFO(TAG, "incoming data on input/setColor: %s.", data); + bgcolor = color_picker(data_buffer); + break; + default: + LOG_INFO(TAG, "Publish received on wrong topic, incoming data ignored."); + } + } else { - } + } } static void mqtt_sub_request_cb(void *arg, err_t result) { - LOG_INFO(TAG, "Subscribe result: %d", result); + LOG_INFO(TAG, "Subscribe result: %d", result); } static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection_status_t status) { - LOG_INFO(TAG, "entered connection cb function"); - err_t err; - if(status == MQTT_CONNECT_ACCEPTED) { - LOG_INFO(TAG, "mqtt_connection_cb: Successfully connected"); + LOG_INFO(TAG, "entered connection cb function"); + err_t err; + if(status == MQTT_CONNECT_ACCEPTED) { + LOG_INFO(TAG, "mqtt_connection_cb: Successfully connected"); - //set up callback function for input - mqtt_set_inpub_callback(client, mqtt_incoming_publish_cb, mqtt_incoming_data_cb, arg); + //set up callback function for input + mqtt_set_inpub_callback(client, mqtt_incoming_publish_cb, mqtt_incoming_data_cb, arg); - //subscribe to the topics setText, setImage, setColor and setTextcolor - err = mqtt_subscribe(client, "input/#", 1, mqtt_sub_request_cb, arg); - if(err != ERR_OK) { - LOG_INFO(TAG, "mqtt_subscribe return: %d", err); - } - //publish list of images here + //subscribe to the topics setText, setImage, setColor and setTextcolor + err = mqtt_subscribe(client, "input/#", 1, mqtt_sub_request_cb, arg); + if(err != ERR_OK) { + LOG_INFO(TAG, "mqtt_subscribe return: %d", err); + } + //publish list of images here - example_publish(client, NULL); - } else { - LOG_INFO(TAG, "mqtt_connection_cb: Disconnected, reason: %d", status); + example_publish(client, NULL); + } else { + LOG_INFO(TAG, "mqtt_connection_cb: Disconnected, reason: %d", status); - //try to reconnect - example_do_connect(client); - } + //try to reconnect + example_do_connect(client); + } } static void example_do_connect(mqtt_client_t *client) { - LOG_INFO(TAG, "testing the connection"); + LOG_INFO(TAG, "testing the connection"); struct mqtt_connect_client_info_t ci; err_t err; @@ -169,98 +170,99 @@ static void example_do_connect(mqtt_client_t *client) { } void mug_init(void) { - color = LCD_BLACK; - bgcolor = LCD_WHITE; - xpos = 50; - ypos = 50; + color = LCD_BLACK; + bgcolor = LCD_WHITE; + font = LCD_FONT16; + xpos = 50; + ypos = 50; mqtt_client_t *client = mqtt_client_new(); - if(client != NULL) { + if(client != NULL) { LOG_INFO(TAG, "Starting connection test"); example_do_connect(client); - } + } } uint32_t color_picker(uint8_t* color) { - uint32_t output = LCD_BLACK; - if(strcmp((const char*)color, "blue") == 0) { - output = LCD_BLUE; - } - if(strcmp((const char*)color, "green") == 0) { - output = LCD_GREEN; - } - if(strcmp((const char*)color, "red") == 0) { - output = LCD_RED; - } - if(strcmp((const char*)color, "cyan") == 0) { - output = LCD_CYAN; - } - if(strcmp((const char*)color, "magenta") == 0) { - output = LCD_MAGENTA; - } - if(strcmp((const char*)color, "yellow") == 0) { - output = LCD_YELLOW; - } - if(strcmp((const char*)color, "light blue") == 0) { - output = LCD_LIGHTBLUE; - } - if(strcmp((const char*)color, "light green") == 0) { - output = LCD_LIGHTGREEN; - } - if(strcmp((const char*)color, "light red") == 0) { - output = LCD_LIGHTRED; - } - if(strcmp((const char*)color, "light cyan") == 0) { - output = LCD_LIGHTCYAN; - } - if(strcmp((const char*)color, "light magenta") == 0) { - output = LCD_LIGHTMAGENTA; - } - if(strcmp((const char*)color, "light yellow") == 0) { - output = LCD_LIGHTYELLOW; - } - if(strcmp((const char*)color, "dark blue") == 0) { - output = LCD_DARKBLUE; - } - if(strcmp((const char*)color, "dark green") == 0) { - output = LCD_DARKGREEN; - } - if(strcmp((const char*)color, "dark red") == 0) { - output = LCD_DARKRED; - } - if(strcmp((const char*)color, "dark cyan") == 0) { - output = LCD_DARKCYAN; - } - if(strcmp((const char*)color, "dark magenta") == 0) { - output = LCD_DARKMAGENTA; - } - if(strcmp((const char*)color, "dark yellow") == 0) { - output = LCD_DARKYELLOW; - } - if(strcmp((const char*)color, "white") == 0) { - output = LCD_WHITE; - } - if(strcmp((const char*)color, "light gray") == 0) { - output = LCD_LIGHTGRAY; - } - if(strcmp((const char*)color, "gray") == 0) { - output = LCD_GRAY; - } - if(strcmp((const char*)color, "dark gray") == 0) { - output = LCD_DARKGRAY; - } - if(strcmp((const char*)color, "black") == 0) { - output = LCD_BLACK; - } - if(strcmp((const char*)color, "brown") == 0) { - output = LCD_BROWN; - } - if(strcmp((const char*)color, "orange") == 0) { - output = LCD_ORANGE; - } - if(strcmp((const char*)color, "transparent") == 0) { - output = LCD_TRANSPARENT; - } + uint32_t output = LCD_BLACK; + if(strcmp((const char*)color, "blue") == 0) { + output = LCD_BLUE; + } + if(strcmp((const char*)color, "green") == 0) { + output = LCD_GREEN; + } + if(strcmp((const char*)color, "red") == 0) { + output = LCD_RED; + } + if(strcmp((const char*)color, "cyan") == 0) { + output = LCD_CYAN; + } + if(strcmp((const char*)color, "magenta") == 0) { + output = LCD_MAGENTA; + } + if(strcmp((const char*)color, "yellow") == 0) { + output = LCD_YELLOW; + } + if(strcmp((const char*)color, "light blue") == 0) { + output = LCD_LIGHTBLUE; + } + if(strcmp((const char*)color, "light green") == 0) { + output = LCD_LIGHTGREEN; + } + if(strcmp((const char*)color, "light red") == 0) { + output = LCD_LIGHTRED; + } + if(strcmp((const char*)color, "light cyan") == 0) { + output = LCD_LIGHTCYAN; + } + if(strcmp((const char*)color, "light magenta") == 0) { + output = LCD_LIGHTMAGENTA; + } + if(strcmp((const char*)color, "light yellow") == 0) { + output = LCD_LIGHTYELLOW; + } + if(strcmp((const char*)color, "dark blue") == 0) { + output = LCD_DARKBLUE; + } + if(strcmp((const char*)color, "dark green") == 0) { + output = LCD_DARKGREEN; + } + if(strcmp((const char*)color, "dark red") == 0) { + output = LCD_DARKRED; + } + if(strcmp((const char*)color, "dark cyan") == 0) { + output = LCD_DARKCYAN; + } + if(strcmp((const char*)color, "dark magenta") == 0) { + output = LCD_DARKMAGENTA; + } + if(strcmp((const char*)color, "dark yellow") == 0) { + output = LCD_DARKYELLOW; + } + if(strcmp((const char*)color, "white") == 0) { + output = LCD_WHITE; + } + if(strcmp((const char*)color, "light gray") == 0) { + output = LCD_LIGHTGRAY; + } + if(strcmp((const char*)color, "gray") == 0) { + output = LCD_GRAY; + } + if(strcmp((const char*)color, "dark gray") == 0) { + output = LCD_DARKGRAY; + } + if(strcmp((const char*)color, "black") == 0) { + output = LCD_BLACK; + } + if(strcmp((const char*)color, "brown") == 0) { + output = LCD_BROWN; + } + if(strcmp((const char*)color, "orange") == 0) { + output = LCD_ORANGE; + } + if(strcmp((const char*)color, "transparent") == 0) { + output = LCD_TRANSPARENT; + } - return output; + return output; }