basic data display
This commit is contained in:
parent
f8f24240d8
commit
6981eda34f
27
M2/M2.ino
27
M2/M2.ino
|
@ -189,7 +189,7 @@ void rawHandler(Event& e) {
|
||||||
drawGui(COLOR_MODE);
|
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]);
|
M5.Lcd.setTextColor(COLORS[COLOR_MODE]);
|
||||||
if(DATA_MODE == ATTENTION){
|
if(DATA_MODE == ATTENTION){
|
||||||
//Serial2.print((1));
|
//Serial2.print((1));
|
||||||
|
@ -212,30 +212,33 @@ void writeScreenData(dataMode DATA_MODE, screenMode COLOR_MODE, int data){
|
||||||
} else {
|
} else {
|
||||||
M5.Lcd.fillRect(132,116,64,64,COLORS[DARK]);
|
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 = "";
|
String stringReceived = "";
|
||||||
int valueReceived = 0;
|
int valuesReceived[4]/* = {0,0,0,0}*/;
|
||||||
int valuesReceived[4];
|
|
||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
M5.update();
|
M5.update();
|
||||||
while(Serial2.available())
|
while(Serial2.available())
|
||||||
{
|
{
|
||||||
char c = Serial2.read();
|
char c = Serial2.read();
|
||||||
Serial.print(c);
|
//Serial.print(c);
|
||||||
Serial.println;
|
|
||||||
stringReceived += c;
|
stringReceived += c;
|
||||||
if (stringReceived.length() == 17) {
|
if (stringReceived.length() == 17) {
|
||||||
Serial.println("s:"+stringReceived);
|
//Serial.println(" s:"+stringReceived);
|
||||||
valuesReceived[RAW] = {}stringReceived.substring(9);
|
valuesReceived[RAW] = stringReceived.substring(9).toInt();
|
||||||
valuesReceived[QUALITY] = {}stringReceived.substring(6);
|
valuesReceived[QUALITY] = stringReceived.substring(6,9).toInt();
|
||||||
valuesReceived[MEDITATION] = {}stringReceived.substring(3);
|
valuesReceived[MEDITATION] = stringReceived.substring(3,6).toInt();
|
||||||
valuesReceived[ATTENTION] = {}stringReceived.substring(0);
|
valuesReceived[ATTENTION] = stringReceived.substring(0,3).toInt();
|
||||||
Serial.printf("a:%3d m:%3d q:%3d r:%+8d\n",valuesReceived[ATTENTION],valueReceived[MEDITATION],valueReceived[QUALITY],valuesReceived[RAW]);
|
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 = "";
|
stringReceived = "";
|
||||||
|
writeScreenData(DATA_MODE, COLOR_MODE, valuesReceived);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue