Merge branch 'master' into pr-fix4154

2024-08-30 16:31:47 -05:00
parent 9e20b0e9b9 7475cc301e
commit 8729cdb699
36 changed files with 980 additions and 56 deletions
@@ -0,0 +1,15 @@
+[env:ms24sf1]
+extends = nrf52840_base
+board = ms24sf1
+board_level = extra
+; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
+build_flags = ${nrf52840_base.build_flags} -Ivariants/MS24SF1 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MS24SF1>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+upload_protocol = nrfutil
+upload_port = /dev/ttyACM1
@@ -0,0 +1,30 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant() {}
@@ -0,0 +1,139 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_MINEWSEMI_MS24SF1_
+#define _VARIANT_MINEWSEMI_MS24SF1_
+
+#define ME25LS01
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (6)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// Use the native nrf52 usb power detection
+#define NRF_APM
+
+#define PIN_3V3_EN (32 + 5) //-1
+#define PIN_3V3_ACC_EN -1
+
+#define PIN_LED1 (-1)
+
+#define LED_PIN PIN_LED1
+#define LED_BUILTIN -1
+
+#define LED_BLUE -1
+#define LED_STATE_ON 1 // State when LED is lit
+
+#define BUTTON_PIN (-1)
+#define BUTTON_NEED_PULLUP
+
+#define HAS_WIRE 1
+
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (0 + 29) // P0.15
+#define PIN_WIRE_SCL (0 + 30) // P0.17
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL1_RX (-1) // P0.14
+#define PIN_SERIAL1_TX (-1) // P0.13
+
+#define PIN_SERIAL2_RX (-1) // P0.17
+#define PIN_SERIAL2_TX (-1) // P0.16
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1 // 2
+
+#define PIN_SPI_MISO (0 + 17) // MISO      P0.17
+#define PIN_SPI_MOSI (0 + 20) // MOSI      P0.20
+#define PIN_SPI_SCK (0 + 21)  // SCK       P0.21
+
+// #define PIN_SPI1_MISO (-1) //
+// #define PIN_SPI1_MOSI (10) // EPD_MOSI  P0.10
+// #define PIN_SPI1_SCK (9)   // EPD_SCLK  P0.09
+
+static const uint8_t SS = (0 + 22); // LORA_CS   P0.22
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
+static const uint8_t SCK = PIN_SPI_SCK;
+
+// MINEWSEMI nRF52840+SX1262 MS24SF1 (NRF82540 with integrated SX1262)
+#define USE_SX1262
+#define SX126X_CS (0 + 22)    // LORA_CS     P0.22
+#define SX126X_DIO1 (0 + 16)  // DIO1        P0.16
+#define SX126X_BUSY (0 + 19)  // LORA_BUSY   P0.19
+#define SX126X_RESET (0 + 12) // LORA_RESET  P0.12
+#define SX126X_TXEN (32 + 4)  // TXEN        P1.04
+#define SX126X_RXEN (32 + 2)  // RXEN        P1.02
+
+// DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+#define SX126X_DIO2_AS_RF_SWITCH
+
+#define HAS_GPS 0
+
+#define PIN_GPS_EN -1
+#define GPS_EN_ACTIVE HIGH
+#define PIN_GPS_RESET -1
+#define GPS_VRTC_EN -1
+#define GPS_SLEEP_INT -1
+#define GPS_RTC_INT -1
+#define GPS_RESETB_OUT -1
+
+#define BATTERY_PIN -1
+#define ADC_MULTIPLIER (2.0F)
+
+#define ADC_RESOLUTION 14
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+
+// Buzzer
+// #define PIN_BUZZER (0 + 25)
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif // _VARIANT_MINEWSEMI_MS24SF1_
@@ -7,6 +7,7 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+        -DGPS_POWER_TOGGLE

 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node_t114> 
 lib_deps = 
@@ -0,0 +1,26 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 18;
+static const uint8_t SCL = 12; // t3s3 e-Paper has no pin 17 as t3s3 v1, so use another free pin next to it
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 7;
+static const uint8_t MOSI = 6;
+static const uint8_t MISO = 3;
+static const uint8_t SCK = 5;
+
+#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 */
@@ -0,0 +1,23 @@
+[env:tlora-t3s3-epaper]
+extends = esp32s3_base
+board = tlora-t3s3-v1
+board_check = true
+upload_protocol = esptool
+
+build_flags = 
+  ${esp32_base.build_flags} -D TLORA_T3S3_EPAPER -I variants/tlora_t3s3_epaper
+  -DGPS_POWER_TOGGLE
+  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
+  -DEINK_WIDTH=250
+  -DEINK_HEIGHT=122
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+  -DEINK_HASQUIRK_VICIOUSFASTREFRESH   ; Identify that pixels drawn by fast-refresh are harder to clear
+  ;-DEINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
+  ;-DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
+
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
@@ -0,0 +1,69 @@
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+
+// Display (E-Ink)
+#define USE_EINK
+#define PIN_EINK_CS 15
+#define PIN_EINK_BUSY 48
+#define PIN_EINK_DC 16
+#define PIN_EINK_RES 47
+#define PIN_EINK_SCLK 14
+#define PIN_EINK_MOSI 11
+
+#define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to
+// measure battery voltage ratio of voltage divider = 2.0 (assumption)
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+
+#define I2C_SDA SDA
+#define I2C_SCL SCL
+
+// external qwiic connector
+#define GPS_RX_PIN 44
+#define GPS_TX_PIN 43
+
+#define LED_PIN 37
+#define BUTTON_PIN 0
+#define BUTTON_NEED_PULLUP
+
+// TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and
+// we will probe at runtime for RF95 and if not found then probe for SX1262
+#define USE_RF95 // RFM95/SX127x
+#define USE_SX1262
+#define USE_SX1280
+
+#define LORA_SCK 5
+#define LORA_MISO 3
+#define LORA_MOSI 6
+#define LORA_CS 7
+#define LORA_RESET 8
+
+// per SX1276_Receive_Interrupt/utilities.h
+#define LORA_DIO0 9
+#define LORA_DIO1 33 // TCXO_EN ?
+#define LORA_DIO2 34
+#define LORA_RXEN 21
+#define LORA_TXEN 10
+
+// per SX1262_Receive_Interrupt/utilities.h
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 33
+#define SX126X_BUSY 34
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif
+
+// per SX128x_Receive_Interrupt/utilities.h
+#ifdef USE_SX1280
+#define SX128X_CS LORA_CS
+#define SX128X_DIO1 9
+#define SX128X_DIO2 33
+#define SX128X_DIO3 34
+#define SX128X_BUSY 36
+#define SX128X_RESET LORA_RESET
+#define SX128X_RXEN 21
+#define SX128X_TXEN 10
+#define SX128X_MAX_POWER 3
+#endif