Merge branch 'meshtastic:master' into master

Mictronics · Jan 18, 2024 · 42e7e04 · 42e7e04
2 parents a6a640c + a8b7490
commit 42e7e04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/protobufs b/protobufs
diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
@@ -97,11 +97,6 @@ static int32_t reconnectETH()
     return 5000; // every 5 seconds
 }
 
-static uint32_t bigToLittleEndian(uint32_t value)
-{
-    return ((value >> 24) & 0xFF) | ((value >> 8) & 0xFF00) | ((value << 8) & 0xFF0000) | ((value << 24) & 0xFF000000);
-}
-
 // Startup Ethernet
 bool initEthernet()
 {
@@ -130,14 +125,7 @@ bool initEthernet()
             status = Ethernet.begin(mac);
         } else if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC) {
             LOG_INFO("starting Ethernet Static\n");
-
-            IPAddress ip = IPAddress(bigToLittleEndian(config.network.ipv4_config.ip));
-            IPAddress dns = IPAddress(bigToLittleEndian(config.network.ipv4_config.dns));
-            IPAddress gateway = IPAddress(bigToLittleEndian(config.network.ipv4_config.gateway));
-            IPAddress subnet = IPAddress(bigToLittleEndian(config.network.ipv4_config.subnet));
-
-            Ethernet.begin(mac, ip, dns, gateway, subnet);
-
+            Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.subnet);
             status = 1;
         } else {
             LOG_INFO("Ethernet Disabled\n");

diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -121,6 +121,10 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_EBYTE_ESP32_S3 = 54,
     /* Waveshare ESP32-S3-PICO with PICO LoRa HAT and 2.9inch e-Ink */
     meshtastic_HardwareModel_ESP32_S3_PICO = 55,
+    /* CircuitMess Chatter 2 LLCC68 Lora Module and ESP32 Wroom
+ Lora module can be swapped out for a Heltec RA-62 which is "almost" pin compatible
+ with one cut and one jumper Meshtastic works */
+    meshtastic_HardwareModel_CHATTER_2 = 56,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */