sani7/2023-Webservices_And_Applications
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented LCD and filesystem

Browse Source
This commit is contained in:
RobinVdB8
2023-11-19 18:23:02 +01:00
parent c2932473a0
commit b79a42b767
2 changed files with 147 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/Core/Src/main.c
View File

@@ -28,6 +28,7 @@
#include "log.h"
#include "llfs.h"
#include "lcd_api.h"
#include "mug.h"
/* USER CODE END Includes */
@@ -130,6 +131,7 @@ int main(void)
/* Infinite loop */
/* USER CODE BEGIN WHILE */
mug_init();
while (1)
{
/* USER CODE END WHILE */

169
project/Core/Src/mug.c
View File

@@ -11,6 +11,7 @@
#include "lwip/ip_addr.h"
#include "mqtt.h"
#include "mug.h"
#include "lcd_api.h"
#define LOGGER_LEVEL_INFO
#include "log.h"
@@ -19,44 +20,64 @@
static void mqtt_pub_request_cb(void*, err_t);
static void example_publish(mqtt_client_t* , void*);
static void mqtt_incoming_publish_cb(void*, const char*, u32_t);
static void mqtt_incoming_data_cb(void*, const u8_t*, u16_t, u8_t);
static void mqtt_incoming_data_cb(void*, const uint8_t*, u16_t, u8_t);
static void mqtt_sub_request_cb(void*, err_t);
static void mqtt_connection_cb(mqtt_client_t*, void*, mqtt_connection_status_t);
static void example_do_connect(mqtt_client_t*);
static uint32_t color_picker(uint8_t*);
//global variable used in mqtt_incoming_publish_cb and mqtt_incoming_data_cb to give an easy to use ID to the subscribed topics
static int inpub_id;
static const char *TAG = "mug";
static uint16_t xpos;
static uint16_t ypos;
static sFONT* font = LCD_FONT16;
static uint32_t color;
static uint32_t bgcolor;
static void mqtt_pub_request_cb(void *arg, err_t result) {
if(result != ERR_OK) {
LOG_INFO(TAG, "Publish result: %d\n", result);
LOG_INFO(TAG, "Publish result: %d", result);
}
}
static void example_publish(mqtt_client_t *client, void *arg) {
printf("testing publish\n");
const char *pub_payload[20];
LOG_INFO(TAG, "Entering publish");
char pub_payload[200];
err_t err;
u8_t qos = 2;
u8_t retain = 0;
u8_t retain = 1 ;
size_t max_files = 20;
llfs_file_t file_list[max_files];
size_t num_files;
err = mqtt_publish(client, "getImageList", pub_payload, sizeof(pub_payload), qos, retain, mqtt_pub_request_cb, arg);
num_files = llfs_file_list(file_list, max_files, "*.png");
if(num_files == 0) {
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
}
}
err = mqtt_publish(client, "getImageList", pub_payload, strlen(pub_payload), qos, retain, mqtt_pub_request_cb, arg);
if(err != ERR_OK) {
printf("Publish err: %d\n", err);
LOG_INFO(TAG, "Publish err: %d", err);
}
}
static void mqtt_incoming_publish_cb(void *arg, const char *topic, u32_t tot_len) {
printf("Incoming publish at topic %s with total length %u\n", topic, (unsigned int)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) {
if(strcmp(topic, "input/setText") == 0) {
inpub_id = 0;
} else if(strcmp(topic, "/input/setImage") == 0) {
} else if(strcmp(topic, "input/setImage") == 0) {
inpub_id = 1;
} else if(strcmp(topic, "/input/setTextColor") == 0) {
} else if(strcmp(topic, "input/setTextColor") == 0) {
inpub_id = 2;
} else if(strcmp(topic, "/input/setColor") == 0) {
} else if(strcmp(topic, "input/setColor") == 0) {
inpub_id = 3;
} else {
//in case of wrong topic
@@ -65,20 +86,30 @@ static void mqtt_incoming_publish_cb(void *arg, const char *topic, u32_t tot_len
}
static void mqtt_incoming_data_cb(void *arg, const u8_t *data, u16_t len, u8_t flags) {
printf("Incoming publish payload with length %d, flags %u\n", len, (unsigned int)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:
//places text on the lcd
//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.");
@@ -89,27 +120,28 @@ static void mqtt_incoming_data_cb(void *arg, const u8_t *data, u16_t len, u8_t f
}
static void mqtt_sub_request_cb(void *arg, err_t result) {
LOG_INFO(TAG, "Subscribe result: %d\n", result);
LOG_INFO(TAG, "Subscribe result: %d", result);
}
static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection_status_t status) {
printf("entered connection cb function\n");
LOG_INFO(TAG, "entered connection cb function");
err_t err;
if(status == MQTT_CONNECT_ACCEPTED) {
printf("mqtt_connection_cb: Successfully connected\n");
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);
//subscribe to the topics setText, setImage, setColor and setTextcolor
err = mqtt_subscribe(client, "/input/#", 1, mqtt_sub_request_cb, arg);
err = mqtt_subscribe(client, "input/#", 1, mqtt_sub_request_cb, arg);
if(err != ERR_OK) {
printf("mqtt_subscribe return: %d\n", err);
LOG_INFO(TAG, "mqtt_subscribe return: %d", err);
}
//publish list of images here
example_publish(client, NULL);
} else {
printf("mqtt_connection_cb: Disconnected, reason: %d\n", status);
LOG_INFO(TAG, "mqtt_connection_cb: Disconnected, reason: %d", status);
//try to reconnect
example_do_connect(client);
@@ -117,7 +149,7 @@ static void mqtt_connection_cb(mqtt_client_t *client, void *arg, mqtt_connection
}
static void example_do_connect(mqtt_client_t *client) {
printf("testing the connection\n");
LOG_INFO(TAG, "testing the connection");
struct mqtt_connect_client_info_t ci;
err_t err;
@@ -129,17 +161,106 @@ static void example_do_connect(mqtt_client_t *client) {
uint16_t server_port = 1883;
err = mqtt_client_connect(client, &server_ip, server_port, mqtt_connection_cb, 0, &ci);
if(err != ERR_OK) {
printf("mqtt_connect return %d\n", err);
LOG_INFO(TAG, "mqtt_connect return %d", err);
}
if(err == ERR_OK) {
printf("Went into mqtt_client_connect; mqtt_connect return %d\n", err);
LOG_INFO(TAG, "Went into mqtt_client_connect; mqtt_connect return %d", err);
}
}
void mug_init(void) {
color = LCD_BLACK;
bgcolor = LCD_WHITE;
xpos = 50;
ypos = 50;
mqtt_client_t *client = mqtt_client_new();
if(client != NULL) {
printf("Starting connection test\n");
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;
}
return output;
}