fixes after functional testing

esp8266 · suculent · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018
commit 4faa7156a93875d0ab994c4e5eb852e9baf0781c
diff --git a/libraries/Wire/examples/i2c-P2P-master/i2c-P2P-master.ino b/libraries/Wire/examples/i2c-P2P-master/i2c-P2P-master.ino
@@ -18,7 +18,7 @@
 
 const int16_t I2C_MASTER = 0x42;
 const int16_t I2C_SLAVE = 0x08;
-int16_t slave_address = I2C_SLAVE; 
+int16_t slave_address = I2C_SLAVE;
 
 // Keep this structure in sync with the i2c-P2P-slave example. Should be in shared header.
 struct MessageData {
@@ -87,7 +87,6 @@ MessageData encodeMessage(const String &instring) {
 // should be in shared header
 bool validateMessage(char* message_bytes, MessageData &tmp) {
 
-  MessageData tmp;
   memcpy(&tmp, message_bytes, sizeof(tmp));
 
   // Validate PROTOCOL terminator
@@ -249,26 +248,26 @@ void loop() {
 
   if (millis() > second_timer) {
     Serial.print("Errors/Bytes: ");
-    Serial.print(error_count);
+    Serial.print(errorCount);
     Serial.print("/");
-    Serial.print(byte_count);
+    Serial.print(byteCount);
     Serial.println(" per second");
-    error_count = 0;
-    byte_count = 0;
+    errorCount = 0;
+    byteCount = 0;
     second_timer = millis() + 1000;
   }
 
-  if (millis() > next_ping) {
+  if (millis() > nextPing) {
     digitalWrite(LED_PIN, LOW);
-    next_ping = millis() + 200;
+    nextPing = millis() + 200;
     Serial.print("[MASTER] Sequence » ");
     Serial.println(sequence);
     digitalWrite(LED_PIN, HIGH);
     sendMessage(sequence, "MESA");
-    if (expect_pong) {
-      error_count++;
+    if (expectPong) {
+      errorCount++;
     }
-    expect_pong = true;
+    expectPong = true;
     sequence++;
   }
 

diff --git a/libraries/Wire/examples/i2c-P2P-slave/i2c-P2P-slave.ino b/libraries/Wire/examples/i2c-P2P-slave/i2c-P2P-slave.ino
@@ -38,7 +38,7 @@ uint16_t calculateCRC16(uint8_t *data, size_t length);
 void sendEvent(int a, String msg);
 void sendMessage(int seq, String msg);
 void receiveEvent(const size_t howMany);
-MessageData validateMessage(char* bytes_message);
+bool validateMessage(const char* bytes, MessageData &tmp);
 
 //
 
@@ -50,31 +50,6 @@ uint16_t calculateCRC16(uint8_t *data, size_t length) {
   return (uint16_t)value;
 }
 
-void setup() {
-
-  Serial.begin(230400);
-  while (!Serial); // if you want to wait for first messages
-
-  // Enable internal pullup (there's always one from the master side)
-  //digitalWrite(SDA_PIN, HIGH);
-  //digitalWrite(SCL_PIN, HIGH);
-
-  pinMode(LED_PIN, OUTPUT);
-  digitalWrite(LED_PIN, LOW);
-
-  //Wire.pins(SDA_PIN, SCL_PIN);
-  //Wire.begin(I2C_SLAVE);
-  Wire.begin(SDA_PIN, SCL_PIN, I2C_SLAVE); // new syntax: join i2c bus (address required for slave)
-
-  delay(2000);
-  digitalWrite(LED_PIN, HIGH);
-
-  Wire.onReceive(receiveEvent);
-
-  Serial.print("I2C Slave started on address: 0x0");
-  Serial.println(I2C_SLAVE, HEX);
-}
-
 // should be in shared header
 MessageData encodeMessage(String bytes) {
 
@@ -103,8 +78,7 @@ MessageData encodeMessage(String bytes) {
 // should be in shared header
 bool validateMessage(const char* bytes, MessageData &tmp) {
 
-  MessageData tmp;
-  memcpy(&tmp, bytes_message, sizeof(tmp));
+  memcpy(&tmp, bytes, sizeof(tmp));
 
   // Validate terminator
   if (tmp.terminator == '.') {
@@ -113,7 +87,7 @@ bool validateMessage(const char* bytes, MessageData &tmp) {
     Serial.print("[ERROR] Terminator invalid: '");
     Serial.print(tmp.terminator);
     Serial.println("'");
-    return tmp;
+    return false;
   }
 
   int datasize = sizeof(tmp.data);
@@ -227,17 +201,19 @@ void receiveEvent(const size_t howMany) {
     } else {
 
   }
-
+    
   Serial.print("Decoding data of size: "); Serial.println(sizeof(chars));
-  message = validateMessage(chars); // &error
-
-  // Do something with the message.
-  char inmessage[5] = {0};
-  memcpy(inmessage, (const char*)&message.data, 4);
-  String inmsg = String(inmessage);
-  if (inmsg.indexOf("MESA") == 0) {
-    String event = String("PONG");
-    sendMessage(seq, event);
+  bool success = validateMessage(chars, message);
+
+  if (success) {
+    // Do something with the message.
+    char inmessage[5] = {0};
+    memcpy(inmessage, (const char*)&message.data, 4);
+    String inmsg = String(inmessage);
+    if (inmsg.indexOf("MESA") == 0) {
+      String event = String("PONG");
+      sendMessage(seq, event);
+    }
   }
 
 }
@@ -269,6 +245,31 @@ void sendEvent(int a, String msg) {
   Wire.endTransmission();    // stop transmitting
 }
 
+void setup() {
+
+  Serial.begin(230400);
+  while (!Serial); // if you want to wait for first messages
+
+  // Enable internal pullup (there's always one from the master side)
+  //digitalWrite(SDA_PIN, HIGH);
+  //digitalWrite(SCL_PIN, HIGH);
+
+  pinMode(LED_PIN, OUTPUT);
+  digitalWrite(LED_PIN, LOW);
+
+  //Wire.pins(SDA_PIN, SCL_PIN);
+  //Wire.begin(I2C_SLAVE);
+  Wire.begin(SDA_PIN, SCL_PIN, I2C_SLAVE); // new syntax: join i2c bus (address required for slave)
+
+  delay(2000);
+  digitalWrite(LED_PIN, HIGH);
+
+  Wire.onReceive(receiveEvent);
+
+  Serial.print("I2C Slave started on address: 0x0");
+  Serial.println(I2C_SLAVE, HEX);
+}
+
 void loop() {
   // nothing here, slave receives data and sends reply in own callback
 }