Skip to content

Commit a0867a0

Browse files
ripplebizripplebiz
authored
Merge pull request #2009 from MGJ520/dev
Support for GAT562 30S Mesh Kit device and fix other minor issues
2 parents 1a35d33 + 7ecfbfd commit a0867a0

9 files changed

Lines changed: 593 additions & 5 deletions

File tree

‎variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.cpp‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#include <Arduino.h>
2+
#include <Wire.h>
3+
4+
#include "GAT56230SMeshKitBoard.h"
5+
6+
7+
#ifdef NRF52_POWER_MANAGEMENT
8+
// Static configuration for power management
9+
// Values set in variant.h defines
10+
const PowerMgtConfig power_config = {
11+
.lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
12+
.lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
13+
.voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
14+
};
15+
16+
17+
void GAT56230SMeshKitBoard::initiateShutdown(uint8_t reason) {
18+
// Disable LoRa module power before shutdown
19+
digitalWrite(SX126X_POWER_EN, LOW);
20+
21+
if (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
22+
reason == SHUTDOWN_REASON_BOOT_PROTECT) {
23+
configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
24+
}
25+
26+
enterSystemOff(reason);
27+
}
28+
#endif // NRF52_POWER_MANAGEMENT
29+
30+
31+
void GAT56230SMeshKitBoard::begin() {
32+
NRF52BoardDCDC::begin();
33+
pinMode(PIN_VBAT_READ, INPUT);
34+
35+
// Set all button pins to INPUT_PULLUP
36+
pinMode(PIN_BUTTON1, INPUT_PULLUP);
37+
pinMode(PIN_BUTTON2, INPUT_PULLUP);
38+
pinMode(PIN_BUTTON3, INPUT_PULLUP);
39+
pinMode(PIN_BUTTON4, INPUT_PULLUP);
40+
pinMode(PIN_BUTTON5, INPUT_PULLUP);
41+
pinMode(PIN_BUTTON6, INPUT_PULLUP);
42+
43+
#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
44+
Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL);
45+
#endif
46+
47+
Wire.begin();
48+
49+
pinMode(SX126X_POWER_EN, OUTPUT);
50+
#ifdef NRF52_POWER_MANAGEMENT
51+
// Boot voltage protection check (may not return if voltage too low)
52+
// We need to call this after we configure SX126X_POWER_EN as output but before we pull high
53+
checkBootVoltage(&power_config);
54+
#endif
55+
digitalWrite(SX126X_POWER_EN, HIGH);
56+
delay(10); // give sx1262 some time to power up
57+
}

‎variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#pragma once
2+
3+
#include <MeshCore.h>
4+
#include <Arduino.h>
5+
#include <helpers/NRF52Board.h>
6+
7+
8+
class GAT56230SMeshKitBoard : public NRF52BoardDCDC {
9+
protected:
10+
#ifdef NRF52_POWER_MANAGEMENT
11+
void initiateShutdown(uint8_t reason) override;
12+
#endif
13+
14+
public:
15+
GAT56230SMeshKitBoard() : NRF52Board("GAT562_OTA") {}
16+
void begin();
17+
18+
#define BATTERY_SAMPLES 8
19+
20+
uint16_t getBattMilliVolts() override {
21+
analogReadResolution(12);
22+
23+
uint32_t raw = 0;
24+
for (int i = 0; i < BATTERY_SAMPLES; i++) {
25+
raw += analogRead(PIN_VBAT_READ);
26+
}
27+
raw = raw / BATTERY_SAMPLES;
28+
29+
return (ADC_MULTIPLIER * raw) / 4096;
30+
}
31+
32+
const char* getManufacturerName() const override {
33+
return "GAT562 30S Mesh Kit";
34+
}
35+
36+
#if defined(P_LORA_TX_LED)
37+
void onBeforeTransmit() override {
38+
digitalWrite(P_LORA_TX_LED, HIGH); // turn TX LED on
39+
}
40+
41+
void onAfterTransmit() override {
42+
digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED off
43+
}
44+
#endif
45+
46+
void powerOff() override {
47+
uint32_t button_pin = PIN_BUTTON1;
48+
nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
49+
nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
50+
sd_power_system_off();
51+
}
52+
53+
};

