Merge branch 'master' into develop

J-A-A-M · Nov 2, 2023 · d1f34b3 · d1f34b3
2 parents 513a592 + d548a1c
commit d1f34b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/img/jaam_front.jpg b/img/jaam_front.jpg
diff --git a/img/jamm_back.jpg b/img/jamm_back.jpg
diff --git a/src/firmware.ino b/src/firmware.ino
@@ -137,8 +137,8 @@ const unsigned char trident_small [] PROGMEM = {
 	0x00, 0x07, 0xf0, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x00
 };
 
-//byte mac[] = {0x00, 0x10, 0xFA, 0x6E, 0x38, 0x4A};
-byte mac[] = {0x00, 0x10, 0xFA, 0x6E, 0x00, 0x4A}; //big
+byte mac[] = {0x00, 0x10, 0xFA, 0x6E, 0x38, 0x4A};
+//byte mac[] = {0x00, 0x10, 0xFA, 0x6E, 0x00, 0x4A}; //big
 //byte mac[] = {0x00, 0x10, 0xFA, 0x6E, 0x10, 0x4A}; //small
 
 bool    enableHA;
@@ -1794,6 +1794,7 @@ void alarmTrigger(){
 }
 //--Map processing end
 
+
 void WifiReconnect(){
   if (WiFi.status() != WL_CONNECTED){
     Serial.println("WiFI Reconnect");