From 71161ecde5a56ce3aeef25bc4c1c607a4a3f18dd Mon Sep 17 00:00:00 2001
From: sebhajek <seb.hajek@gmail.com>
Date: Mon, 19 Dec 2022 18:25:38 +0100
Subject: [PATCH] basic recieving

---
 M2/M2.ino | 58 +++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/M2/M2.ino b/M2/M2.ino
index 22471b2..6161590 100644
--- a/M2/M2.ino
+++ b/M2/M2.ino
@@ -15,7 +15,7 @@ ButtonColors noDraw = {NODRAW, NODRAW, NODRAW};
 enum screenMode {DARK, LIGHT};
 screenMode COLOR_MODE = DARK;
 enum dataMode {ATTENTION, MEDITATION, QUALITY, RAW, STOP};
-dataMode DATA_MODE = STOP;
+dataMode DATA_MODE = RAW;
 
 Button screenModeButton(0, 190, 50, 50, false, "", noDraw);
 Button brightnessButton(55, 190, 50, 50, false, "", noDraw);
@@ -48,6 +48,8 @@ void setup(){
   rawButton.addHandler(rawHandler, E_TOUCH);
 
   drawGui(COLOR_MODE);  
+
+  //Serial2.print("4");
 }
 
 ///DRAW GUI
@@ -202,21 +204,21 @@ void rawHandler(Event& e) {
   drawGui(COLOR_MODE);
 }
 
-void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, String data){
+void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, int data){
   M5.Lcd.setTextColor(COLORS[COLOR_MODE]);
   if(DATA_MODE == ATTENTION){
-      Serial2.print((1));
+      //Serial2.print((1));
       M5.Lcd.drawString("ATTENTION", 90, 80, 4);
   }else if(DATA_MODE ==MEDITATION){
-      Serial2.print(String(2));
+      //Serial2.print(String(2));
       M5.Lcd.drawString("MEDITATION", 84, 80, 4);
   }else if(DATA_MODE == QUALITY){
-      Serial2.print(String(3));
+      //Serial2.print(String(3));
       M5.Lcd.drawString("SIGNAL QUALITY", 60, 80, 4);
   }else if(DATA_MODE == RAW){
       M5.Lcd.drawString("RAW", 132, 80, 4);
   }else{
-    Serial2.print(String(0));
+    //Serial2.print(String(0));
     M5.Lcd.drawString("...", 148, 100, 4);
   }
   if(DATA_MODE != STOP){
@@ -225,8 +227,7 @@ void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, String data){
     } else {
       M5.Lcd.fillRect(132,116,64,64,COLORS[DARK]);
     }
-    M5.Lcd.drawString(data, 132, 128, 4);
-    delay(80);
+    M5.Lcd.drawString(String(data), 132, 128, 4);
   }
 }
 
@@ -234,30 +235,27 @@ String stringReceived = "";
 int valueReceived = 0;
 
 void loop() {
-  M5.update();
+  //M5.update();
   if(Serial2.available()){
     char c = Serial2.read();
+    //Serial.print(c);
     stringReceived += c;
-
-    if(DATA_MODE != RAW){
-      if (stringReceived.length() == 3) {
-        Serial.println("s:"+stringReceived);
-        valueReceived = stringReceived.toInt();
-        Serial.println(valueReceived);      
-        stringReceived = "";
-        valueReceived= 0;
-      }
-    }else {
-      if (stringReceived.length() == 8) {
-        Serial.println("s:"+stringReceived);
-        valueReceived = stringReceived.toInt();
-        Serial.println(valueReceived);      
-        stringReceived = "";
-        valueReceived= 0;
-      }
-    }
-    Serial.print("data recieved:");
-    Serial.println(stringReceived);
-    writeScreenData(DATA_MODE, COLOR_MODE, stringReceived);
+  if (stringReceived.length() == 17) {
+    Serial.println("s:"+stringReceived);
+    String rawData = stringReceived.substring(9);
+    /*int r = 8;
+    while (r < 17){
+      rawData += stringReceived[r];
+      r++;
+    }*/
+    Serial.println("r:" +rawData);
+    //valueReceived = stringReceived.toInt();
+    //Serial.println(valueReceived);      
+    stringReceived = "";
+    //valueReceived= 0;
+  } else {
+    //stringReceived = "";
+  }
+  //writeScreenData(DATA_MODE, COLOR_MODE, valueReceived);
   }
 }
\ No newline at end of file