Merge branch 'main' into ethernet_debugging

Author: aentinger

Diff for: libraries/Arduino_LED_Matrix/examples/TextWithArduinoGraphics/TextWithArduinoGraphics.ino

@@ -5,22 +5,20 @@
 ArduinoLEDMatrix matrix;
 
 void setup() {
-  Serial.begin(115200);
   matrix.begin();
 
   matrix.beginDraw();
+
   matrix.stroke(0xFFFFFFFF);
-  // add some static text
-  // will only show "UNO" (not enough space on the display)
-  const char text[] = "UNO r4";
+  matrix.textScrollSpeed(100);
+
+  const char text[] = "  UNO r4  ";
   matrix.textFont(Font_4x6);
   matrix.beginText(0, 1, 0xFFFFFF);
   matrix.println(text);
-  matrix.endText();
+  matrix.endText(SCROLL_LEFT);
 
   matrix.endDraw();
-
-  delay(2000);
 }
 
 void loop() {

Diff for: libraries/Arduino_LED_Matrix/src/Arduino_LED_Matrix.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "Arduino.h"
 #include "FspTimer.h"
 #include "gallery.h"
@@ -248,7 +250,7 @@ class ArduinoLEDMatrix
 
 #ifdef MATRIX_WITH_ARDUINOGRAPHICS
     virtual void set(int x, int y, uint8_t r, uint8_t g, uint8_t b) {
-      if (y >= canvasHeight || x >= canvasWidth) {
+      if (y >= canvasHeight || x >= canvasWidth || y < 0 || x < 0) {
         return;
       }
       // the r parameter is (mis)used to set the character to draw with
@@ -300,4 +302,4 @@ class ArduinoLEDMatrix
             }
         }
     }
-};
+};

Diff for: libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino

@@ -1,5 +1,4 @@
 #include "CEspControl.h"
-#include "CNetIf.h"
 #include <string>
 #include <vector>
 
@@ -23,8 +22,6 @@ using namespace std;
 
 #define SerialESP      Serial5
 
-extern int esp_host_spi_init();
-
 void getESPDebugLog();
 int displayMenu();
 void makeRequest(int req);
@@ -33,12 +30,15 @@ string prompt(string p);
 
 const char mac_address[] = "aa:bb:cc:dd:ee:ff";
 
+bool wifiHwInitialized = false;
 
 
 int initEvent(CCtrlMsgWrapper *resp) {
   if(resp->isInitEventReceived() == ESP_CONTROL_OK) {
     Serial.println("[EVENT !!!!]: Init event received");
+    wifiHwInitialized = true;
   }
+  return ESP_CONTROL_OK;
 }
 
 int stationDisconnectionEvent(CCtrlMsgWrapper *resp) {
@@ -47,6 +47,7 @@ int stationDisconnectionEvent(CCtrlMsgWrapper *resp) {
     Serial.print("[EVENT !!!!]: C33 was disconnected from AP for reason ");
     Serial.println(reason);
   }
+  return ESP_CONTROL_OK;
 }
 
 int disconnectionFromSofApEvent(CCtrlMsgWrapper *resp) {
@@ -56,6 +57,7 @@ int disconnectionFromSofApEvent(CCtrlMsgWrapper *resp) {
     Serial.print(MAC);
     Serial.println(" disconnected from ESP32 Soft AP");
   }
+  return ESP_CONTROL_OK;
 }
 
 
@@ -65,6 +67,7 @@ int heartBeatEvent(CCtrlMsgWrapper *resp) {
     Serial.print("[EVENT !!!!]: heart beat n ");
     Serial.println(hb);
   }
+  return ESP_CONTROL_OK;
 }
 
 
@@ -83,10 +86,19 @@ void setup() {
   CEspControl::getInstance().listenForDisconnectionFromSoftApEvent(disconnectionFromSofApEvent);
 
 
-  
+  int err = CEspControl::getInstance().initSpiDriver();
+  if (err != 0) {
+    Serial.print("Error initSpiDriver err ");
+    Serial.println(err);
+  } else {
+    Serial.println("initSpiDriver OK");
+  }
+  while (!wifiHwInitialized) {
+    CEspControl::getInstance().communicateWithEsp();
+    delay(100);
+  }
 
   Serial.println("STARTING PROGRAM");
-  delay(1000);
 }
 
 
@@ -685,7 +697,7 @@ int displayMenu() {
         cmd_acquired = true;
         rv = stoi(c);
       }
-      else {
+      else if(ch >= '0' && ch <='9') {
         c += ch;
       }
     }

Diff for: libraries/ESPhost/src/CEspControl.h

@@ -35,7 +35,6 @@
 #include "CCtrlWrapper.h"
 #include "CEspCommunication.h"
 #include "EspSpiDriver.h"
-#include "CNetIf.h"
 #include "CEspCbks.h"
 #include <string>
 

Diff for: libraries/Ethernet/src/Ethernet.cpp

@@ -28,29 +28,32 @@ int CEthernet::begin(unsigned long timeout, unsigned long responseTimeout) {
 /* -------------------------------------------------------------------------- */
 int CEthernet::begin(IPAddress local_ip) {
 /* -------------------------------------------------------------------------- */
-  IPAddress subnet(255, 255, 255, 0);
-  return begin(local_ip, subnet);
+  // Assume the DNS server will be the machine on the same network as the local IP
+  // but with last octet being '1'
+  IPAddress dns_server = local_ip;
+  dns_server[3] = 1;
+  return begin(local_ip, dns_server);
 }
 
 /* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress subnet) {
+int CEthernet::begin(IPAddress local_ip, IPAddress dns_server) {
 /* -------------------------------------------------------------------------- */  
   // Assume the gateway will be the machine on the same network as the local IP
   // but with last octet being '1'
   IPAddress gateway = local_ip;
   gateway[3] = 1;
-  return begin(local_ip, subnet, gateway);
+  return begin(local_ip, dns_server, gateway);
 }
 
 /* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway) {
+int CEthernet::begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway) {
 /* -------------------------------------------------------------------------- */  
-  // Assume the DNS server will be the same machine than gateway
-  return begin(local_ip, subnet, gateway, gateway);
+  IPAddress subnet(255, 255, 255, 0);
+  return begin(local_ip, dns_server, gateway, subnet);
 }
 
 /* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway, IPAddress dns_server) {
+int CEthernet::begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet) {
 /* -------------------------------------------------------------------------- */  
 
   ni = CLwipIf::getInstance().get(NI_ETHERNET,  local_ip, gateway, subnet);
@@ -108,7 +111,7 @@ int CEthernet::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_ser
 int CEthernet::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {
 /* -------------------------------------------------------------------------- */  
   CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
-  return begin(local_ip, subnet, gateway, dns_server);
+  return begin(local_ip, dns_server, gateway, subnet);
 }
 
 /* -------------------------------------------------------------------------- */

Diff for: libraries/Ethernet/src/EthernetC33.h

@@ -41,9 +41,9 @@ class CEthernet {
     int begin(unsigned long timeout = 60000, unsigned long responseTimeout = 4000);
     EthernetLinkStatus linkStatus();
     int begin(IPAddress local_ip);
-    int begin(IPAddress local_ip, IPAddress subnet);
-    int begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway);
-    int begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway, IPAddress dns_server);
+    int begin(IPAddress local_ip, IPAddress dns_server);
+    int begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway);
+    int begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet);
     // Initialise the Ethernet shield to use the provided MAC address and gain the rest of the
     // configuration through DHCP.
     // Returns 0 if the DHCP configuration failed, and 1 if it succeeded