update platformio

in der platformio.ini gibts nun die folgenden Varianten: Maple_sduino_USB Maple_sduino_serial Maple_sduino_LAN Maple_cul_USB Maple_cul_serial ESP32_sduino_devkitV1
Ralf9 · Jul 11, 2021 · 900b7df · 900b7df
1 parent 016d735
commit 900b7df
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 38 deletions.
diff --git a/SIGNALduinoAdv/SIGNALduinoAdv.ino b/SIGNALduinoAdv/SIGNALduinoAdv.ino
@@ -29,7 +29,7 @@
 *   You should have received a copy of the GNU General Public License
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-* Version from: https://github.com/Ralf9/SIGNALDuino/tree/dev-r420_cc1101
+* Version from: https://github.com/Ralf9/SIGNALDuino/tree/dev-r421_cc1101
 
 *------------------------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@
 #include <Arduino.h>
 
 #define PROGNAME               " SIGNALduinoAdv "
-#define PROGVERS               "4.2.1-dev210706"
+#define PROGVERS               "4.2.1-dev210711"
 #define VERSION_1               0x41
 #define VERSION_2               0x2d
 

diff --git a/SIGNALduinoAdv/compile_config.h b/SIGNALduinoAdv/compile_config.h
@@ -28,36 +28,19 @@
 // ---------------------------------------
 // Do not Change anything below this line
 
-#ifdef OTHER_BOARD_WITH_CC1101
-	#define CMP_CC1101
-#endif
-#ifdef ARDUINO_ATMEGA328P_MINICUL
-	#define CMP_CC1101
-#endif
-#ifdef MAPLE_SDUINO
-	#define MAPLE_Mini
-	#define CMP_CC1101
-#endif
-#ifdef MAPLE_CUL
+#define CMP_CC1101
+
+#if defined(MAPLE_SDUINO) || defined(MAPLE_CUL)
 	#define MAPLE_Mini
-	#define CMP_CC1101
+	#ifndef PLATFORMIO
+		#if ARDUINO == 10808
+    		#define NO_INCLUDE_EEPROM
+		#endif
+	#endif 
 #endif
 #ifdef BLACK_BOARD
 	#define MAPLE_Mini
-	#define CMP_CC1101
 #endif
 #if BLACK_BOARD == 2
 	#define SERIAL_USART2
 #endif
-#ifdef SIGNALESP32
-	#define CMP_CC1101
-#endif
-#ifdef ESP32_SDUINO
-	#define CMP_CC1101
-#endif
-#ifdef EVIL_CROW_RF
-	#define CMP_CC1101
-#endif
-#ifdef ESP32_SDUINO_TEST
-	#define CMP_CC1101
-#endif
diff --git a/SIGNALduinoAdv/tools.h b/SIGNALduinoAdv/tools.h
@@ -3,10 +3,10 @@
 #ifndef _tools_h
 #define _tools_h
 
-#ifndef MAPLE_Mini
-#include <EEPROM.h>
-//#elif defined(MAPLE_Mini) and ARDUINO > 190
-//#include <EEPROM.h>
+// wenn definiert, dann kein include EEPROM.h
+// bei Maple Mini sind die EEPROM Routinen im core 1.9.0 enthalten
+#ifndef NO_INCLUDE_EEPROM
+	#include <EEPROM.h>
 #endif
 
 #include <Arduino.h>

diff --git a/extra_script.py b/extra_script.py
@@ -0,0 +1,12 @@
+Import("env")
+
+# to build date str
+import datetime
+date = datetime.datetime.now()
+date = date.strftime("%y") + date.strftime("%m") + date.strftime("%d")
+
+# name from env:project
+build_name = env['PIOENV']
+build_version = "421dev" + date
+
+env.Replace(PROGNAME="%s" % build_name + "_" + "%s" % build_version)
diff --git a/platformio.ini b/platformio.ini
@@ -11,21 +11,37 @@
 [platformio]
 src_dir = SIGNALduinoAdv
 
+[env]
+; file for Advanced Scripting
+; https://docs.platformio.org/en/latest/projectconf/advanced_scripting.html
+extra_scripts = pre:extra_script.py      
+
 [env:Maple_sduino_USB]
-platform = ststm32@~7.0.0
+platform = ststm32@~13.0.0
 board = maple_mini_b20
-board_build.core = STM32Duino
+board_build.core = STM32
 framework = arduino
 build_flags =
 	-D USBCON
 	-D PIO_FRAMEWORK_ARDUINO_ENABLE_CDC
 	-D MAPLE_SDUINO=1
 	-D MAPLE_WATCHDOG=1
+	-D NO_INCLUDE_EEPROM  ; bei Maple Mini sind die EEPROM Routinen im core 1.9.0 enthalten
 
-[env:Maple_sduino_LAN]
-platform = ststm32@~7.0.0
+[env:Maple_sduino_serial]
+platform = ststm32@~13.0.0
 board = maple_mini_b20
-board_build.core = STM32Duino
+board_build.core = STM32
+framework = arduino
+build_flags =
+	-D MAPLE_SDUINO=1
+	-D MAPLE_WATCHDOG=1
+	-D NO_INCLUDE_EEPROM  ; bei Maple Mini sind die EEPROM Routinen im core 1.9.0 enthalten
+
+[env:Maple_sduino_LAN]
+platform = https://github.com/platformio/platform-ststm32.git
+board = maple_mini_origin
+board_build.core = STM32
 framework = arduino
 lib_deps = arduino-libraries/Ethernet
 build_flags =
@@ -34,10 +50,33 @@ build_flags =
 	-D LAN_WIZ=1
 	-D MAPLE_WATCHDOG=1
 
-[env:ESP32_sduino-devkit-v1]
+[env:Maple_cul_USB]
+platform = ststm32@~13.0.0
+board = maple_mini_b20
+board_build.core = STM32
+framework = arduino
+build_flags =
+	-D USBCON
+	-D PIO_FRAMEWORK_ARDUINO_ENABLE_CDC
+	-D MAPLE_CUL=1
+	-D MAPLE_WATCHDOG=1
+	-D NO_INCLUDE_EEPROM  ; bei Maple Mini sind die EEPROM Routinen im core 1.9.0 enthalten
+
+[env:Maple_cul_serial]
+platform = ststm32@~13.0.0
+board = maple_mini_b20
+board_build.core = STM32
+framework = arduino
+build_flags =
+	-D MAPLE_CUL=1
+	-D MAPLE_WATCHDOG=1
+	-D NO_INCLUDE_EEPROM  ; bei Maple Mini sind die EEPROM Routinen im core 1.9.0 enthalten
+
+[env:ESP32_sduino_devkitV1]
 platform = espressif32
 board = esp32doit-devkit-v1
 framework = arduino
 lib_deps = https://github.com/tzapu/WiFiManager
 build_flags =
-	-D ESP32_SDUINO_TEST=1
+	-D SIGNALESP32=1
+	;-D ESP32_SDUINO_TEST=1