mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
7 611 Commity
24 Gałęzie
269 Tagi
4,2 GiB
Wykres commitów

451 Commity (97a5abbc82c8b55edd396202bc7977a2868f5380)

Autor SHA1 Wiadomość Data
Thomas Göttgens 0fe99595a9 Lib update and fix include errors 2022-10-04 08:59:03 +02:00
Thomas Göttgens b2ff628cec add versioning to all lib depends (compatible upgrade allowed) and move as many as possible off github and into PIO registry. 
Also add a script to check for lib updates (maybe in CI?)
 2022-10-04 08:40:39 +02:00
Ben Meadors 803dc69ccd
Update radiolib 2022-10-02 09:48:48 -05:00
Ben Meadors ae311c838e
Try to decode mqtt packets first (#1705) 
* Try to decode first

* Remove GPS pins from TLoRAv1 so that it can boot

* Use release version of radio lib

* Use fixed versions of esp framework and tool chain
 2022-09-25 09:39:50 -05:00
Thomas Göttgens 1f96d5d957
Merge branch 'master' into ESPIDF-Rollup 2022-09-19 09:33:50 +02:00
Ben Meadors ad9cc40b97 Increasebaud for local except for RAK11200 2022-09-17 08:25:40 -05:00
Thomas Göttgens eac2613743 make platformio.ini even more modular 2022-09-12 14:02:21 +02:00
Thomas Göttgens 3102777a71
Update platformio.ini 2022-09-10 20:53:23 +02:00
Thomas Göttgens bf3306fbc8 use the new ESP Framework for our older boards too 2022-09-09 22:31:30 +02:00
lewishe 5621719eef Add tbeam esp32s3 version support, replace AXP202X_Library with XPowersLIb 2022-09-06 15:58:33 +08:00
lewis f767fd5075 Modified to be compatible with the new version of sdk, compatible with esp32s3 2022-09-03 23:38:40 +08:00
Ben Meadors b54073a8a1
Bluetooth mode unification and behavior tweaks (#1636) 
* Esp32 bluetooth modes

* Comment

* Gutting bluetooth

* Cleanup

* Security

* Testing

* NRF bluetooth security

* Reboot on saved lora or bluetooth settings

* Cleanup

* Fixes

* Stub for platforms without screens

* Fixed just-works in esp32

* Cleanup

* Display device name in boot screen

* Added waypoint module routing

* chmod

* Words

* Protos

* Backing out partition changes for testing

* Revert "Backing out partition changes for testing"

This reverts commit 191ed6489c.

* Chmod PR artifacts

* Trying setInitialState again

* Revert "Trying setInitialState again"

This reverts commit 703eac7277.

* External notification module

* Cleanup

* Pin display formatting
 2022-08-22 16:41:23 -05:00
Ben Meadors b028af0d82
Bluetooth modes (#1633) 
* Formatting and comments

* Esp32 bluetooth modes

* Comment
 2022-08-16 20:42:43 -05:00
majbthrd aadaf332cf
add stm32wl5e platform and wio-e5 variant (#1631) 
Co-authored-by: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-08-15 07:54:45 -05:00
Thomas Göttgens 5e842dd735 Put a bit of order in the src directory, group and name things appropriately 2022-08-10 11:31:29 +02:00
Thomas Göttgens 519f31ed60 fix portduino build 2022-08-10 10:00:23 +02:00
Thomas Göttgens 0c8fb6e27f Raspberry Pi Pico target (with sparkfun lora hat) does compile but needs further work. 
Also contains a small fix to make PRIVATE_HW targets build again for nRF52 architectures
 2022-08-08 23:11:19 +02:00
Ben Meadors 1c8e64319c
Update nimble to 1.4 (#1600) 
* Update nimble version

* Back down a version

* Nimble 1.4

* Change log level of Nimble. Too chatty

* Log level

* Log level of 1 (error)
 2022-08-06 14:16:11 -05:00
Ben Meadors a10e56265b
Update nimble version (#1599) 
* Update nimble version

* Back down a version
 2022-08-05 16:11:22 -05:00
Ben Meadors 97684c6c73
Add bmp-280 support (#1581) 2022-07-31 08:52:47 -05:00
majbthrd ade32b1827
lay groundwork for a possible future architecture (#1571) 
* lay groundwork for a possible future architecture

* switch from feature opt-out to feature opt-in

* lay groundwork for a possible future architecture

* switch from feature opt-out to feature opt-in

* fix USE_RTC in variant.h for rak4631_epaper and t-echo

* ensure Screen.h is not included without configuration.h

Co-authored-by: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-07-31 07:11:47 -05:00
Ben Meadors 7e7872605b
Lots of environmental telemetry sensor cleanup (#1574) 2022-07-29 12:39:46 -05:00
Ben Meadors a1dc350231
Changed default baud to 115200 (#1517) 
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
 2022-06-15 11:44:37 -05:00
Thomas Göttgens 6e671d808a Our mod was accepted by RadioLib 2022-06-13 21:25:27 +02:00
Thomas Göttgens 77f096e56c Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-12 17:37:43 +02:00
Ben Meadors 90957e6994
INA260 + INA219 sensor support (#1501) 
* INA219 + INA260 support in telemetry

* Protobuf update

* Fixes + debug statement

* Fix size

* Fix conversion from mv

* Added getRegisterValue for i2cscan
 2022-06-11 16:44:56 -05:00
Thomas Göttgens 2a3272b7d0 patch radiolib on-the-fly while building. 2022-06-10 20:38:56 +02:00
Mark Trevor Birss b8e7c6ee7a
Update platformio.ini 2022-06-01 11:09:21 +02:00
Ben Meadors 0767c0b0e8
Converted to jgromes/RadioLib upstream and pegged to latest ref (#1472) 
* Converted to jgromes/RadioLib upstream and pegged to latest ref
 2022-05-29 19:30:20 -05:00
Thomas Göttgens c15da3c104 Make PIO6 happy again 2022-05-17 11:14:21 +02:00
Thomas Göttgens 4fb0cfa909
Enable Malloc Support in nanopb 2022-05-06 22:16:51 +02:00
Ben Meadors 223c706e91
Use meshtastic fork of arduino thread lib 2022-05-05 13:54:21 -05:00
Ben Meadors 6a8724213e Adafruit bus io is now required for sensor libs 2022-05-01 14:22:04 -05:00
Thomas Göttgens 770f17f382 use nRF Hardware Cryptography. Removes the need for the sdk-nrfxlib submodule 2022-04-25 11:01:54 +02:00
Thomas Göttgens 213d9512f1
WIP: unify the RAK targets into one firmware (#1350) 
* First steps to unify GPS Lib for RAK 1910 and RAK 12500

* Technicalities. Out with the old and build the new.

* Adapt Matrix

* We use 0.4.5 now

* While we're at it, yank the RAK815, it's EOL

* Satisfy CI - for now

* - yank UBX library, talk to GPS chip with NMEA only.
- more autodetect going on, this time for the Eink Display.

TODO: actually do something with the scan findings.

* i swear this works on windows! :-)

* these are only there to make CI happy

* don't update eink display if not detected.

* Replace Oberon Crypt Library with modified Adafruit Library. This elimintaes the need for the sdk-nfxlib submodule.

* - Revert auto screen selection (incomplete)
- Revert nrF crypto engine (needs more work)
- add separate defines for not-auto-selecting screen lib.

* Define 2 new variants for RAK - with or without epaper

* Update variants

Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com>
Co-authored-by: Ben Meadors <thebentern@tuta.io>
 2022-04-25 15:13:41 +10:00
Ben Meadors 8733bcb52e
Peg espressif platform version to 3.5.0 2022-04-23 08:42:26 -05:00
Jm Casler 5327d6162a remove targz library 2022-04-15 23:17:30 -07:00
Jm Casler 7e977aea00 Add welcome screen feature toggle 2022-04-13 21:59:25 -07:00
Jm Casler a4bdef4151 compression WIP 
compression works. next is to store it in the proto as a oneof and then decompress it on use.
 2022-04-11 22:12:04 -07:00
Jm Casler 16ae867c2d Show welcome screen if region unset 2022-04-10 19:15:10 -07:00
Thomas Göttgens 028999697e Improve T-Echo GPS Handling 2022-04-06 09:18:55 +02:00
Mark Trevor Birss b7aa1397c7
Add DIY nRF82540 PCA10059 4.2inch NiceRF 868 (#1354) 
* Update build-all.sh

* Update configuration.h

* Update EInkDisplay2.cpp

* Create platformio.ini

* Create variant.cpp

* Create variant.h

* Update platformio.ini

* Update check-all.sh

* Create nordic_pca10059.json

* Update variant.h

* Update EInkDisplay2.cpp

* Update configuration.h

* Update platformio.ini

* Update EInkDisplay2.cpp

* Update variant.h

* Update EInkDisplay2.cpp

* Update configuration.h

* Update EInkDisplay2.cpp

* Update variant.h

* Update nordic_pca10059.json

* Update platformio.ini

* Update platformio.ini

* Update platformio.ini

* Update platformio.ini

* Update variant.h

* Update variant.h

* Update variant.h

* Update variant.h

* Update variant.h

* Update variant.h

* Update variant.h

* Update configuration.h

* Update EInkDisplay2.cpp

* Update variant.h

* Update variant.h

* Update platformio.ini

* Update configuration.h

* Update configuration.h

* Update platformio.ini

* Update platformio.ini

* Update configuration.h

* Update platformio.ini

* Update configuration.h

* Update platformio.ini

* Update configuration.h

* Update configuration.h

* Update platformio.ini

* Update configuration.h

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
 2022-04-05 11:46:07 -05:00
neilhao 0c600363c8
add nano g1 (#1351) 
* add nano g1

* Update platformio.ini

* Update configuration.h

* Revert platformio.ini to previous state

* Update configuration.h

* Update platformio.ini

Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
 2022-04-04 20:16:19 +10:00
Thomas Göttgens cef1614770
Autodetect OLED Controller 1306/1106 (#1317) 
* Autodetect OLED Controller 1306/1106 and make #define NO_SCREEN work again

* fix epaper with autodetect

* Try kicking CI - NFC
 2022-03-24 11:36:56 -05:00
Thomas Göttgens bbf044795a
weed out old versioning macros (#1312) 
weed out old versioning macros
 2022-03-20 11:53:37 +01:00
Sacha Weatherstone b9058ce7c5
fix build 2022-03-15 18:28:39 +11:00
Sacha Weatherstone ceacbe0b94
Cleanup pio config (less intimidating) 2022-03-15 17:35:29 +11:00
Michael Kleinhenz d4e6dd32c5
JSON MQTT Integration (#1283) 
* Added downstream JSON MQTT handling.

* Added uplink JSON messaging

* Fixed shadow variable.

* Added missing dependency.

* Fixes Environment -> Telemetry.

* Fixed native issue.

* Added json11 pio reg dependency.

* Fixed json11 library dependency.

Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com>
 2022-03-12 08:08:57 -06:00
Sacha Weatherstone 8a7a6e9a5d
Use registry version of OneButton 2022-03-10 09:03:30 +11:00
Sacha Weatherstone 400630199f
Use nanopb from PIO registry 2022-03-10 08:37:24 +11:00
Sacha Weatherstone b31580a35c
Removed unused linker files 2022-03-10 08:04:45 +11:00
Jm Casler 2b20bf3d0a Building new BLE stack for 1.3.4 2022-03-06 17:52:05 -08:00
Joshua Pirihi a48838153b NimBLE merge conflicts 2022-03-06 05:59:13 +13:00
Joshua Pirihi d59de171c5 NimBLE implementation 2022-03-06 05:57:38 +13:00
Jm Casler 218a208ab7 mv plugins/ to modules/ 2022-02-26 23:56:26 -08:00
Mark Trevor Birss c5a8cc6d3f
Add 1.54, 2.9 and 4.2 inch e-Paper support for RAK4361 boards - with partial updates for faster screen transitions (#1240) 
* Update platformio.ini
 2022-02-25 07:03:52 -06:00
Joshua Pirihi a37f49bcbf Add define to platformio.ini to switch between old and new bluetooth 2022-02-16 19:57:35 +13:00
Thomas Göttgens 8e9b852faa
Littlefs rebased to Master (#1205) 
* Littlefs
 2022-02-14 11:45:29 -06:00
Ric Letson 856f2f9589
MCP9808 sensor implementation (#1188) 
* MCP9808 Sensor Implementation Initial Test
 2022-02-08 11:03:34 -06:00
github-actions[bot] dd31a829fb
Update and regen protobufs (#1175) 
* Update and regen protobufs
 2022-02-01 09:41:56 -06:00
Ben Meadors ed9cd7b03d
Update nimble (#1173) 2022-01-31 20:56:31 -06:00
Ben Meadors b51be320dd
BME680 support (#1142) 2022-01-25 14:22:48 -06:00
Thomas Göttgens 409ad9c2c3
Split platformio.ini into one file for each board, only leaving platform definitions and a handful of stale (?) boards around.. (#1141) 2022-01-25 08:56:16 -06:00
mkinney a8dab94087
Merge branch 'master' into fix_some_cpp_warnings 2022-01-24 13:27:33 -08:00
Thomas Göttgens 115b835b83
Merge branch 'master' into master 2022-01-24 21:57:54 +01:00
Thomas Göttgens 9df42799ff
Tryfix: Local replica for build problem (#1) 
* Tryfix: Local replica for build problem

* Update platformio.ini

* use the real repo again
 2022-01-24 21:56:31 +01:00
mkinney e1d3c01199
Merge branch 'master' into fix_some_cpp_warnings 2022-01-24 12:52:21 -08:00
Mike Kinney 6883bc7afc fix more warnings; add to CI; suppress some warnings 2022-01-24 19:58:07 +00:00
Thomas Göttgens 252a27174e
New checkout for library 2022-01-24 20:28:16 +01:00
co sto 0b2f1d5675
Update platformio.ini 2022-01-24 18:33:31 +01:00
Thomas Göttgens 9a0126cde1
use the new version of Screen lib when building 2022-01-24 17:37:33 +01:00
Vladislav Osmanov d1ba314065 Meshtastic DIY v1.1 new schematic 2022-01-23 23:44:58 +03:00
Ben Meadors e706aae41d
Added NRF/RAK support for env plugin (#1133) 
* Added NRF/RAK support for env plugin

* Added Environmental mixin to platform io
 2022-01-23 10:05:39 -06:00
Jm Casler a561713a48
Merge branch 'meshtastic:master' into master 2022-01-23 00:29:54 -08:00
Jm Casler 00f3996cee Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2022-01-23 00:29:24 -08:00
Jm Casler 9e4e79c5d7 Fixes PIO code inspector 2022-01-23 00:29:16 -08:00
Ben Meadors 16ee75313a
BME280 support for environment and screen re-org (#1129) 2022-01-22 15:09:17 -06:00
Ben Meadors e1ef495071
Add tlora-v2-1-1.6 to default envs for consistency (#1117) 2022-01-20 08:34:03 -06:00
Ben Meadors 4e3fda87a1
Initial configuration.h -> variants refactor (#1104) 
* Initial configuration to variants refactor
 2022-01-18 18:35:42 -06:00
Jm Casler c1ee1265ab Use nimble 1.3.4 2022-01-10 21:49:41 -08:00
Jm Casler b22cc1a964 Upgrade to NimBLE 1.3.3 2022-01-09 17:39:03 -08:00
linagee a8d10329f8
Added some platformio.ini comments 2022-01-04 18:58:56 -07:00
linagee 1157419e05
Constants are better than magic numbers 2022-01-04 18:38:05 -07:00
linagee 12f1fda934
NimBLE: less debugging data, no more constant stream of hex 
esp_nimble_cfg.h and syscfg/syscfg.h were providing the default
previously.
This should get rid of:
ble_sm_alg_s1() and messages like that proving low-level BLE data.
 2022-01-04 18:32:58 -07:00
Jm Casler 1f9b1e2828
Merge branch 'NTP' into master 2022-01-03 16:18:01 -08:00
Jm Casler 4d82a0146b Initial checkin of Online OTA SPIFFS update 2022-01-02 19:50:43 -08:00
Thomas Göttgens 9c7121df3e
Update platformio.ini 
add new board to platform.io definition
 2021-12-30 22:18:08 +01:00
Jm Casler 654558abcd Partial work for NTP client 2021-12-28 19:24:10 -08:00
Jm Casler 638d43a341 Roll back oled update 2021-12-28 16:40:53 -08:00
Jm Casler 072707c77e Update esp8266-oled-ssd1306 2021-12-26 09:08:49 -08:00
Ben Meadors 1f4a3085ef
Peg to specific version of NimBLE Arduino 2021-12-12 07:54:29 -06:00
Ben Meadors f119555c12 Convert to NimBLE Arduino (#985) 2021-12-12 07:44:56 -06:00
Ben Meadors c8bea4f091 Split RAK-4631 targets by base board 2021-12-07 20:42:06 -06:00
Jm Casler 241325d245 Upgrade to OneButton 2.0.3 #941 2021-11-29 09:09:25 -08:00
Joar Svensson fff4735a15 Add support for DS18B20 temperature sensor 2021-10-23 21:10:25 +02:00
Vladislav Osmanov e3d9b94367 New device board - [Meshtastic DIY v1] by @NanoVHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module 
Subproject reference: https://github.com/NanoVHF/Meshtastic-DIY
 2021-09-19 16:05:21 +03:00
Kevin Hester be9d637c7c update platformio.ini to pull in latest RadioLib (with portduino fixes) 2021-09-08 14:08:02 -07:00
Kevin Hester e3ed637942 reference the updated radilib sha256 2021-09-04 18:06:23 -07:00
Kevin Hester b04e313665 minor debug output 2021-08-15 10:34:57 -07:00
Kevin Hester 04d3f44179 Updates to work with latest adafruit nrf52 arduino 2021-08-12 15:50:54 -07:00
Kevin Hester 28af18389b If MQTT connected don't let the board enter LS state 2021-08-02 21:34:14 -07:00
Kevin Hester fc9fc1ee6f 1.2.41 t-echo final build 2021-06-27 12:29:48 -07:00
Kevin Hester 659286f738 WIP new adafruit eink display lib at least starts 2021-06-27 11:41:39 -07:00
Kevin Hester 17a1262382 pull in new epaper lib (which required importing configuration.h everywhere 
for dumb reasons)
 2021-06-27 10:56:28 -07:00
Kevin Hester 66b96d2052 Remove old epaper library 2021-06-27 09:58:36 -07:00
Kevin Hester 069b0d38be Fix wifi to allow usage with unsecured networks 2021-05-24 09:21:52 +08:00
Kevin Hester 70b0a73572 Split native build into a cross-platform target vs a linux only target 2021-05-23 17:57:20 +08:00
Kevin Hester 72d7142751 also check in the gpiod .h file 2021-05-23 17:36:08 +08:00
Kevin Hester 8367b9b159 add gpiod lib prebuilt binaries for linux 2021-05-23 17:25:35 +08:00
Kevin Hester 7f51517961 better support for heltec 2021-05-11 09:44:41 +08:00
Kevin Hester b56c5df6e1 1.2.30 2021-05-03 15:38:14 +08:00
Kevin Hester 4c1b7d4840 pinelora WIP 2021-05-01 11:27:37 +08:00
Kevin Hester c940d22a98 t-echo: enable nrfupload 2021-04-28 15:25:54 +08:00
Kevin Hester 2a9b2d3b29 official name for t-echo board 2021-04-27 10:21:54 +08:00
Kevin Hester 8e3281a658 pinelora WIP 2021-04-22 14:28:56 +08:00
Kevin Hester 6e27856daa pinelora WIP 2021-04-22 08:49:05 +08:00
Kevin Hester ec18efbe7e Add beginnings of RAK4600 and update to latest nrf52 arduino sources 2021-04-15 11:45:58 +08:00
Kevin Hester 7224782d23 rak4631: gps now works 2021-04-11 15:17:56 +08:00
Kevin Hester 328b24537f rak4631: builds but WIP 2021-04-11 13:33:27 +08:00
Kevin Hester cec905914c Fix GPIO service and cleanup response handling 2021-04-06 10:34:23 +08:00
Kevin Hester dcf64dfacd MQTT at least talks to server, works in native and esp32 2021-04-03 14:54:10 +08:00
Kevin Hester 2c5ea03b74 fix VFS creation bug in native. fix heap corruption in Fsm free 2021-04-01 20:32:12 +08:00
Kevin Hester 8a20155214 simplify build 2021-04-01 14:05:27 +08:00
Kevin Hester 5f948c09fe update libs to fix CI build, thanks @meehow! 2021-03-31 11:05:43 +08:00
Kevin Hester 5fdcb72d46 cleanup applyModemConfig based on porduino testing, share with sim 2021-03-30 23:34:13 +08:00
Jm Casler 103ffde025 Fixes for build of tlora_v1_3 2021-03-20 20:47:48 -07:00
Vadim Furman 7491af8ad7 Merge remote-tracking branch 'origin/master' 2021-03-19 17:07:16 -07:00
Kevin Hester 9502fa62e6 todo updates 2021-03-19 23:40:24 +08:00
Vadim Furman 2b9a8f0822 Merge remote-tracking branch 'origin/master' 2021-03-17 10:49:04 -07:00
Vadim Furman ddcfff3b59 Fixed compilation on nrf52 and brownout code 2021-03-17 10:44:42 -07:00
Kevin Hester 1f33b03c30 turn off broken genieblocks_lora build 2021-03-15 13:43:22 +08:00
Kevin Hester 351be2f327 change portduino so it has a higher chance of building on OS-X and windows 2021-03-15 13:09:52 +08:00
Vadim Furman c62863b1dc Merge from origin 2021-03-14 19:42:57 -07:00
Vadim Furman 98d878cdfe Port to lora_isp4520 board 2021-03-14 19:00:20 -07:00
Kevin Hester b02212009a progress on remote settings 2021-03-12 14:10:36 +08:00
Kevin Hester f55ac8e9c9 turn off (buggy) custom_fields in tinygps, and used fixed version of lib 2021-03-10 15:29:25 +08:00
Kevin Hester c0e180759d improve debugging on cortex m 2021-03-08 15:20:29 +08:00
Kevin Hester cedd87001d Merge branch 'dev' into dev1.2 2021-02-25 19:49:50 +08:00
Kevin Hester afc901ddbe fix build. platformio isn't smart enough to git pull latest without 
specifying a tag/commit/etc (I haven't tried specifying a branch?)

Without specifying the hash, the build breaks for anyone who already had
a repo (the CI build doesn't see this because it always pulls from scratch)

cc @crossan007 & @mc-hamster
 2021-02-25 19:49:34 +08:00
Kevin Hester 923ecc9d8a fix printf warnings 2021-02-22 12:57:03 +08:00
Kevin Hester 3088fe3f91 Stay up-to-date wrt master (cc @mc-hamster) 
# Conflicts:
#	src/plugins/Plugins.cpp
#	src/plugins/RangeTestPlugin.cpp
#	src/plugins/StoreForwardPlugin.cpp
 2021-02-22 10:39:46 +08:00
Charles Crossan 3c564796e0 2021-02-21 10:55:33 -05:00
Kevin Hester f064e56dc9 fix esp32 build for dev1.2 2021-02-17 16:17:46 +08:00
Jm e840465ef3 fix for failed builds on nrf and linux 2021-02-16 18:46:16 -08:00
Kevin Hester c55074f7fe oops: we should crash if we >MAX_THREADS, also raise max threads 2021-02-14 15:06:49 +08:00
Jm 8c27baae84 Update platformio.ini 2021-02-12 18:48:18 -08:00
Jm 9f9f02fc6f Reverting platform.ini back to the way it was. 2021-02-06 21:38:54 -08:00
Jm 0c71de4e59 Update for rangetest plugin 2021-02-03 08:09:59 -08:00
Jm e9affb50d2 #674 add support for lora32 v1.3 2021-02-02 17:34:50 -08:00
Kevin Hester 3ac5b045c4 Merge remote-tracking branch 'root/master' into eink 2021-01-28 10:31:56 +08:00