-
Notifications
You must be signed in to change notification settings - Fork 687
Support for GAT562 Mesh Watch13 device #2138
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MGJ520
wants to merge
2
commits into
meshcore-dev:dev
Choose a base branch
from
MGJ520:dev_GAT562_Mesh_Watch13
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #include <Arduino.h> | ||
| #include <Wire.h> | ||
|
|
||
| #include "GAT56MeshWatch13Board.h" | ||
|
|
||
|
|
||
| #ifdef NRF52_POWER_MANAGEMENT | ||
| // Static configuration for power management | ||
| // Values set in variant.h defines | ||
| const PowerMgtConfig power_config = { | ||
| .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN, | ||
| .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL, | ||
| .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK | ||
| }; | ||
|
|
||
|
|
||
| void GAT56MeshWatch13Board::initiateShutdown(uint8_t reason) { | ||
| if (reason == SHUTDOWN_REASON_LOW_VOLTAGE || | ||
| reason == SHUTDOWN_REASON_BOOT_PROTECT) { | ||
| configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel); | ||
| } | ||
| enterSystemOff(reason); | ||
| } | ||
| #endif // NRF52_POWER_MANAGEMENT | ||
|
|
||
|
|
||
| void GAT56MeshWatch13Board::begin() { | ||
| NRF52BoardDCDC::begin(); | ||
| pinMode(PIN_VBAT_READ, INPUT); | ||
|
|
||
|
|
||
| #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL) | ||
| Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL); | ||
| #endif | ||
|
|
||
| Wire.begin(); | ||
|
|
||
| pinMode(SX126X_POWER_EN, OUTPUT); | ||
| #ifdef NRF52_POWER_MANAGEMENT | ||
| // Boot voltage protection check (may not return if voltage too low) | ||
| // We need to call this after we configure SX126X_POWER_EN as output but before we pull high | ||
| checkBootVoltage(&power_config); | ||
| #endif | ||
| digitalWrite(SX126X_POWER_EN, HIGH); | ||
| delay(10); // give sx1262 some time to power up | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #pragma once | ||
|
|
||
| #include <MeshCore.h> | ||
| #include <Arduino.h> | ||
| #include <helpers/NRF52Board.h> | ||
|
|
||
|
|
||
| class GAT56MeshWatch13Board : public NRF52BoardDCDC { | ||
| protected: | ||
| #ifdef NRF52_POWER_MANAGEMENT | ||
| void initiateShutdown(uint8_t reason) override; | ||
| #endif | ||
|
|
||
| public: | ||
| GAT56MeshWatch13Board() : NRF52Board("GAT562_OTA") {} | ||
| void begin(); | ||
|
|
||
| #define BATTERY_SAMPLES 8 | ||
|
|
||
| uint16_t getBattMilliVolts() override { | ||
| analogReadResolution(12); | ||
|
|
||
| uint32_t raw = 0; | ||
| for (int i = 0; i < BATTERY_SAMPLES; i++) { | ||
| raw += analogRead(PIN_VBAT_READ); | ||
| } | ||
| raw = raw / BATTERY_SAMPLES; | ||
|
|
||
| return (ADC_MULTIPLIER * raw) / 4096; | ||
| } | ||
|
|
||
| const char* getManufacturerName() const override { | ||
| return "GAT562 Mesh Watch 13"; | ||
| } | ||
|
|
||
|
|
||
| void powerOff() override { | ||
| uint32_t button_pin = PIN_BUTTON2; | ||
| nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP); | ||
| nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW); | ||
| sd_power_system_off(); | ||
| } | ||
|
|
||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| [GAT562_Mesh_Watch13] | ||
| extends = nrf52_base | ||
| board = rak4631 | ||
| board_check = true | ||
| build_flags = ${nrf52_base.build_flags} | ||
| ${sensor_base.build_flags} | ||
| -UENV_INCLUDE_GPS | ||
| -I variants/gat562_mesh_watch13 | ||
| -D RAK_4631 | ||
| -D RAK_BOARD | ||
| -D NRF52_POWER_MANAGEMENT | ||
| -D PIN_BOARD_SCL=14 | ||
| -D PIN_BOARD_SDA=13 | ||
| -D PIN_OLED_RESET=-1 | ||
| -D RADIO_CLASS=CustomSX1262 | ||
| -D WRAPPER_CLASS=CustomSX1262Wrapper | ||
| -D LORA_TX_POWER=19 | ||
| -D SX126X_CURRENT_LIMIT=140 | ||
| -D SX126X_RX_BOOSTED_GAIN=1 | ||
| -D QSPIFLASH=1 | ||
| build_src_filter = ${nrf52_base.build_src_filter} | ||
| +<../variants/gat562_mesh_watch13> | ||
| +<helpers/ui/SSD1306Display.cpp> | ||
| +<helpers/ui/MomentaryButton.cpp> | ||
| +<helpers/sensors> | ||
| lib_deps = | ||
| ${nrf52_base.lib_deps} | ||
| ${sensor_base.lib_deps} | ||
| adafruit/Adafruit SSD1306 @ ^2.5.13 | ||
|
|
||
|
|
||
| ;[env:GAT562_Mesh_Watch13_repeater] | ||
| ;extends = GAT562_Mesh_Watch13 | ||
| ;build_flags = | ||
| ; ${GAT562_Mesh_Watch13.build_flags} | ||
| ; -D DISPLAY_CLASS=SSD1306Display | ||
| ; -D ADVERT_NAME='"GAT562 Repeater"' | ||
| ; -D ADVERT_LAT=0.0 | ||
| ; -D ADVERT_LON=0.0 | ||
| ; -D ADMIN_PASSWORD='"password"' | ||
| ; -D MAX_NEIGHBOURS=50 | ||
| ;; -D MESH_PACKET_LOGGING=1 | ||
| ;; -D MESH_DEBUG=1 | ||
| ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} | ||
| ; +<helpers/ui/SSD1306Display.cpp> | ||
| ; +<../examples/simple_repeater> | ||
|
|
||
| ;[env:GAT562_Mesh_Watch13_room_server] | ||
| ;extends = GAT562_Mesh_Watch13 | ||
| ;build_flags = | ||
| ; ${GAT562_Mesh_Watch13.build_flags} | ||
| ; -D DISPLAY_CLASS=SSD1306Display | ||
| ; -D ADVERT_NAME='"GAT562 Room"' | ||
| ; -D ADVERT_LAT=0.0 | ||
| ; -D ADVERT_LON=0.0 | ||
| ; -D ADMIN_PASSWORD='"password"' | ||
| ; -D ROOM_PASSWORD='"hello"' | ||
| ;; -D MESH_PACKET_LOGGING=1 | ||
| ;; -D MESH_DEBUG=1 | ||
| ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} | ||
| ; +<helpers/ui/SSD1306Display.cpp> | ||
| ; +<../examples/simple_room_server> | ||
|
|
||
| [env:GAT562_Mesh_Watch13_companion_radio_ble] | ||
| extends = GAT562_Mesh_Watch13 | ||
| board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld | ||
| board_upload.maximum_size = 712704 | ||
| build_flags = | ||
| ${GAT562_Mesh_Watch13.build_flags} | ||
| -I examples/companion_radio/ui-new | ||
| -D DISPLAY_CLASS=SSD1306Display | ||
| -D MAX_CONTACTS=350 | ||
| -D MAX_GROUP_CHANNELS=40 | ||
| -D BLE_PIN_CODE=123456 | ||
| -D BLE_DEBUG_LOGGING=1 | ||
| -D OFFLINE_QUEUE_SIZE=256 | ||
| ; -D PIN_VIBRATION=36 | ||
| ; -D MESH_PACKET_LOGGING=1 | ||
| ; -D MESH_DEBUG=1 | ||
| build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} | ||
| +<helpers/nrf52/SerialBLEInterface.cpp> | ||
| +<helpers/ui/MomentaryButton.cpp> | ||
| +<helpers/ui/GenericVibration.cpp> | ||
| +<../examples/companion_radio/*.cpp> | ||
| +<../examples/companion_radio/ui-new/*.cpp> | ||
| lib_deps = | ||
| ${GAT562_Mesh_Watch13.lib_deps} | ||
| densaugeo/base64 @ ~1.4.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #include <Arduino.h> | ||
| #include "target.h" | ||
| #include <helpers/ArduinoHelpers.h> | ||
|
|
||
| GAT56MeshWatch13Board board; | ||
|
|
||
| #ifndef PIN_USER_BTN | ||
| #define PIN_USER_BTN (-1) | ||
| #endif | ||
|
|
||
|
|
||
| #ifdef DISPLAY_CLASS | ||
| DISPLAY_CLASS display; | ||
| MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, false); | ||
| MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); | ||
| #endif | ||
|
|
||
|
|
||
| RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); | ||
|
|
||
| WRAPPER_CLASS radio_driver(radio, board); | ||
|
|
||
| VolatileRTCClock fallback_clock; | ||
| AutoDiscoverRTCClock rtc_clock(fallback_clock); | ||
| EnvironmentSensorManager sensors; | ||
|
|
||
|
|
||
| bool radio_init() { | ||
| rtc_clock.begin(Wire); | ||
| return radio.std_init(&SPI); | ||
| } | ||
|
|
||
| uint32_t radio_get_rng_seed() { | ||
| return radio.random(0x7FFFFFFF); | ||
| } | ||
|
|
||
| void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) { | ||
| radio.setFrequency(freq); | ||
| radio.setSpreadingFactor(sf); | ||
| radio.setBandwidth(bw); | ||
| radio.setCodingRate(cr); | ||
| } | ||
|
|
||
| void radio_set_tx_power(int8_t dbm) { | ||
| radio.setOutputPower(dbm); | ||
| } | ||
|
|
||
| mesh::LocalIdentity radio_new_identity() { | ||
| RadioNoiseListener rng(radio); | ||
| return mesh::LocalIdentity(&rng); // create new random identity | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #pragma once | ||
|
|
||
| #define RADIOLIB_STATIC_ONLY 1 | ||
| #include <RadioLib.h> | ||
| #include <helpers/radiolib/RadioLibWrappers.h> | ||
| #include <GAT56MeshWatch13Board.h> | ||
| #include <helpers/radiolib/CustomSX1262Wrapper.h> | ||
| #include <helpers/AutoDiscoverRTCClock.h> | ||
| #include <helpers/sensors/EnvironmentSensorManager.h> | ||
|
|
||
| #ifdef DISPLAY_CLASS | ||
| #include <helpers/ui/SSD1306Display.h> | ||
| extern DISPLAY_CLASS display; | ||
| #include <helpers/ui/MomentaryButton.h> | ||
| extern MomentaryButton user_btn; | ||
| extern MomentaryButton back_btn; | ||
| #endif | ||
|
|
||
| #ifdef PIN_VIBRATION | ||
| #include <helpers/ui/GenericVibration.h> | ||
| #endif | ||
|
|
||
| extern GAT56MeshWatch13Board board; | ||
| extern WRAPPER_CLASS radio_driver; | ||
| extern AutoDiscoverRTCClock rtc_clock; | ||
| extern EnvironmentSensorManager sensors; | ||
|
|
||
| bool radio_init(); | ||
| uint32_t radio_get_rng_seed(); | ||
| void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); | ||
| void radio_set_tx_power(int8_t dbm); | ||
| mesh::LocalIdentity radio_new_identity(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| 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[] = | ||
| { | ||
| // 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() | ||
| { | ||
|
|
||
| } | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure the repeater and room server targets are practical(?)
Could help out our release compute time by removing those two. Already so many variants that get built at each release. Good to not have spurious ones that aren't needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello, I have thought about this issue. The low-power design of the watch is very suitable for outdoor solar-powered message relay nodes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say you can keep these in the
platformio.inibut you should comment them out. Using a watch as a solar powered repeater node doesn't sound like a very normal use case to me either. Anyone that wants this can uncomment the definitions and build it themselves :)As @ripplebiz noted, this would cost us more build minutes and increase our already 1-hour-long build process when we do new releases.
I would probably say just keep the companion role for the watch. The companion firmware already supports companion repeat mode, if a relay node use case is required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, it's a pretty good solution.