Wykres commitów

2651 Commity (49c625627090bb1071735a867ecc3f51355efde3)

Autor SHA1 Wiadomość Data
Kevin Hester 77c1112fe8 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-24 13:28:21 +08:00
Kevin Hester 2d4ba357f7
Merge pull request #755 from vfurman-gh/master
Push RSSI to the phone
2021-03-24 13:28:01 +08:00
Kevin Hester 455d0f8d66 1.2.13 2021-03-24 13:27:18 +08:00
Kevin Hester 5b0e7c6e82 fix has_preferences init 2021-03-24 13:25:21 +08:00
Kevin Hester 78c665abb9 properly discard messages with fromradio queue is full (Rather than blocking forever) 2021-03-24 13:25:10 +08:00
Kevin Hester 9a86d52d00 Merge remote-tracking branch 'root/master' into dev1.2 2021-03-24 12:01:38 +08:00
Kevin Hester c5973f9a55 @mc-hamster it is VERY important to not accidentally turn this in in master
;-)
2021-03-24 11:41:14 +08:00
Kevin Hester eb684aac03 tested OTA is_router 2021-03-23 14:54:56 +08:00
Kevin Hester 7b4f8fb6d6 Fix firmware OTA update while is_router 2021-03-23 14:44:50 +08:00
Vadim Furman 8065dbb2b7 Merge remote-tracking branch 'origin/master' 2021-03-22 21:40:30 -07:00
Vadim Furman 049e791382 Updated proto 2021-03-22 21:36:24 -07:00
Kevin Hester 4fb8552563
Merge pull request #756 from geeksville/dev1.2
Dev1.2
2021-03-23 12:18:56 +08:00
Kevin Hester 90576f44d8 Merge remote-tracking branch 'root/master' into dev1.2
# Conflicts:
#	proto
2021-03-23 12:17:46 +08:00
Kevin Hester 9e0a2964a4 move channel docs into git 2021-03-23 12:16:23 +08:00
Kevin Hester 49b16fdf0c fix channel !authorized check 2021-03-23 12:07:04 +08:00
Kevin Hester 1fcec8ce3b always fix up channel list, even if we just did factory reset 2021-03-23 11:54:53 +08:00
Kevin Hester d32386a027 Return errors for unauthorized requests or out of bound channel nums 2021-03-23 11:44:51 +08:00
Vadim Furman 9b57d28c7d Merge remote-tracking branch 'origin/master' 2021-03-22 19:41:23 -07:00
Vadim Furman b9fd726c14 Push RSSI to the phone 2021-03-22 19:39:49 -07:00
Kevin Hester f165418b18
Merge pull request #751 from timgunter/set_device_install_python
Add option to set python interpreter used for device-install.sh scripts
2021-03-22 10:48:07 +08:00
Jm Casler e193f63687 Update StoreForwardPlugin.cpp 2021-03-21 19:46:02 -07:00
Jm Casler 1eb37dded8 partial work for S&F 2021-03-21 19:45:35 -07:00
Tim Gunter 13889124c1 Add option to set python interpreter used for device-install.sh and device-update.sh 2021-03-21 18:29:20 -07:00
Jm Casler 9005aaa14e
Merge pull request #750 from mc-hamster/master
Update nightly build script
2021-03-21 10:00:39 -07:00
Jm Casler df4e325e43 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-03-21 09:42:57 -07:00
Jm Casler 4ebc07b691 Update nightly build to use the same release build archive for the nightly 2021-03-21 09:42:55 -07:00
Jm Casler 79a8d023ca
Merge pull request #744 from mc-hamster/master
Update serial plugin, update range test doc and add support for tlora 1.3
2021-03-21 07:54:13 -07:00
Jm Casler 330d83e7c3
Merge pull request #78 from meshtastic/master
Update from head
2021-03-21 07:51:45 -07:00
Jm Casler a74384f3f5 Update airtime.h to add override 2021-03-21 07:44:08 -07:00
Jm Casler da732c291f Update build-all for tlora_v1_3 2021-03-21 07:43:55 -07:00
Kevin Hester 648d9dd19f
Merge pull request #749 from geeksville/dev1.2
Dev1.2
2021-03-21 18:59:30 +08:00
Kevin Hester e9faf657df move GPS_RX_PIN for the TLORA_V2_1_16 from 36 to 15 2021-03-21 18:58:43 +08:00
Jm Casler 103ffde025 Fixes for build of tlora_v1_3 2021-03-20 20:47:48 -07:00
Jm Casler baeb002245 Fix small bug in range test plugin.
packetSequence was an unsigned int but i was using %d. oops
2021-03-20 00:38:53 -07:00
Jm 0ce7a3f0ec Update to how S&F reserves space on PSRAM 2021-03-19 23:43:06 -07:00
Jm Casler 0befad82a7
Merge branch 'master' into master 2021-03-19 23:38:42 -07:00
Jm b357d8ae5b Update RangeTestPlugin.md 2021-03-19 23:35:46 -07:00
Jm dd9beff9a5 Script to publish nightly builds. 2021-03-19 23:34:36 -07:00
Kevin Hester d652664126 TODO updates 2021-03-20 13:35:27 +08:00
Kevin Hester 4666c12547 change android-too-old webpage to be less scary 2021-03-20 13:13:39 +08:00
Kevin Hester 2b74260e2b only show time on OLED if we have a valid UTC clock 2021-03-20 10:22:06 +08:00
Kevin Hester 620d336e55
Merge pull request #747 from vfurman-gh/master
Removed SX1262_USE_DIO3_FOR_TCXO
2021-03-20 10:01:42 +08:00
Kevin Hester e845a3388b
Merge branch 'master' into master 2021-03-20 10:01:35 +08:00
Vadim Furman a25235dc03 Merge remote-tracking branch 'origin/master' 2021-03-19 18:50:30 -07:00
Vadim Furman d3cbc8ea78 WIRE_INTERFACES_COUNT -> NO_WIRE 2021-03-19 18:46:11 -07:00
Vadim Furman b6e197371d Removed SX1262_USE_DIO3_FOR_TCXO 2021-03-19 18:30:00 -07:00
Kevin Hester 5cc3ff16a3
Merge pull request #740 from vfurman-gh/master
Port to isp4520-based board
2021-03-20 09:01:06 +08:00
Vadim Furman d93d5d2e37 Revert clock update for Net quality clocks 2021-03-19 17:21:08 -07:00
Vadim Furman 7491af8ad7 Merge remote-tracking branch 'origin/master' 2021-03-19 17:07:16 -07:00
Kevin Hester fce95431e6
Merge pull request #746 from geeksville/dev1.2
fixing bugs for the sat release
2021-03-19 23:47:12 +08:00