Merge branch 'master' into apollo

2026-01-06 09:57:52 +00:00 · 2023-05-08 10:32:16 +02:00
parent a54ad6ba75 2e915e782b
commit f826a85b0a
28 changed files with 343 additions and 47 deletions
--- a/variants/ai-c3/platformio.ini
+++ b/variants/ai-c3/platformio.ini
@@ -2,7 +2,13 @@
 extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = extra
-build_flags = 
-  ${esp32_base.build_flags}
+build_flags = ${esp32c3_base.build_flags}
  -D PRIVATE_HW
  -I variants/ai-c3
+; as long as BSEC2 Software Library is not supported remove Sensors from build 
+build_src_filter = ${esp32c3_base.build_src_filter}
+  -<modules/Telemetry/EnvironmentTelemetry.cpp>
+  -<modules/Telemetry/AirQualityTelemetry.cpp>
+  -<modules/Telemetry/Sensor>
+lib_ignore = ${esp32c3_base.lib_ignore}
+  BSEC Software Library
--- a/variants/ai-c3/variant.h
+++ b/variants/ai-c3/variant.h
@@ -1,26 +1,33 @@
-// #define BUTTON_NEED_PULLUP // if set we need to turn on the internal CPU pullup during sleep
+#define HAS_TELEMETRY 0 // as long as BSEC2 is not supported
+#define HAS_SENSOR 0    // as long as BSEC2 is not supported

-#define I2C_SDA 8
-#define I2C_SCL 9
+#define SDA 0
+#define SCL 1
+#define I2C_SDA SDA
+#define I2C_SCL SCL

-#define BUTTON_PIN 0
+#define BUTTON_PIN 9 // BOOT button
+#define LED_PIN 30   // RGB LED

 #define USE_RF95
-#undef RF95_SCK
 #define RF95_SCK 4
-#undef RF95_MISO
 #define RF95_MISO 5
-#undef RF95_MOSI
 #define RF95_MOSI 6
-#undef RF95_NSS
 #define RF95_NSS 7

-#define LORA_DIO0 10 // a No connect on the SX1262 module
-#define LORA_DIO1 3  // a No connect on the SX1262 module
+#define LORA_DIO0 10
+#define LORA_DIO1 3
 #define LORA_RESET 2

+// WaveShare Core1262-868M
+// https://www.waveshare.com/wiki/Core1262-868M
+#define USE_SX1262
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY 10
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22 // use DIO2 as RF switch
+
+#define HAS_GPS 0
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
-
-#define HAS_SCREEN 0
-#define HAS_GPS 0
--- a/variants/bpi_picow_esp32_s3/pins_arduino.h
+++ b/variants/bpi_picow_esp32_s3/pins_arduino.h
@@ -0,0 +1,37 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 12;
+static const uint8_t SCL = 14;
+
+// Default SPI will be mapped to Radio
+static const uint8_t MISO = 39;
+static const uint8_t SCK = 21;
+static const uint8_t MOSI = 38;
+static const uint8_t SS = 17;
+
+//#define SPI_MOSI                    (11)
+//#define SPI_SCK                     (14)
+//#define SPI_MISO                    (2)
+//#define SPI_CS                      (13)
+
+//#define SDCARD_CS                   SPI_CS
+
+#endif /* Pins_Arduino_h */
--- a/variants/bpi_picow_esp32_s3/platformio.ini
+++ b/variants/bpi_picow_esp32_s3/platformio.ini
@@ -0,0 +1,14 @@
+[env:bpi_picow_esp32_s3]
+extends = esp32s3_base
+board = bpi_picow_esp32_s3
+board_level = extra
+;OpenOCD flash method
+;upload_protocol = esp-builtin
+;Normal method
+upload_protocol = esptool
+upload_port = /dev/ttyACM2
+lib_deps =
+  ${esp32_base.lib_deps}
+  caveman99/ESP32 Codec2@^1.0.1
+build_flags = 
+  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/bpi_picow_esp32_s3
--- a/variants/bpi_picow_esp32_s3/variant.h
+++ b/variants/bpi_picow_esp32_s3/variant.h
@@ -0,0 +1,73 @@
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+//#define HAS_SCREEN 0
+
+//#define HAS_SDCARD
+//#define SDCARD_USE_SPI1
+
+#define USE_SSD1306
+#define I2C_SDA 12
+#define I2C_SCL 14
+
+#define LED_PIN 46
+#define LED_STATE_ON 0 // State when LED is litted
+
+//#define BUTTON_PIN 15 // Pico OLED 1.3 User key 0 - removed User key 1 (17)
+
+#define BUTTON_PIN 40
+//#define BUTTON_PIN 0 // This is the BOOT button pad at the moment
+//#define BUTTON_NEED_PULLUP
+
+//#define USE_RF95   // RFM95/SX127x
+
+#undef RF95_SCK
+#undef RF95_MISO
+#undef RF95_MOSI
+#undef RF95_NSS
+
+// WaveShare Core1262-868M OK
+// https://www.waveshare.com/wiki/Core1262-868M
+#define USE_SX1262
+
+#ifdef USE_SX1262
+#define RF95_MISO 39
+#define RF95_SCK 21
+#define RF95_MOSI 38
+#define RF95_NSS 17
+#define LORA_RESET 42
+#define LORA_DIO1 5
+#define LORA_BUSY 47
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22
+#endif
+
+//#define USE_SX1280
+#ifdef USE_SX1280
+#define RF95_MISO 1
+#define RF95_SCK 3
+#define RF95_MOSI 4
+#define RF95_NSS 2
+#define LORA_RESET 17
+#define LORA_DIO1 12
+#define LORA_BUSY 47
+#define SX128X_CS RF95_NSS
+#define SX128X_DIO1 LORA_DIO1
+#define SX128X_BUSY LORA_BUSY
+#define SX128X_RESET LORA_RESET
+#endif
+
+//#define USE_EINK
+/*
+ * eink display pins
+ */
+//#define PIN_EINK_CS
+//#define PIN_EINK_BUSY
+//#define PIN_EINK_DC
+//#define PIN_EINK_RES    (-1)
+//#define PIN_EINK_SCLK   3
+//#define PIN_EINK_MOSI   4
--- a/variants/diy/v1/variant.h
+++ b/variants/diy/v1/variant.h
@@ -38,8 +38,9 @@
 #define SX126X_DIO1 LORA_DIO1
 #define SX126X_BUSY LORA_DIO2
 #define SX126X_RESET LORA_RESET
-#define SX126X_RXEN 14
-#define SX126X_TXEN 13
+//#define SX126X_RXEN 14
+//#define SX126X_TXEN 13
+#define SX126X_POWER_EN (13)

 // RX/TX for RFM95/SX127x
 #define RF95_RXEN 14
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -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
--- a/variants/rak4631_epaper/platformio.ini
+++ b/variants/rak4631_epaper/platformio.ini
@@ -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
--- a/variants/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/rak4631_epaper_onrxtx/platformio.ini
@@ -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