Merge branch 'master' of https://github.com/lewisxhe/Meshtastic-device

variants/diy/dr-dev/variant.h

@@ -0,0 +1,71 @@
+// Initialize i2c bus on sd_dat and esp_led pins, respectively. We need a bus to not hang on boot
+#define HAS_SCREEN 0
+#define I2C_SDA 4
+#define I2C_SCL 5
+
+// GPS
+#undef GPS_RX_PIN
+#define GPS_RX_PIN NOT_A_PIN
+#define HAS_GPS 0
+
+#define BUTTON_PIN 13 // The middle button GPIO on the T-Beam
+#define BUTTON_NEED_PULLUP
+#define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Module (#975).
+
+#define LORA_DIO0 NOT_A_PIN // a No connect on the SX1262/SX1268 module
+#define LORA_RESET NOT_A_PIN // RST for SX1276, and for SX1262/SX1268
+#define LORA_DIO3 NOT_A_PIN // Not connected on PCB, but internally on the SX1262/SX1268, if DIO3 is high the TXCO is enabled
+
+// In transmitting, set TXEN as high communication level，RXEN pin is low level;
+// In receiving, set RXEN as high communication level, TXEN is lowlevel;
+// Before powering off, set TXEN、RXEN as low level.
+
+#undef RF95_SCK
+#define RF95_SCK 18
+#undef RF95_MISO
+#define RF95_MISO 19
+#undef RF95_MOSI
+#define RF95_MOSI 23
+
+// PINS FOR THE 900M22S
+
+#define LORA_DIO1 26  // IRQ for SX1262/SX1268
+#define LORA_DIO2 22 // BUSY for SX1262/SX1268
+#define LORA_TXEN NOT_A_PIN // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level
+#define LORA_RXEN 17  // Input - RF switch RX control, connecting external MCU IO, valid in high level
+#undef RF95_NSS
+#define RF95_NSS 16
+#define SX126X_BUSY 22
+#define SX126X_CS 16
+
+
+// PINS FOR THE 900M30S
+/*
+#define LORA_DIO1 27  // IRQ for SX1262/SX1268
+#define LORA_DIO2 35 // BUSY for SX1262/SX1268
+#define LORA_TXEN NOT_A_PIN // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level
+#define LORA_RXEN 21  // Input - RF switch RX control, connecting external MCU IO, valid in high level
+#undef RF95_NSS
+#define RF95_NSS 33
+#define SX126X_BUSY 35
+#define SX126X_CS 33
+*/
+
+// RX/TX for RFM95/SX127x
+#define RF95_RXEN LORA_RXEN
+#define RF95_TXEN LORA_TXEN
+// #define RF95_TCXO <GPIO#>
+
+// common pinouts for SX126X modules
+
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_RESET LORA_RESET
+#define SX126X_RXEN LORA_RXEN
+#define SX126X_TXEN LORA_TXEN
+
+// supported modules list
+//#define USE_RF95 // RFM95/SX127x
+#define USE_SX1262
+//#define USE_SX1268
+//#define USE_LLCC68
+#define SX126X_E22

variants/feather_diy/platformio.ini

@@ -0,0 +1,11 @@
+; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
+[env:feather_diy]
+extends = nrf52840_base
+board = adafruit_feather_nrf52840
+build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+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

variants/feather_diy/variant.cpp

