From acbe8c159b3e530a90036b9d28c6b8bd39487c74 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 10 Jul 2020 12:38:11 -0700 Subject: [PATCH] move rak815 variant to arduino repo --- docs/software/nrf52-TODO.md | 30 +++++++++ variants/rak815/variant.cpp | 81 ----------------------- variants/rak815/variant.h | 128 ------------------------------------ 3 files changed, 30 insertions(+), 209 deletions(-) delete mode 100644 variants/rak815/variant.cpp delete mode 100644 variants/rak815/variant.h diff --git a/docs/software/nrf52-TODO.md b/docs/software/nrf52-TODO.md index 424b3c42..c56bd941 100644 --- a/docs/software/nrf52-TODO.md +++ b/docs/software/nrf52-TODO.md @@ -35,6 +35,36 @@ Run. tips on installing https://github.com/platformio/platform-nordicnrf52/issues/8#issuecomment-374017768 +to see console output over jlink: +``` +12:17 +in one tab run "bin/nrf52832-gdbserver.sh" - leave this running the whole time while developing/debugging +12:17 +~/development/meshtastic/meshtastic-esp32$ bin/nrf52-console.sh +###RTT Client: ************************************************************ +###RTT Client: * SEGGER Microcontroller GmbH * +###RTT Client: * Solutions for real time microcontroller applications * +###RTT Client: ************************************************************ +###RTT Client: * * +###RTT Client: * (c) 2012 - 2016 SEGGER Microcontroller GmbH * +###RTT Client: * * +###RTT Client: * www.segger.com Support: support@segger.com * +###RTT Client: * * +###RTT Client: ************************************************************ +###RTT Client: * * +###RTT Client: * SEGGER J-Link RTT Client Compiled Apr 7 2020 15:01:22 * +###RTT Client: * * +###RTT Client: ************************************************************ +###RTT Client: ----------------------------------------------- +###RTT Client: Connecting to J-Link RTT Server via localhost:19021 .............. +###RTT Client: Connected. +SEGGER J-Link V6.70c - Real time terminal output +SEGGER J-Link ARM V9.6, SN=69663845 +Process: JLinkGDBServerCLExein another tab run: +12:18 +On NRF52 I've been using the jlink fake serial console. But since the rak815 has the serial port hooked up we can switch back to that once the basics are working. +``` + ## Misc work items RAM investigation. diff --git a/variants/rak815/variant.cpp b/variants/rak815/variant.cpp deleted file mode 100644 index 4d48b971..00000000 --- a/variants/rak815/variant.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - 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 "wiring_constants.h" -#include "wiring_digital.h" -#include "nrf.h" - -const uint32_t g_ADigitalPinMap[] = { - // D0 - D7 - 0, // xtal 1 - 1, // xtal 2 - 2, // a0 - 3, // a1 - 4, // a2 - 5, // a3 - 6, // TXD - 7, // GPIO #7 - - // D8 - D13 - 8, // RXD - - 9, // NFC1 - 10, // NFC2 - - 11, // GPIO11 - - 12, // SCK - 13, // MOSI - 14, // MISO - - 15, // GPIO #15 - 16, // GPIO #16 - - // function set pins - 17, // LED #1 (red) - 18, // SWO - 19, // LED #2 (blue) - 20, // DFU - 21, // Reset - 22, // Factory Reset - 23, // N/A - 24, // N/A - - 25, // SDA - 26, // SCL - 27, // GPIO #27 - 28, // A4 - 29, // A5 - 30, // A6 - 31, // A7 -}; - -void initVariant() -{ - // LED1 & LED2 - pinMode(PIN_LED1, OUTPUT); - ledOff(PIN_LED1); - - pinMode(PIN_LED2, OUTPUT); - ledOff(PIN_LED2); -} - diff --git a/variants/rak815/variant.h b/variants/rak815/variant.h deleted file mode 100644 index 0541ea5f..00000000 --- a/variants/rak815/variant.h +++ /dev/null @@ -1,128 +0,0 @@ - /* - 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_RAK815_ -#define _VARIANT_RAK815_ - -/** 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 (32u) -#define NUM_DIGITAL_PINS (32u) -#define NUM_ANALOG_INPUTS (8u) -#define NUM_ANALOG_OUTPUTS (0u) - -// LEDs -#define PIN_LED1 (25) -#define PIN_LED2 (26) - -#define LED_BUILTIN PIN_LED1 -#define LED_CONN PIN_LED2 - -// The BLE stack is hardwired to look for these constants -#define LED_RED PIN_LED1 -#define LED_BLUE PIN_LED2 - -#define LED_STATE_ON 0 // State when LED is litted - -/* - * Analog pins - */ -#define PIN_A0 (2) -#define PIN_A1 (3) -#define PIN_A2 (4) -#define PIN_A3 (5) -#define PIN_A4 (28) -#define PIN_A5 (29) -#define PIN_A6 (30) -#define PIN_A7 (31) - -static const uint8_t A0 = PIN_A0 ; -static const uint8_t A1 = PIN_A1 ; -static const uint8_t A2 = PIN_A2 ; -static const uint8_t A3 = PIN_A3 ; -static const uint8_t A4 = PIN_A4 ; -static const uint8_t A5 = PIN_A5 ; -static const uint8_t A6 = PIN_A6 ; -static const uint8_t A7 = PIN_A7 ; -#define ADC_RESOLUTION 14 - -// Other pins -#define PIN_AREF (24) -#define PIN_VBAT PIN_A7 -#define PIN_NFC1 (9) -#define PIN_NFC2 (10) - -static const uint8_t AREF = PIN_AREF; - -/* - * Serial interfaces - */ -#define PIN_SERIAL_RX (28) -#define PIN_SERIAL_TX (29) - -/* - * SPI Interfaces - */ -#define SPI_INTERFACES_COUNT 1 - -/* - * This is the interal SPI bus for the RAK813 module - goes to the lora chip - */ - -#define PIN_SPI_MISO (12) -#define PIN_SPI_MOSI (13) -#define PIN_SPI_SCK (11) - -static const uint8_t SS = 14 ; -static const uint8_t MOSI = PIN_SPI_MOSI ; -static const uint8_t MISO = PIN_SPI_MISO ; -static const uint8_t SCK = PIN_SPI_SCK ; - -/* - * Wire Interfaces - */ -#define WIRE_INTERFACES_COUNT 1 - -#define PIN_WIRE_SDA (15u) -#define PIN_WIRE_SCL (16u) - -#ifdef __cplusplus -} -#endif - -/*---------------------------------------------------------------------------- - * Arduino objects - C++ only - *----------------------------------------------------------------------------*/ - -#endif