From 98a526c3cd14fa9486df36c6941ed7e2a933f5da Mon Sep 17 00:00:00 2001
From: Korneliusz Osmenda <korneliuszo@gmail.com>
Date: Tue, 6 Sep 2022 21:33:51 +0200
Subject: [PATCH] Make display controlled via uart

---
 scripts/image.py |  31 +++++++++++++++++++++++++++++++
 scripts/test.png | Bin 0 -> 1668 bytes
 src/display.hpp  |   2 +-
 src/main.cpp     |  23 +++++++++++++++--------
 src/uart.cpp     |  11 +++++++++++
 5 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100755 scripts/image.py
 create mode 100644 scripts/test.png

diff --git a/scripts/image.py b/scripts/image.py
new file mode 100755
index 0000000..9d18086
--- /dev/null
+++ b/scripts/image.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+
+import tlay2_client
+import struct
+from PIL import Image
+
+def send_image(img):
+    img = img.convert("1")
+    w,h = img.size
+    if w != 200 or h != 128:
+        raise Exception("bad format")
+
+
+    data = []
+    for i in range(h//8):
+        data.append(bytearray([255])*w)
+    for x in range(w):
+        for y in range(h):
+            if img.getpixel((x,y)) == 0:
+                data[y//8][x] &= ~(1<<(7-y%8))
+    
+    a=tlay2_client.Tlay2_msg(2)
+    for i in range(len(data)):
+        line = data[i]
+        for j in range(0, len(line), 32):
+            chunk = line[j:j+32]
+            a.msg(struct.pack("<H",96+j+i*(296//8)*8)+chunk)
+    
+if __name__ == "__main__":
+    import sys
+    send_image(Image.open(sys.argv[1]))
\ No newline at end of file
diff --git a/scripts/test.png b/scripts/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe2cec71054c054d67a28d3f6f2bba57ab98c8f
GIT binary patch
literal 1668
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
O0000<MNUMnLSTYQSuM)|

literal 0
HcmV?d00001

diff --git a/src/display.hpp b/src/display.hpp
index 00fc303..42d79e8 100644
--- a/src/display.hpp
+++ b/src/display.hpp
@@ -13,8 +13,8 @@
 class Display {
 	const struct device *dev;
 	k_mutex mut;
-	uint8_t buff[128*296/8];
 public:
+	uint8_t buff[128*296/8];
 	class Display_lock
 	{
 		k_mutex *m;
diff --git a/src/main.cpp b/src/main.cpp
index 1dc0973..33a843c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,18 +68,25 @@ struct k_thread display_thread_data;
 void display_thread(void*,void*,void*)
 {
 	int spinner_idx=0;
+	int spinner_data_idx=0;
 	char spinner[] = "/-\\|";
+	Reg_data::Data cached = {};
 	while(true)
 	{
-		k_sem_take(&reg_data.new_sample,K_FOREVER);
-		k_mutex_lock(&reg_data.mut, K_FOREVER);
-		Reg_data::Data cached = reg_data.d;
-		k_mutex_unlock(&reg_data.mut);
-
+		if(!k_sem_take(&reg_data.new_sample,K_NO_WAIT))
 		{
-			auto l = display.lock();
+			k_mutex_lock(&reg_data.mut, K_FOREVER);
+			cached = reg_data.d;
+			k_mutex_unlock(&reg_data.mut);
+			spinner_data_idx++;
+			if (!spinner[spinner_data_idx])
+				spinner_data_idx=0;
+		}
+		{
+			//auto l = display.lock();
 			display.print_chr(0,0,spinner[spinner_idx++]);
-			display.print_str(16,0,cached.on ? " ON":"OFF");
+			display.print_chr(8,0,spinner[spinner_data_idx]);
+			display.print_str(32,0,cached.on ? " ON":"OFF");
 			char buff[13];
 			snprintf(buff,13,"Bat %6.2u%%",cached.b_soc);
 			display.print_str(0,16,buff);
@@ -217,7 +224,7 @@ int main(void)
 	                                 K_THREAD_STACK_SIZEOF(display_stack_area),
 	                                 display_thread,
 	                                 NULL, NULL, NULL,
-	                                 5, 0, K_NO_WAIT);
+	                                 10, 0, K_NO_WAIT);
 	if (init_modbus_client()) {
 		tlay2.printt("Modbus RTU client initialization failed");
 		return 1;
diff --git a/src/uart.cpp b/src/uart.cpp
index 51bc5ab..957cfc3 100644
--- a/src/uart.cpp
+++ b/src/uart.cpp
@@ -26,6 +26,17 @@ void process_packet(Tlay2<128>* obj, uint8_t*data,size_t len)
 		obj->tx_end();
 		break;
 	}
+	case 2: // display
+	{
+		uint16_t offset = obj->rx_u16(&data[2]);
+		{
+			uint8_t *buffptr = &display.buff[offset];
+			memcpy(buffptr,&data[4],len-4);
+		}
+		obj->tx_init_reply();
+		obj->tx_end();
+		break;
+	}
 	default:
 		break;
 	}