@@ -0,0 +1,24 @@
+/*
+  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"

variants/feather_diy/variant.h

@@ -0,0 +1,119 @@
+/*
+  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_FEATHER_DIY_
+#define _VARIANT_FEATHER_DIY_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+// define USE_LFRC    // Board uses RC 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)
+
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (0 + 12) //P0.12 22
+#define PIN_WIRE_SCL (0 + 11) //P0.12 23
+
+#define PIN_LED1 (32 + 15) //P1.15 3
+#define PIN_LED2 (32 + 10) //P1.10 4
+
+#define LED_BUILTIN PIN_LED1
+
+#define LED_GREEN PIN_LED2 // Actually red
+#define LED_BLUE PIN_LED1
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+#define BUTTON_PIN (32 + 2) //P1.02 7
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL1_RX (0 + 24)  //P0.24 1
+#define PIN_SERIAL1_TX (0 + 25)  //P0.25 0
+
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
+
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (0 + 15)  //P0.15 24
+#define PIN_SPI_MOSI (0 + 13)  //P0.13 25
+#define PIN_SPI_SCK  (0 + 14)  //P0.14 26
+
+#define SS 2
+
+#define LORA_DIO0 -1  // a No connect on the SX1262/SX1268 module
+#define LORA_RESET    (32 + 9) //P1.09 13 // RST for SX1276, and for SX1262/SX1268
+#define LORA_DIO1     (0 + 6)  //P0.06 11  // IRQ for SX1262/SX1268
+#define LORA_DIO2     (0 + 8)  //P0.08 12  // BUSY for SX1262/SX1268
+#define LORA_DIO3     // Not connected on PCB, but internally on the TTGO SX1262/SX1268, if DIO3 is high the TXCO is enabled
+
+#define RF95_SCK SCK
+#define RF95_MISO MI
+#define RF95_MOSI MO
+#define RF95_NSS SS
+
+// enables 3.3V periphery like GPS or IO Module
+#define PIN_3V3_EN (-1)
+
+#undef USE_EINK
+
+// supported modules list
+#define USE_SX1262
+
+// common pinouts for SX126X modules
+#define SX126X_CS RF95_NSS // NSS for SX126X
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_RXEN (0 + 27) //P0.27 10
+#define SX126X_TXEN (0 + 26) //P0.26 9
+
+#ifdef EBYTE_E22
+// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
+// (which is the default for the sx1262interface code)
+#define SX126X_E22
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif

variants/rak4631/platformio.ini

@@ -3,10 +3,12 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> +<mesh/eth/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
+  https://github.com/meshtastic/RAK13800-W5100S.git#b680706eb8006cd62c919ac74c8af1950eb82c81
 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

variants/rak4631/variant.h

@@ -185,6 +185,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_RXEN (37)
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
 
+// enables 3.3V periphery like GPS or IO Module
+#define PIN_3V3_EN (34)
+
 // RAK1910 GPS module
 // If using the wisblock GPS module and pluged into Port A on WisBlock base
 // IO1 is hooked to PPS (pin 12 on header) = gpio 17
@@ -192,7 +195,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // Therefore must be 1 to keep peripherals powered
 // Power is on the controllable 3V3_S rail
 // #define PIN_GPS_RESET (34)
-#define PIN_GPS_EN (34)
+#define PIN_GPS_EN PIN_3V3_EN
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
 
 #define GPS_RX_PIN PIN_SERIAL1_RX
@@ -226,6 +229,12 @@ static const uint8_t SCK = PIN_SPI_SCK;
 
 #define HAS_RTC 1
 
+#define HAS_ETHERNET 1
+
+#define PIN_ETHERNET_RESET 21
+#define PIN_ETHERNET_SS PIN_EINK_CS
+#define ETH_SPI_PORT SPI1
+
 #ifdef __cplusplus
 }
 #endif

variants/rak4631_epaper/variant.h

@@ -185,6 +185,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_RXEN (37)
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
 
+// enables 3.3V periphery like GPS or IO Module
+#define PIN_3V3_EN (34)
+
 // RAK1910 GPS module
 // If using the wisblock GPS module and pluged into Port A on WisBlock base
 // IO1 is hooked to PPS (pin 12 on header) = gpio 17
@@ -192,7 +195,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // Therefore must be 1 to keep peripherals powered
 // Power is on the controllable 3V3_S rail
 // #define PIN_GPS_RESET (34)
-#define PIN_GPS_EN (34)
+#define PIN_GPS_EN PIN_3V3_EN
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
 
 #define GPS_RX_PIN PIN_SERIAL1_RX

variants/tlora_v2/variant.h

@@ -8,8 +8,6 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
 
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
 #define LED_PIN 25     // If defined we will blink this LED
 #define BUTTON_PIN                                                                                                               \
@@ -21,4 +19,4 @@
 #define LORA_DIO0 26 // a No connect on the SX1262 module
 #define LORA_RESET 14
 #define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
+#define LORA_DIO2 34 // Not really used

variants/tlora_v2_1_18/platformio.ini

@@ -0,0 +1,8 @@
+[env:tlora-v2-1-1.8]
+extends = esp32_base
+board = ttgo-lora32-v21
+lib_deps =
+  ${esp32_base.lib_deps}
+  caveman99/ESP32 Codec2@^1.0.1
+build_flags = 
+  ${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18

variants/tlora_v2_1_18/variant.h

@@ -0,0 +1,33 @@
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+#define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick
+#define GPS_TX_PIN 13
+
+#define EXT_NOTIFY_OUT 2 // Default pin to use for Ext Notify Module.
+
+#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+// ratio of voltage divider = 2.0 (R42=100k, R43=100k)
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+
+#define I2C_SDA 21 // I2C pins for this board
+#define I2C_SCL 22
+
+// #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller. Crashes on newer ESP-IDF and not needed per schematic
+
+#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
+#define LED_PIN 25     // If defined we will blink this LED
+#define BUTTON_PIN 12  // If defined, this will be used for user button presses,
+
+#define BUTTON_NEED_PULLUP
+
+#define USE_SX1280
+#define LORA_DIO0 26 // a No connect on the SX1262 module
+#define LORA_RESET 23
+
+#define SX128X_CS 18 // FIXME - we really should define LORA_CS instead
+#define SX128X_DIO1 33
+#define SX128X_BUSY 32
+#define SX128X_RESET LORA_RESET
+#define SX128X_E22 // Not really an E22 but TTGO seems to be trying to clone that
+// Internally the TTGO module hooks the SX1280-DIO2 in to control the TX/RX switch (which is the default for the sx1280interface
+// code)