From 6981eda34f141b2a145c0dc60958a130a8d3ff45 Mon Sep 17 00:00:00 2001
From: sebhajek <seb.hajek@gmail.com>
Date: Mon, 19 Dec 2022 19:05:00 +0100
Subject: [PATCH] basic data display

---
 M2/M2.ino | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/M2/M2.ino b/M2/M2.ino
index b81ce20..bf1cfc6 100644
--- a/M2/M2.ino
+++ b/M2/M2.ino
@@ -189,7 +189,7 @@ void rawHandler(Event& e) {
   drawGui(COLOR_MODE);
 }
 
-void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, int data){
+void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, int data[4]){
   M5.Lcd.setTextColor(COLORS[COLOR_MODE]);
   if(DATA_MODE == ATTENTION){
       //Serial2.print((1));
@@ -212,30 +212,33 @@ void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, int data){
     } else {
       M5.Lcd.fillRect(132,116,64,64,COLORS[DARK]);
     }
-    M5.Lcd.drawString(String(data), 132, 128, 4);
+    M5.Lcd.drawString(String(data[DATA_MODE]), 132, 128, 4);
   }
 }
 
 String stringReceived = "";
-int valueReceived = 0;
-int valuesReceived[4];
+int valuesReceived[4]/* = {0,0,0,0}*/;
 
 void loop() {
   M5.update();
   while(Serial2.available())
   {
     char c = Serial2.read();
-    Serial.print(c);
-    Serial.println;
+    //Serial.print(c);
     stringReceived += c;
     if (stringReceived.length() == 17) {
-      Serial.println("s:"+stringReceived);
-      valuesReceived[RAW] = {}stringReceived.substring(9);
-      valuesReceived[QUALITY] = {}stringReceived.substring(6);
-      valuesReceived[MEDITATION] = {}stringReceived.substring(3);
-      valuesReceived[ATTENTION] = {}stringReceived.substring(0);
-      Serial.printf("a:%3d m:%3d q:%3d r:%+8d\n",valuesReceived[ATTENTION],valueReceived[MEDITATION],valueReceived[QUALITY],valuesReceived[RAW]);    
+      //Serial.println("  s:"+stringReceived);
+      valuesReceived[RAW] = stringReceived.substring(9).toInt();
+      valuesReceived[QUALITY] = stringReceived.substring(6,9).toInt();
+      valuesReceived[MEDITATION] = stringReceived.substring(3,6).toInt();
+      valuesReceived[ATTENTION] = stringReceived.substring(0,3).toInt();
+      Serial.print("A:" + String(valuesReceived[ATTENTION]));    
+      Serial.print(" M:" + String(valuesReceived[MEDITATION]));
+      Serial.print(" Q:" + String(valuesReceived[QUALITY]));
+      Serial.print(" R:" + String(valuesReceived[RAW]) + "\n");
       stringReceived = "";
+      writeScreenData(DATA_MODE, COLOR_MODE, valuesReceived);
     }
+
   }
 }
\ No newline at end of file