Merge branch 'master' into BSEC2

2023-05-10 13:31:46 +02:00
parent 46e29402a6 28ec4e35ec
commit 9841d49fb8
50 changed files with 217 additions and 252 deletions
@@ -11,7 +11,7 @@ build_flags =
  -I variants/diy/v1

 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
-[env:meshtastic-diy-v1.1]
+[env:meshtastic-diy-v1_1]
 extends = esp32_base
 board = esp32doit-devkit-v1
 board_level = extra
@@ -1,4 +1,4 @@
-[env:heltec-v2.1]
+[env:heltec-v2_1]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
@@ -1,4 +1,4 @@
-[env:heltec-v2.0]
+[env:heltec-v2_0]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
@@ -1,3 +1,6 @@
+#define I2C_SCL 47
+#define I2C_SDA 48
+
 #define LED_PIN LED

 #define HAS_SCREEN 0
@@ -9,6 +9,7 @@ lib_deps =
  ${networking_base.lib_deps}
  melopero/Melopero RV3028@^1.1.0
  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
@@ -8,6 +8,7 @@ lib_deps =
  ${nrf52840_base.lib_deps}
  zinggjm/GxEPD2@^1.4.9
  melopero/Melopero RV3028@^1.1.0
+  rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
@@ -10,6 +10,7 @@ lib_deps =
  ${nrf52840_base.lib_deps}
  zinggjm/GxEPD2@^1.5.1
  melopero/Melopero RV3028@^1.1.0
+  rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
@@ -1,5 +1,5 @@
 ; The original TBEAM board without the AXP power chip and a few other changes
-[env:tbeam0.7]
+[env:tbeam0_7]
 extends = esp32_base
 board = ttgo-t-beam
 board_level = extra
@@ -1,4 +1,4 @@
-[env:tlora-v2-1-1.6]
+[env:tlora-v2-1-1_6]
 extends = esp32_base
 board = ttgo-lora32-v21
 build_flags = 
@@ -1,4 +1,4 @@
-[env:tlora-v2-1-1.8]
+[env:tlora-v2-1-1_8]
 extends = esp32_base
 board = ttgo-lora32-v21