‎variants/gat562_30s_mesh_kit/platformio.ini‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
[GAT562_30S_Mesh_Kit]
2+
extends = nrf52_base
3+
board = rak4631
4+
board_check = true
5+
build_flags = ${nrf52_base.build_flags}
6+
${sensor_base.build_flags}
7+
-I variants/gat562_30s_mesh_kit
8+
-D RAK_4631
9+
-D RAK_BOARD
10+
-D NRF52_POWER_MANAGEMENT
11+
-D PIN_BOARD_SCL=14
12+
-D PIN_BOARD_SDA=13
13+
-D PIN_OLED_RESET=-1
14+
-D UI_HAS_JOYSTICK=1
15+
-D RADIO_CLASS=CustomSX1262
16+
-D WRAPPER_CLASS=CustomSX1262Wrapper
17+
-D LORA_TX_POWER=22
18+
-D SX126X_CURRENT_LIMIT=140
19+
-D PIN_BUZZER=33
20+
-D SX126X_RX_BOOSTED_GAIN=1
21+
-D SX126X_DIO2_AS_RF_SWITCH=true
22+
build_src_filter = ${nrf52_base.build_src_filter}
23+
+<../variants/gat562_30s_mesh_kit>
24+
+<helpers/ui/SSD1306Display.cpp>
25+
+<helpers/ui/MomentaryButton.cpp>
26+
+<helpers/sensors>
27+
lib_deps =
28+
${nrf52_base.lib_deps}
29+
${sensor_base.lib_deps}
30+
adafruit/Adafruit SSD1306 @ ^2.5.13
31+
sparkfun/SparkFun u-blox GNSS Arduino Library@^2.2.27
32+
33+
34+
[env:GAT562_30S_Mesh_Kit_repeater]
35+
extends = GAT562_30S_Mesh_Kit
36+
build_flags =
37+
${GAT562_30S_Mesh_Kit.build_flags}
38+
-D DISPLAY_CLASS=SSD1306Display
39+
-D ADVERT_NAME='"GAT562 Repeater"'
40+
-D ADVERT_LAT=0.0
41+
-D ADVERT_LON=0.0
42+
-D ADMIN_PASSWORD='"password"'
43+
-D MAX_NEIGHBOURS=50
44+
; -D MESH_PACKET_LOGGING=1
45+
; -D MESH_DEBUG=1
46+
build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
47+
+<helpers/ui/SSD1306Display.cpp>
48+
+<../examples/simple_repeater>
49+
50+
51+
[env:GAT562_30S_Mesh_Kit_room_server]
52+
extends = GAT562_30S_Mesh_Kit
53+
build_flags =
54+
${GAT562_30S_Mesh_Kit.build_flags}
55+
-D DISPLAY_CLASS=SSD1306Display
56+
-D ADVERT_NAME='"GAT562 Room"'
57+
-D ADVERT_LAT=0.0
58+
-D ADVERT_LON=0.0
59+
-D ADMIN_PASSWORD='"password"'
60+
-D ROOM_PASSWORD='"hello"'
61+
; -D MESH_PACKET_LOGGING=1
62+
; -D MESH_DEBUG=1
63+
build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
64+
+<helpers/ui/SSD1306Display.cpp>
65+
+<../examples/simple_room_server>
66+
67+
68+
[env:GAT562_30S_Mesh_Kit_companion_radio_usb]
69+
extends = GAT562_30S_Mesh_Kit
70+
board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
71+
board_upload.maximum_size = 712704
72+
build_flags =
73+
${GAT562_30S_Mesh_Kit.build_flags}
74+
-I examples/companion_radio/ui-new
75+
-D DISPLAY_CLASS=SSD1306Display
76+
-D MAX_CONTACTS=350
77+
-D MAX_GROUP_CHANNELS=40
78+
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
79+
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
80+
build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
81+
+<../examples/companion_radio/*.cpp>
82+
+<../examples/companion_radio/ui-new/*.cpp>
83+
+<helpers/ui/buzzer.cpp>
84+
lib_deps =
85+
${GAT562_30S_Mesh_Kit.lib_deps}
86+
densaugeo/base64 @ ~1.4.0
87+
end2endzone/NonBlockingRTTTL@^1.3.0
88+
89+
90+
[env:GAT562_30S_Mesh_Kit_companion_radio_ble]
91+
extends = GAT562_30S_Mesh_Kit
92+
board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
93+
board_upload.maximum_size = 712704
94+
build_flags =
95+
${GAT562_30S_Mesh_Kit.build_flags}
96+
-I examples/companion_radio/ui-new
97+
-D DISPLAY_CLASS=SSD1306Display
98+
-D MAX_CONTACTS=350
99+
-D MAX_GROUP_CHANNELS=40
100+
-D BLE_PIN_CODE=123456
101+
-D BLE_DEBUG_LOGGING=1
102+
-D OFFLINE_QUEUE_SIZE=256
103+
; -D MESH_PACKET_LOGGING=1
104+
; -D MESH_DEBUG=1
105+
build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
106+
+<helpers/nrf52/SerialBLEInterface.cpp>
107+
+<helpers/ui/buzzer.cpp>
108+
+<../examples/companion_radio/*.cpp>
109+
+<../examples/companion_radio/ui-new/*.cpp>
110+
lib_deps =
111+
${GAT562_30S_Mesh_Kit.lib_deps}
112+
densaugeo/base64 @ ~1.4.0
113+
end2endzone/NonBlockingRTTTL@^1.3.0
114+

‎variants/gat562_30s_mesh_kit/target.cpp‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#include <Arduino.h>
2+
#include "target.h"
3+
#include <helpers/ArduinoHelpers.h>
4+
5+
GAT56230SMeshKitBoard board;
6+
7+
#ifndef PIN_USER_BTN
8+
#define PIN_USER_BTN (-1)
9+
#endif
10+
11+
12+
#ifdef DISPLAY_CLASS
13+
DISPLAY_CLASS display;
14+
MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, false);
15+
MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false);
16+
MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false);
17+
MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true);
18+
#endif
19+
20+
21+
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
22+
23+
WRAPPER_CLASS radio_driver(radio, board);
24+
25+
VolatileRTCClock fallback_clock;
26+
AutoDiscoverRTCClock rtc_clock(fallback_clock);
27+
28+
#if ENV_INCLUDE_GPS
29+
#include <helpers/sensors/MicroNMEALocationProvider.h>
30+
MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
31+
EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
32+
#else
33+
EnvironmentSensorManager sensors;
34+
#endif
35+
36+
bool radio_init() {
37+
rtc_clock.begin(Wire);
38+
return radio.std_init(&SPI);
39+
}
40+
41+
uint32_t radio_get_rng_seed() {
42+
return radio.random(0x7FFFFFFF);
43+
}
44+
45+
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
46+
radio.setFrequency(freq);
47+
radio.setSpreadingFactor(sf);
48+
radio.setBandwidth(bw);
49+
radio.setCodingRate(cr);
50+
}
51+
52+
void radio_set_tx_power(int8_t dbm) {
53+
radio.setOutputPower(dbm);
54+
}
55+
56+
mesh::LocalIdentity radio_new_identity() {
57+
RadioNoiseListener rng(radio);
58+
return mesh::LocalIdentity(&rng); // create new random identity
59+
}

‎variants/gat562_30s_mesh_kit/target.h‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#pragma once
2+
3+
#define RADIOLIB_STATIC_ONLY 1
4+
#include <RadioLib.h>
5+
#include <helpers/radiolib/RadioLibWrappers.h>
6+
#include <GAT56230SMeshKitBoard.h>
7+
#include <helpers/radiolib/CustomSX1262Wrapper.h>
8+
#include <helpers/AutoDiscoverRTCClock.h>
9+
#include <helpers/sensors/EnvironmentSensorManager.h>
10+
11+
#ifdef DISPLAY_CLASS
12+
#include <helpers/ui/SSD1306Display.h>
13+
extern DISPLAY_CLASS display;
14+
#include <helpers/ui/MomentaryButton.h>
15+
extern MomentaryButton user_btn;
16+
extern MomentaryButton joystick_left;
17+
extern MomentaryButton joystick_right;
18+
extern MomentaryButton back_btn;
19+
#endif
20+
21+
extern GAT56230SMeshKitBoard board;
22+
extern WRAPPER_CLASS radio_driver;
23+
extern AutoDiscoverRTCClock rtc_clock;
24+
extern EnvironmentSensorManager sensors;
25+
26+
bool radio_init();
27+
uint32_t radio_get_rng_seed();
28+
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
29+
void radio_set_tx_power(int8_t dbm);
30+
mesh::LocalIdentity radio_new_identity();

‎variants/gat562_30s_mesh_kit/variant.cpp‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
3+
Copyright (c) 2016 Sandeep Mistry All right reserved.
4+
Copyright (c) 2018, Adafruit Industries (adafruit.com)
5+
6+
This library is free software; you can redistribute it and/or
7+
modify it under the terms of the GNU Lesser General Public
8+
License as published by the Free Software Foundation; either
9+
version 2.1 of the License, or (at your option) any later version.
10+
11+
This library is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14+
See the GNU Lesser General Public License for more details.
15+
16+
You should have received a copy of the GNU Lesser General Public
17+
License along with this library; if not, write to the Free Software
18+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*/
20+
21+
#include "variant.h"
22+
#include "wiring_constants.h"
23+
#include "wiring_digital.h"
24+
#include "nrf.h"
25+
26+
const uint32_t g_ADigitalPinMap[] =
27+
{
28+
// P0
29+
0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 ,
30+
8 , 9 , 10, 11, 12, 13, 14, 15,
31+
16, 17, 18, 19, 20, 21, 22, 23,
32+
24, 25, 26, 27, 28, 29, 30, 31,
33+
34+
// P1
35+
32, 33, 34, 35, 36, 37, 38, 39,
36+
40, 41, 42, 43, 44, 45, 46, 47
37+
};
38+
39+
40+
void initVariant()
41+
{
42+
// LED1 & LED2
43+
pinMode(PIN_LED1, OUTPUT);
44+
ledOff(PIN_LED1);
45+
46+
// pinMode(PIN_LED2, OUTPUT);
47+
// ledOff(PIN_LED2);;
48+
}
49+

0 commit comments

Comments
 (0)