anpassungen für platformio

Ralf9 · Jul 6, 2021 · 8474afb · 8474afb
1 parent 16a64e5
commit 8474afb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/SIGNALduinoAdv/SIGNALduinoAdv.ino b/SIGNALduinoAdv/SIGNALduinoAdv.ino
@@ -37,9 +37,10 @@
 */
 
 #include "compile_config.h"
+#include <Arduino.h>
 
 #define PROGNAME               " SIGNALduinoAdv "
-#define PROGVERS               "4.2.0-dev210628"
+#define PROGVERS               "4.2.1-dev210706"
 #define VERSION_1               0x41
 #define VERSION_2               0x2d
 
@@ -311,6 +312,8 @@ void getRxFifo(uint16_t Boffs);
 void print_bank_sum();
 void print_Bank();
 void en_dis_receiver(bool en_receiver);
+void getEthernetConfig(bool flag);
+void initEthernetConfig();
 void initEEPROM();
 void initEEPROMconfig();
 void serialEvent();
@@ -324,6 +327,9 @@ void printHex2(const uint8_t hex);
 void setHasCC1101(uint8_t val);
 
 //--- platform specific forwards @ main ------------------------------------------
+#ifdef LAN_WIZ
+  void ethernetLoop();
+#endif
 #ifdef ESP32
 	inline void WiFiEvent();
 	void IRAM_ATTR cronjob(void *pArg);
@@ -2158,7 +2164,12 @@ void cmd_uptime()	// t: Uptime
 //--------------------------------------------------------------------------------
 void cmd_test()
 {
-	unsuppCmd = true;
+	#ifdef ARDUINO
+	   MSG_PRINT("a=");
+     MSG_PRINTLN(ARDUINO);
+	#else
+	   unsuppCmd = true;
+  #endif
 }
 
 //--------------------------------------------------------------------------------

diff --git a/SIGNALduinoAdv/compile_config.h b/SIGNALduinoAdv/compile_config.h
@@ -5,7 +5,7 @@
 //#define MAPLE_SDUINO 1
 //#define MAPLE_CUL 1
 //#define BLACK_BOARD 1  // 1 - USB, 2 - serial USART2 fuer ESP
-#define SIGNALESP32 1
+//#define SIGNALESP32 1
 //#define EVIL_CROW_RF 1
 //#define ESP32_SDUINO_TEST 1
 

diff --git a/SIGNALduinoAdv/signalDecoder4.cpp b/SIGNALduinoAdv/signalDecoder4.cpp
@@ -623,7 +623,7 @@ void SignalDetectorClass::processMessage(const uint8_t p_valid)
 					#endif
 			        }
 				else {
-					char msbuf[15];
+					char msbuf[20];
 					uint8_t idx;
 
 					if (MsMoveCount == 0) {
@@ -689,7 +689,7 @@ void SignalDetectorClass::processMessage(const uint8_t p_valid)
 						msEqCnt++;
 					}
 					if (MsEqSkip == 0) {
-						MSG_WRITE(buf,n);
+						MSG_WRITE((const uint8_t *)buf,n);
 
 						n = sprintf(msbuf, ";CP=%x;SP=%x;", clock, sync); // ClockPulse & SyncPulse
 						MSG_PRINT(msbuf);
@@ -1114,7 +1114,7 @@ void SignalDetectorClass::processMessage(const uint8_t p_valid)
 								buf[i] = (n >> 4) + '0';
 								buf[i+1] = (n & 15) + '0';
 							}
-							MSG_WRITE(buf,maxi);
+							MSG_WRITE((const uint8_t *)buf,maxi);
 						}
 					}
 					else {
@@ -1699,7 +1699,7 @@ void ManchesterpatternDecoder::printBufMessageHexStr()
 		pdec->buf[i] = hex[n & 0x0F];
 		i++;
 	}
-	MSG_WRITE(pdec->buf,i);
+	MSG_WRITE((const uint8_t *)pdec->buf,i);
 }
 
 
@@ -2333,4 +2333,3 @@ const bool ManchesterpatternDecoder::isManchester()
 	}
 	return false;
 }
-
diff --git a/SIGNALduinoAdv/signalDecoder4.h b/SIGNALduinoAdv/signalDecoder4.h
@@ -214,8 +214,8 @@ class ManchesterpatternDecoder
 	SignalDetectorClass *pdec;
 	int8_t longlow;
 	int8_t longhigh;
-	int8_t shortlow;
 	int8_t shorthigh;
+	int8_t shortlow;
 	int16_t clock; // Manchester calculated clock		
 	int8_t minbitlen;
 	uint16_t mc_sync_pos;
@@ -229,4 +229,3 @@ class ManchesterpatternDecoder
 
 
 #endif
-
diff --git a/SIGNALduinoAdv/tools.h b/SIGNALduinoAdv/tools.h
@@ -5,10 +5,12 @@
 
 #ifndef MAPLE_Mini
 #include <EEPROM.h>
-#elif defined(MAPLE_Mini) and ARDUINO > 190
-#include <EEPROM.h>
+//#elif defined(MAPLE_Mini) and ARDUINO > 190
+//#include <EEPROM.h>
 #endif
 
+#include <Arduino.h>
+
 extern uint16_t bankOffset;
 extern String cmdstring;