2020-04-30 17:43:29 -07:00
|
|
|
#include "RF95Interface.h"
|
|
|
|
|
#include "MeshRadio.h" // kinda yucky, but we need to know which region we are in
|
2020-04-30 21:11:03 -07:00
|
|
|
#include "RadioLibRF95.h"
|
2023-01-21 14:34:29 +01:00
|
|
|
#include "configuration.h"
|
2020-12-27 13:09:20 +08:00
|
|
|
#include "error.h"
|
2020-04-30 17:43:29 -07:00
|
|
|
|
2024-01-12 02:00:31 -06:00
|
|
|
#if ARCH_PORTDUINO
|
|
|
|
|
#include "PortduinoGlue.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
#ifndef RF95_MAX_POWER
|
|
|
|
|
#define RF95_MAX_POWER 20
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-05-02 19:52:37 -07:00
|
|
|
// if we use 20 we are limited to 1% duty cycle or hw might overheat. For continuous operation set a limit of 17
|
2020-10-08 09:57:59 +08:00
|
|
|
// In theory up to 27 dBm is possible, but the modules installed in most radios can cope with a max of 20. So BIG WARNING
|
|
|
|
|
// if you set power to something higher than 17 or 20 you might fry your board.
|
2020-05-02 19:52:37 -07:00
|
|
|
|
2020-09-15 17:55:33 -07:00
|
|
|
#define POWER_DEFAULT 17 // How much power to use if the user hasn't set a power level
|
2024-06-09 23:03:39 +02:00
|
|
|
#ifdef RADIOMASTER_900_BANDIT_NANO
|
|
|
|
|
// Structure to hold DAC and DB values
|
|
|
|
|
typedef struct {
|
|
|
|
|
uint8_t dac;
|
|
|
|
|
uint8_t db;
|
|
|
|
|
} DACDB;
|
|
|
|
|
|
|
|
|
|
// Interpolation function
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
DACDB interpolate(uint8_t dbm, uint8_t dbm1, uint8_t dbm2, DACDB val1, DACDB val2)
|
|
|
|
|
{
|
2024-06-09 23:03:39 +02:00
|
|
|
DACDB result;
|
|
|
|
|
double fraction = (double)(dbm - dbm1) / (dbm2 - dbm1);
|
|
|
|
|
result.dac = (uint8_t)(val1.dac + fraction * (val2.dac - val1.dac));
|
|
|
|
|
result.db = (uint8_t)(val1.db + fraction * (val2.db - val1.db));
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Function to find the correct DAC and DB values based on dBm using interpolation
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
DACDB getDACandDB(uint8_t dbm)
|
|
|
|
|
{
|
2024-06-09 23:03:39 +02:00
|
|
|
// Predefined values
|
|
|
|
|
static const struct {
|
|
|
|
|
uint8_t dbm;
|
|
|
|
|
DACDB values;
|
|
|
|
|
} dbmToDACDB[] = {
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
{20, {168, 2}}, // 100mW
|
|
|
|
|
{24, {148, 6}}, // 250mW
|
|
|
|
|
{27, {128, 9}}, // 500mW
|
|
|
|
|
{30, {90, 12}} // 1000mW
|
2024-06-09 23:03:39 +02:00
|
|
|
};
|
|
|
|
|
const int numValues = sizeof(dbmToDACDB) / sizeof(dbmToDACDB[0]);
|
|
|
|
|
|
|
|
|
|
// Find the interval dbm falls within and interpolate
|
|
|
|
|
for (int i = 0; i < numValues - 1; i++) {
|
|
|
|
|
if (dbm >= dbmToDACDB[i].dbm && dbm <= dbmToDACDB[i + 1].dbm) {
|
|
|
|
|
return interpolate(dbm, dbmToDACDB[i].dbm, dbmToDACDB[i + 1].dbm, dbmToDACDB[i].values, dbmToDACDB[i + 1].values);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Return a default value if no match is found and default to 100mW
|
|
|
|
|
DACDB defaultValue = {168, 2};
|
|
|
|
|
return defaultValue;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2020-09-15 17:55:33 -07:00
|
|
|
|
2023-05-08 13:18:28 +02:00
|
|
|
RF95Interface::RF95Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
|
|
|
|
|
RADIOLIB_PIN_TYPE busy)
|
|
|
|
|
: RadioLibInterface(hal, cs, irq, rst, busy)
|
2020-04-30 17:43:29 -07:00
|
|
|
{
|
2024-03-21 20:45:48 -05:00
|
|
|
LOG_DEBUG("RF95Interface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
|
2020-04-30 17:43:29 -07:00
|
|
|
}
|
|
|
|
|
|
2020-07-13 13:18:32 -07:00
|
|
|
/** Some boards require GPIO control of tx vs rx paths */
|
|
|
|
|
void RF95Interface::setTransmitEnable(bool txon)
|
|
|
|
|
{
|
|
|
|
|
#ifdef RF95_TXEN
|
|
|
|
|
digitalWrite(RF95_TXEN, txon ? 1 : 0);
|
2024-01-12 02:00:31 -06:00
|
|
|
#elif ARCH_PORTDUINO
|
|
|
|
|
if (settingsMap[txen] != RADIOLIB_NC) {
|
|
|
|
|
digitalWrite(settingsMap[txen], txon ? 1 : 0);
|
|
|
|
|
}
|
2020-07-13 13:18:32 -07:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef RF95_RXEN
|
|
|
|
|
digitalWrite(RF95_RXEN, txon ? 0 : 1);
|
2024-01-12 02:00:31 -06:00
|
|
|
#elif ARCH_PORTDUINO
|
|
|
|
|
if (settingsMap[rxen] != RADIOLIB_NC) {
|
|
|
|
|
digitalWrite(settingsMap[rxen], txon ? 0 : 1);
|
|
|
|
|
}
|
2020-07-13 13:18:32 -07:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-30 17:43:29 -07:00
|
|
|
/// Initialise the Driver transport hardware and software.
|
|
|
|
|
/// Make sure the Driver is properly configured before calling init().
|
|
|
|
|
/// \return true if initialisation succeeded.
|
|
|
|
|
bool RF95Interface::init()
|
|
|
|
|
{
|
2020-05-01 12:11:04 -07:00
|
|
|
RadioLibInterface::init();
|
2020-05-02 19:52:37 -07:00
|
|
|
|
2024-06-09 23:03:39 +02:00
|
|
|
#ifdef RADIOMASTER_900_BANDIT_NANO
|
|
|
|
|
// DAC and DB values based on dBm using interpolation
|
|
|
|
|
DACDB dacDbValues = getDACandDB(power);
|
|
|
|
|
int8_t powerDAC = dacDbValues.dac;
|
|
|
|
|
power = dacDbValues.db;
|
|
|
|
|
#endif
|
|
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
if (power > RF95_MAX_POWER) // This chip has lower power limits than some
|
|
|
|
|
power = RF95_MAX_POWER;
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
|
2020-09-15 18:54:50 -07:00
|
|
|
limitPower();
|
SX1262: fix serious bug with detecting if we have a rx packet in progress
Could cause hangs on the way into sleep (and enormous power consumption).
Instead of checking for rx packet length (which only changes at completion)
check if we've received preamble bits but haven't yet received a completed
packet interrupt.
notes:
wait to sleep loop problem
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Can not send yet, busyRx
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
vs normal run
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Starting low level send (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
Completed sending (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
2020-10-07 13:43:51 +08:00
|
|
|
|
2020-04-30 21:29:51 -07:00
|
|
|
iface = lora = new RadioLibRF95(&module);
|
2020-07-10 14:37:01 -07:00
|
|
|
|
|
|
|
|
#ifdef RF95_TCXO
|
|
|
|
|
pinMode(RF95_TCXO, OUTPUT);
|
|
|
|
|
digitalWrite(RF95_TCXO, 1);
|
|
|
|
|
#endif
|
|
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
// enable PA
|
|
|
|
|
#ifdef RF95_PA_EN
|
|
|
|
|
#if defined(RF95_PA_DAC_EN)
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
#ifdef RADIOMASTER_900_BANDIT_NANO
|
|
|
|
|
// Use calculated DAC value
|
|
|
|
|
dacWrite(RF95_PA_EN, powerDAC);
|
|
|
|
|
#else
|
|
|
|
|
// Use Value set in /*/variant.h
|
|
|
|
|
dacWrite(RF95_PA_EN, RF95_PA_LEVEL);
|
|
|
|
|
#endif
|
2024-05-31 10:56:04 -05:00
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-07-13 13:18:32 -07:00
|
|
|
/*
|
|
|
|
|
#define RF95_TXEN (22) // If defined, this pin should be set high prior to transmit (controls an external analog switch)
|
|
|
|
|
#define RF95_RXEN (23) // If defined, this pin should be set high prior to receive (controls an external analog switch)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef RF95_TXEN
|
|
|
|
|
pinMode(RF95_TXEN, OUTPUT);
|
|
|
|
|
digitalWrite(RF95_TXEN, 0);
|
|
|
|
|
#endif
|
|
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
#ifdef RF95_FAN_EN
|
|
|
|
|
pinMode(RF95_FAN_EN, OUTPUT);
|
|
|
|
|
digitalWrite(RF95_FAN_EN, 1);
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-07-13 13:18:32 -07:00
|
|
|
#ifdef RF95_RXEN
|
|
|
|
|
pinMode(RF95_RXEN, OUTPUT);
|
|
|
|
|
digitalWrite(RF95_RXEN, 1);
|
2024-01-12 02:00:31 -06:00
|
|
|
#endif
|
|
|
|
|
#if ARCH_PORTDUINO
|
|
|
|
|
if (settingsMap[txen] != RADIOLIB_NC) {
|
|
|
|
|
pinMode(settingsMap[txen], OUTPUT);
|
|
|
|
|
digitalWrite(settingsMap[txen], 0);
|
|
|
|
|
}
|
|
|
|
|
if (settingsMap[rxen] != RADIOLIB_NC) {
|
|
|
|
|
pinMode(settingsMap[rxen], OUTPUT);
|
|
|
|
|
digitalWrite(settingsMap[rxen], 0);
|
|
|
|
|
}
|
2020-07-13 13:18:32 -07:00
|
|
|
#endif
|
|
|
|
|
setTransmitEnable(false);
|
|
|
|
|
|
2023-02-16 20:58:10 +01:00
|
|
|
int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
|
2022-12-30 10:27:07 -06:00
|
|
|
LOG_INFO("RF95 init result %d\n", res);
|
2023-01-21 14:34:29 +01:00
|
|
|
LOG_INFO("Frequency set to %f\n", getFreq());
|
|
|
|
|
LOG_INFO("Bandwidth set to %f\n", bw);
|
|
|
|
|
LOG_INFO("Power output set to %d\n", power);
|
2024-06-09 23:03:39 +02:00
|
|
|
#ifdef RADIOMASTER_900_BANDIT_NANO
|
|
|
|
|
LOG_INFO("DAC output set to %d\n", powerDAC);
|
|
|
|
|
#endif
|
2022-06-21 21:51:45 -07:00
|
|
|
|
2022-05-29 19:30:20 -05:00
|
|
|
if (res == RADIOLIB_ERR_NONE)
|
|
|
|
|
res = lora->setCRC(RADIOLIB_SX126X_LORA_CRC_ON);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
2022-05-29 19:30:20 -05:00
|
|
|
if (res == RADIOLIB_ERR_NONE)
|
2020-04-30 17:43:29 -07:00
|
|
|
startReceive(); // start receiving
|
|
|
|
|
|
2022-05-29 19:30:20 -05:00
|
|
|
return res == RADIOLIB_ERR_NONE;
|
2020-04-30 17:43:29 -07:00
|
|
|
}
|
|
|
|
|
|
2020-04-30 17:56:30 -07:00
|
|
|
void INTERRUPT_ATTR RF95Interface::disableInterrupt()
|
|
|
|
|
{
|
|
|
|
|
lora->clearDio0Action();
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-30 17:43:29 -07:00
|
|
|
bool RF95Interface::reconfigure()
|
|
|
|
|
{
|
2021-03-30 23:34:13 +08:00
|
|
|
RadioLibInterface::reconfigure();
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
// set mode to standby
|
|
|
|
|
setStandby();
|
|
|
|
|
|
|
|
|
|
// configure publicly accessible settings
|
|
|
|
|
int err = lora->setSpreadingFactor(sf);
|
2022-05-29 19:30:20 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
2023-01-21 18:22:19 +01:00
|
|
|
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
err = lora->setBandwidth(bw);
|
2022-05-29 19:30:20 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
2023-01-21 18:22:19 +01:00
|
|
|
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
err = lora->setCodingRate(cr);
|
2022-05-29 19:30:20 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
2023-01-21 18:22:19 +01:00
|
|
|
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
err = lora->setSyncWord(syncWord);
|
2024-04-14 00:29:42 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
|
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 setSyncWord!\n", err);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(err == RADIOLIB_ERR_NONE);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
err = lora->setCurrentLimit(currentLimit);
|
2024-04-14 00:29:42 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
|
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 setCurrentLimit!\n", err);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(err == RADIOLIB_ERR_NONE);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
err = lora->setPreambleLength(preambleLength);
|
2024-04-14 00:29:42 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
|
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 setPreambleLength!\n", err);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(err == RADIOLIB_ERR_NONE);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
2021-09-13 22:13:51 +03:00
|
|
|
err = lora->setFrequency(getFreq());
|
2022-05-29 19:30:20 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
2023-01-21 18:22:19 +01:00
|
|
|
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
if (power > RF95_MAX_POWER) // This chip has lower power limits than some
|
|
|
|
|
power = RF95_MAX_POWER;
|
2023-01-21 14:34:29 +01:00
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
#ifdef USE_RF95_RFO
|
|
|
|
|
err = lora->setOutputPower(power, true);
|
|
|
|
|
#else
|
2020-04-30 17:43:29 -07:00
|
|
|
err = lora->setOutputPower(power);
|
2024-05-31 10:56:04 -05:00
|
|
|
#endif
|
2022-05-29 19:30:20 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
2023-01-21 18:22:19 +01:00
|
|
|
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
startReceive(); // restart receiving
|
|
|
|
|
|
2022-05-29 19:30:20 -05:00
|
|
|
return RADIOLIB_ERR_NONE;
|
2020-04-30 17:43:29 -07:00
|
|
|
}
|
|
|
|
|
|
2020-04-30 19:58:10 -07:00
|
|
|
/**
|
|
|
|
|
* Add SNR data to received messages
|
|
|
|
|
*/
|
2023-01-21 18:22:19 +01:00
|
|
|
void RF95Interface::addReceiveMetadata(meshtastic_MeshPacket *mp)
|
2020-04-30 19:58:10 -07:00
|
|
|
{
|
|
|
|
|
mp->rx_snr = lora->getSNR();
|
2022-02-28 17:07:31 -08:00
|
|
|
mp->rx_rssi = lround(lora->getRSSI());
|
2020-04-30 19:58:10 -07:00
|
|
|
}
|
|
|
|
|
|
2020-04-30 17:43:29 -07:00
|
|
|
void RF95Interface::setStandby()
|
|
|
|
|
{
|
|
|
|
|
int err = lora->standby();
|
2024-04-14 00:29:42 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
|
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 standby!\n", err);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(err == RADIOLIB_ERR_NONE);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
isReceiving = false; // If we were receiving, not any more
|
|
|
|
|
disableInterrupt();
|
2020-04-30 22:53:21 -07:00
|
|
|
completeSending(); // If we were sending, not anymore
|
Sync Wio lr1110 refresh with master (#4251)
* Fix protobuf structs handling (#4140)
* Fix protobuf structs handling
* Log instead of assert
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* BLE based logging (#4146)
* WIP log characteristic
* Bluetooth logging plumbing
* Characteristic
* Callback
* Check for nullptr
* Esp32 bluetooth impl
* Formatting
* Add thread name and log level
* Add settings guard
* Remove comments
* Field name
* Fixes esp32
* Open it up
* Whoops
* Move va_end past our logic
* Use `upload_protocol = esptool` as with the other heltec devices instead of `esp-builtin` (#4151)
* Standardize lat/lon position logs (#4156)
* Standardize lat/lon position logs
* Missed sone and condensed logs
* [create-pull-request] automated change (#4157)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Pause BLE logging during want_config flow (#4162)
* Update NimBLE to 1.4.2 (#4163)
* Implement replies for all telemetry types based on variant tag (#4164)
* Implement replies for all telemetry types based on variant tag
* Remove check for `ignoreRequest`: modules can set this, don't need to check
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Esptool is better
* Explicitly set characteristic
* fix INA3221 sensor (#4168)
- pass wire to begin()
- remove redundant setAddr() (already set in header)
* Show compass on waypoint frame; clear when waypoint deleted (#4116)
* Clear expired or deleted waypoint frame
* Return 0 to CallbackObserver
* Add a missing comment
* Draw compass for waypoint frame
* Display our own waypoints
* [create-pull-request] automated change (#4171)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Add semihosting support for nrf52 devices (#4137)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* fix my botched merge - keep board_level = extra flag for rak3631_dbg
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4174)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Display alerts (#4170)
* Move static functions into Screen.h, show compass during calibration
* Move to _fontHeight macro to avoid collision
* Move some alert functions to new alert handler
* Catch missed reboot code
* ESP32 fixes
* Bump esp8266-oled-ssd1306
* Fixes for when a device has no screen
* Use new startAlert(char*) helper class
* Add EINK bits back to alert handling
* Add noop class for no-display devices
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Send file system manifest up on want_config (#4176)
* Send file system manifest up on want_config
* Platform specific methods
* Helps to actually make the change
* Clear
* tell vscode, if formatting, use whatever our trunk formatter wants (#4186)
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* fix the build - would loop forever if there were no files to send (#4188)
* Show owner.short_name on boot (and E-Ink sleep screen) (#4134)
* Show owner.short_name on boot and sleep screen (on e-ink)
* Update Screen.cpp - new line for short_name
Boot screen short_name now below the region setting.
Looks better on small screens.
* Draw short_name on right
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* nrf52 soft device will watchdog if you use ICE while BT on... (#4189)
so have debugger disable bluetooth.
* correct xiao_ble build preventing sx1262 init (#4191)
* Force a compile time failur if FromRadio or ToRadio get larger than (#4190)
a BLE packet size. We are actually very close to this threshold so
important to make sure we don't accidentally pass it.
* Clear vector after complete config state (#4194)
* Clear after complete config
* Don't collect . entries
* Log file name and size
* [create-pull-request] automated change (#4200)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Make the logs Colorful! (#4199)
* Squash needlessly static functions (#4183)
* Trim extra vprintf and filter for unprintable characters
* Deprecate Router Client role (and make it Client) (#4201)
* [create-pull-request] automated change (#4205)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Move waypoint (#4202)
* Move waypoint screen draw into the waypoint module
* Get the observer set up for the waypoint screen draw
* Static squashing: screen dimensions
Macros moved back to Screen.cpp, as a band-aid until we eventually move all those static functions into the Screen class.
* Move getCompassDiam into Screen class
(supress compiler warnings)
At this stage, the method is still static, because it's used by drawNodeInfo, which has no tidy reference to our screen instance.
This is probably just another band-aid until these static functions all move.
* Use new getCompassDiam function in AccelerometerThread
* Properly gate display code in WaypointModule
---------
Co-authored-by: Todd Herbert <herbert.todd@gmail.com>
* Fix flakey phone api transition from file manifest to complete (#4209)
* Try fix flakey phone api transition from file manifest to complete
* Skip
* enable colors in platformio serial monitor (#4217)
* When talking via serial, encapsulate log messages in protobufs if necessary (#4187)
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* [create-pull-request] automated change (#4218)
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
* Fix SHT41 support (#4222)
* Add SHT41 Serial to I2c Detection Code
On the Seeed Wio-WM1110 Dev Kit board, the SHT41 chip was being
incorrectly detected as SHT31.
This patch adds the necessary serial number for the SHT41 chip to
be correctly detected.
fixes meshtastic/firmware#4221
* Add missing sensor read for SHT41
* Typo fix in logs - mhz - MHz (#4225)
As reported by karamo, a few different places in our logs had
incorrect capitalization of MHz.
fixes meshtastic/firmware#4126
* New new BLE logging characteristic with LogRecord protos (#4220)
* New UUID
* New log radio characteristic with LogRecord protobuf
* LogRecord
* Merge derp
* How did you get there
* Trunk
* Fix length
* Remove assert
* minor cleanup proposal (#4169)
* MESHTASTIC_EXCLUDE_WIFI and HAS_WIFI cleanup...
Our code was checking HAS_WIFI and the new MESHTASTIC_EXCLUDE_WIFI
flags in various places (even though EXCLUDE_WIFI forces HAS_WIFI
to 0). Instead just check HAS_WIFI, only use EXCLUDE_WIFI inside
configuration.h
* cleanup: use HAS_NETWORKING instead of HAS_WIFI || HAS_ETHERNET
We already had HAS_NETWORKING as flag in MQTT to mean 'we have
tcpip'. Generallize that and move it into configuration.h so that
we can use it elsewhere.
* Use #pragma once, because supported by gcc and all modern compilers
instead of #ifdef DOTHFILE_H etc...
---------
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
* Add PowerMon support (#4155)
* Turn off vscode cmake prompt - we don't use cmake on meshtastic
* Add rak4631_dap variant for debugging with NanoDAP debug probe device.
* The rak device can also run freertos (which is underneath nrf52 arduino)
* Add semihosting support for nrf52840 devices
Initial platformio.ini file only supports rak4630
Default to non TCP for the semihosting log output for now...
Fixes https://github.com/meshtastic/firmware/issues/4135
* powermon WIP (for https://github.com/meshtastic/firmware/issues/4136 )
* oops - mean't to mark the _dbg variant as an 'extra' board.
* powermon wip
* Make serial port on wio-sdk-wm1110 board work
By disabling the (inaccessible) adafruit USB
* Instrument (radiolib only for now) lora for powermon
per https://github.com/meshtastic/firmware/issues/4136
* powermon gps support
https://github.com/meshtastic/firmware/issues/4136
* Add CPU deep and light sleep powermon states
https://github.com/meshtastic/firmware/issues/4136
* Change the board/swversion bootstring so it is a new "structured" log msg.
* powermon wip
* add example script for getting esp S3 debugging working
Not yet used but I didn't want these nasty tricks to get lost yet.
* Add PowerMon reporting for screen and bluetooth pwr.
* make power.powermon_enables config setting work.
* update to latest protobufs
* fix bogus shellcheck warning
* make powermon optional (but default enabled because tiny and no runtime impact)
* tell vscode, if formatting, use whatever our trunk formatter wants
without this flag if the user has set some other formatter (clang)
in their user level settings, it will be looking in the wrong directory
for the clang options (we want the options in .trunk/clang)
Note: formatOnSave is true in master, which means a bunch of our older
files are non compliant and if you edit them it will generate lots of
formatting related diffs. I guess I'll start letting that happen with
my future commits ;-).
* add PowerStress module
* nrf52 arduino is built upon freertos, so let platformio debug it
* don't accidentally try to Segger ICE if we are using another ICE
* clean up RedirectablePrint::log so it doesn't have three very different implementations inline.
* remove NoopPrint - it is no longer needed
* when talking to API clients via serial, don't turn off log msgs instead encapsuate them
* fix the build - would loop forever if there were no files to send
* don't use Segger code if not talking to a Segger debugger
* when encapsulating logs, make sure the strings always has nul terminators
* nrf52 soft device will watchdog if you use ICE while BT on...
so have debugger disable bluetooth.
* Important to not print debug messages while writing to the toPhone scratch buffer
* don't include newlines if encapsulating log records as protobufs
* update to latest protobufs (needed for powermon goo)
* PowerStress WIP
* fix linter warning
* Cleanup buffer
* Merge hex for wm1110 target(s)
* Only sdk
* Sudo
* Fix exclude macros (#4233)
* fix MESHTASTIC_EXCLUDE_BLUETOOTH
* fix HAS_SCREEN=0
* fix MESHTASTIC_EXCLUDE_GPS
* fix typo in build-nrf52.sh (#4231)
chmod is the command, '+x' is the argument.
* Tidy Wireless Paper variant files (#4238)
* Quick tidy of pins_arduino.h
Matches requests made at https://github.com/meshtastic/firmware/pull/4226#discussion_r1664183480)
* Tidy variant.h
* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`
* Updated raspbian CI to update apt repository ahead of libbluetooth. (#4243)
* Fix BLE logging on nrf52 (#4244)
* allow ble logrecords to be fetched either by NOTIFY or INDICATE ble types
This allows 'lossless' log reading. If client has requested INDICATE
(rather than NOTIFY) each log record emitted via log() will have to fetched
by the client device before the meshtastic node can continue.
* Fix serious problem with nrf52 BLE logging.
When doing notifies of LogRecords it is important to use the
binary write routines - writing using the 'string' write won't work.
Because protobufs can contain \0 nuls inside of them which if being
parsed as a string will cause only a portion of the protobuf to be sent.
I noticed this because some log messages were not getting through.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
* Fix build when HAS_NETWORKING is false on nrf52 (#4237)
(tested on a rak4631 by setting HAS_ETHERNET false when shrinking
image)
* If `toPhoneQueue` is full, still increment `fromNum` to avoid client never getting packets (#4246)
* Update to SoftDevice 7.3.0 for wio-sdk-wm1110 and wio-tracker-wm1110 (#4248)
* Update variant.h
* Update wio-tracker-wm1110.json
* Update wio-sdk-wm1110.json
* Update platformio.ini
* Update platformio.ini
* Add files via upload
* Add files via upload
* Update variant.h
---------
Co-authored-by: Mike <mikhael.skvortsov@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Mike G <mkgin@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Warren Guy <5602790+warrenguy@users.noreply.github.com>
Co-authored-by: todd-herbert <herbert.todd@gmail.com>
Co-authored-by: geeksville <kevinh@geeksville.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Alexander <156134901+Dorn8010@users.noreply.github.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: quimnut <github@dopegoat.com>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
2024-07-08 19:03:23 +08:00
|
|
|
RadioLibInterface::setStandby();
|
2020-04-30 17:43:29 -07:00
|
|
|
}
|
|
|
|
|
|
2020-07-13 13:18:32 -07:00
|
|
|
/** We override to turn on transmitter power as needed.
|
|
|
|
|
*/
|
|
|
|
|
void RF95Interface::configHardwareForSend()
|
|
|
|
|
{
|
|
|
|
|
setTransmitEnable(true);
|
|
|
|
|
|
|
|
|
|
RadioLibInterface::configHardwareForSend();
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-30 17:43:29 -07:00
|
|
|
void RF95Interface::startReceive()
|
|
|
|
|
{
|
2020-07-13 13:18:32 -07:00
|
|
|
setTransmitEnable(false);
|
2020-04-30 17:43:29 -07:00
|
|
|
setStandby();
|
|
|
|
|
int err = lora->startReceive();
|
2024-04-14 00:29:42 -05:00
|
|
|
if (err != RADIOLIB_ERR_NONE)
|
|
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 startReceive!\n", err);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(err == RADIOLIB_ERR_NONE);
|
2020-04-30 17:43:29 -07:00
|
|
|
|
|
|
|
|
isReceiving = true;
|
|
|
|
|
|
SX1262: fix serious bug with detecting if we have a rx packet in progress
Could cause hangs on the way into sleep (and enormous power consumption).
Instead of checking for rx packet length (which only changes at completion)
check if we've received preamble bits but haven't yet received a completed
packet interrupt.
notes:
wait to sleep loop problem
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Can not send yet, busyRx
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
vs normal run
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
radio wait to sleep, txEmpty=0
Starting low level send (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
Completed sending (id=0x53fe1dd0 Fr0xe5 To0xff, WantAck0, HopLim3 encrypted)
2020-10-07 13:43:51 +08:00
|
|
|
// Must be done AFTER, starting receive, because startReceive clears (possibly stale) interrupt pending register bits
|
2020-04-30 17:43:29 -07:00
|
|
|
enableInterrupt(isrRxLevel0);
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-20 20:04:44 +02:00
|
|
|
bool RF95Interface::isChannelActive()
|
|
|
|
|
{
|
|
|
|
|
// check if we can detect a LoRa preamble on the current channel
|
|
|
|
|
int16_t result;
|
|
|
|
|
setTransmitEnable(false);
|
2023-01-21 14:34:29 +01:00
|
|
|
setStandby(); // needed for smooth transition
|
2022-04-20 20:04:44 +02:00
|
|
|
result = lora->scanChannel();
|
2023-01-21 14:34:29 +01:00
|
|
|
|
2022-05-29 19:30:20 -05:00
|
|
|
if (result == RADIOLIB_PREAMBLE_DETECTED) {
|
2022-12-29 20:41:37 -06:00
|
|
|
// LOG_DEBUG("Channel is busy!\n");
|
2022-04-20 20:04:44 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
2024-04-17 00:47:56 +02:00
|
|
|
if (result != RADIOLIB_CHANNEL_FREE)
|
2024-04-14 00:29:42 -05:00
|
|
|
LOG_ERROR("Radiolib error %d when attempting RF95 isChannelActive!\n", result);
|
2022-05-29 19:30:20 -05:00
|
|
|
assert(result != RADIOLIB_ERR_WRONG_MODEM);
|
2023-01-21 14:34:29 +01:00
|
|
|
|
2022-12-29 20:41:37 -06:00
|
|
|
// LOG_DEBUG("Channel is free!\n");
|
2022-04-20 20:04:44 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-14 17:25:20 -04:00
|
|
|
/** Could we send right now (i.e. either not actively receiving or transmitting)? */
|
2020-05-01 08:32:16 -07:00
|
|
|
bool RF95Interface::isActivelyReceiving()
|
2020-04-30 17:43:29 -07:00
|
|
|
{
|
2020-05-01 08:32:16 -07:00
|
|
|
return lora->isReceiving();
|
2020-04-30 17:43:29 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool RF95Interface::sleep()
|
|
|
|
|
{
|
|
|
|
|
// put chipset into sleep mode
|
2023-07-14 17:25:20 -04:00
|
|
|
setStandby(); // First cancel any active receiving/sending
|
2020-04-30 17:43:29 -07:00
|
|
|
lora->sleep();
|
|
|
|
|
|
2024-05-31 10:56:04 -05:00
|
|
|
#ifdef RF95_FAN_EN
|
|
|
|
|
digitalWrite(RF95_FAN_EN, 0);
|
|
|
|
|
#endif
|
|
|
|
|
|
2020-04-30 17:43:29 -07:00
|
|
|
return true;
|
2024-06-09 23:03:39 +02:00
|
|
|
}
|