pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-06 13:48:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #973 from Hydra-Designs/master

Browse Source 
Split RAK-4631 targets by base board
This commit is contained in:
Sacha Weatherstone 2021-12-10 13:27:20 +10:30 committed by GitHub
commit 04683580ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-all.sh
View File

@ -9,7 +9,7 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 helt
#BOARDS_ESP32=tbeam #BOARDS_ESP32=tbeam
# FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
BOARDS_NRF52="rak4631 t-echo" BOARDS_NRF52="rak4631_5005 rak4631_19003 t-echo"
#BOARDS_NRF52="" #BOARDS_NRF52=""
OUTDIR=release/latest OUTDIR=release/latest

13
platformio.ini
View File

@ -325,12 +325,21 @@ monitor_speed = 115200
# board_build.ldscript = linker/nrf52840_s140_sim832.ld # board_build.ldscript = linker/nrf52840_s140_sim832.ld
; The very slick RAK wireless RAK 4631 / 4630 board ; The very slick RAK wireless RAK 4631 / 4630 board
[env:rak4631] [env:rak4631_5005]
extends = nrf52840_base extends = nrf52840_base
board = wiscore_rak4631 board = wiscore_rak4631
# add our variants files to the include and src paths # add our variants files to the include and src paths
# define build flags for the TFT_eSPI library # define build flags for the TFT_eSPI library
build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_5005
src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
debug_tool = jlink
[env:rak4631_19003]
extends = nrf52840_base
board = wiscore_rak4631
# add our variants files to the include and src paths
# define build flags for the TFT_eSPI library
build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_19003
src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board> src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
debug_tool = jlink debug_tool = jlink
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm) ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

10
variants/WisCore_RAK4631_Board/variant.h
View File

@ -58,11 +58,16 @@ extern "C" {
/* /*
* Buttons * Buttons
*/ */
#define PIN_BUTTON1 11
#ifdef RAK_BASE_5005
#define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
#define BUTTON_NEED_PULLUP
#endif
#define PIN_BUTTON2 12 #define PIN_BUTTON2 12
#define PIN_BUTTON3 24 #define PIN_BUTTON3 24
#define PIN_BUTTON4 25 #define PIN_BUTTON4 25
/* /*
* Analog pins * Analog pins
*/ */
@ -169,8 +174,11 @@ static const uint8_t SCK = PIN_SPI_SCK;
// #define PIN_GPS_RESET (34) // #define PIN_GPS_RESET (34)
#define PIN_GPS_EN (34) #define PIN_GPS_EN (34)
#define PIN_GPS_PPS (17) // Pulse per second input from the GPS #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
#ifdef RAK_BASE_5005
#define GPS_RX_PIN PIN_SERIAL1_RX #define GPS_RX_PIN PIN_SERIAL1_RX
#define GPS_TX_PIN PIN_SERIAL1_TX #define GPS_TX_PIN PIN_SERIAL1_TX
#endif
// Battery // Battery
// The battery sense is hooked to pin A0 (5) // The battery sense is hooked to pin A0 (5)