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

2051 Commity (532b06c2808d4e85ceedc3dd102e42b0aefe9be3)

Autor SHA1 Wiadomość Data
Jm 532b06c280 Update version.properties to 1.1.33 2021-01-25 17:01:47 -08:00
Jm ca83a78e13 Fix for #650 - build-all.sh will fail 2021-01-22 19:50:12 -08:00
Jm Casler 2a8ac2c0c6
Merge branch 'master' into master 2021-01-20 19:04:46 -08:00
Jm Casler c97342db99
Merge pull request #63 from mc-hamster/serial 
Update comments on SerialPlugin
 2021-01-20 19:03:44 -08:00
Jm Casler d7b2a0ed79
Merge pull request #62 from mc-hamster/master 
update serial from master
 2021-01-20 19:02:58 -08:00
Jm af0a1b5db5 Update comments of SerialPlugin 2021-01-20 19:02:08 -08:00
Jm Casler 9cf030d587
Merge pull request #652 from mc-hamster/master 
#649 More webserver refactoring
 2021-01-19 21:52:56 -08:00
Jm c04d70d5e5 Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-19 21:38:30 -08:00
Jm 2a47819fd6 #649 More webserver refactoring 2021-01-19 21:38:17 -08:00
Jm Casler 4516c8f9b5
Merge pull request #61 from meshtastic/master 
Merge pull request #648 from mc-hamster/master
 2021-01-19 21:27:24 -08:00
Jm e4fdf26dc7 #649 - First pass on the refactoring of the webserver 2021-01-19 21:26:23 -08:00
Jm Casler 39d14fedc2
Merge pull request #648 from mc-hamster/master 
#647 - Fix for admin mode being forced on boards without hardware pullup
 2021-01-18 10:56:13 -08:00
Jm Casler 1da38fc748
Merge branch 'master' into master 2021-01-18 10:44:38 -08:00
Jm b5f50efdcd #647 - Fix for admin mode being forced on boards without hardware pullup 2021-01-18 10:43:15 -08:00
Jm Casler 046e691d4e
Merge pull request #645 from mc-hamster/master 
#635 Added web_request_count and fixed printf of psram
 2021-01-17 17:26:56 -08:00
Jm Casler e72531b090
Merge pull request #60 from mc-hamster/master 
Update Serial
 2021-01-17 15:41:21 -08:00
Jm 81e320c9cf Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-17 15:40:27 -08:00
Jm fa8cc74141 Update to Serial Plugin to make it easy to override the device configuration 2021-01-17 15:40:25 -08:00
Jm Casler c7d9ff7cc0
Merge branch 'master' into master 2021-01-17 10:36:54 -08:00
Jm 8704a9d08f Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device 2021-01-17 10:30:40 -08:00
Jm c0d27e2ce9 #635 Added web_request_count and fixed printf of psram 2021-01-17 10:30:34 -08:00
Jm Casler 84b9028ecb
Merge pull request #642 from mc-hamster/master 
#635 - Added memory usage statistics
 2021-01-17 04:52:03 -08:00
Jm Casler 4fda7098c0
Merge branch 'master' into master 2021-01-17 04:44:42 -08:00
Jm 8e8264efb0 #635 - Added memory usage statistics 2021-01-17 00:29:29 -08:00
Jm Casler 54e780a6ca
Merge pull request #641 from mc-hamster/master 
Update generated protobuf; Update serial plugin; #615 - Configure charge current
 2021-01-17 00:18:33 -08:00
Jm 125eb2b784 Fix for build fail on NRF 2021-01-17 00:11:26 -08:00
Jm Casler 6ea9cdc83b
Merge pull request #59 from mc-hamster/master 
Update serial plugin with new protobufs
 2021-01-17 00:03:13 -08:00
Jm c0711fde69 #615 Allow rate for tbeam battery charger to be configurable 2021-01-16 23:10:08 -08:00
Jm 20b8d2c4a5 Set the port to PortNum_SERIAL_APP 2021-01-16 22:41:33 -08:00
Jm 73ae151971 Added serialplugin_timeout to SerialPlugin 2021-01-16 22:39:28 -08:00
Jm Casler f4806c9dd7
Merge branch 'serial' into master 2021-01-16 22:35:56 -08:00
Jm 79532210e8 SerialPlugin - Update comments with better instructions 2021-01-16 22:31:56 -08:00
Jm d7f26493a5 Update to SerialPlugin to take advantage of the configs 2021-01-16 22:27:33 -08:00
Jm b9d025dd58 Missed adding the proto file 2021-01-16 20:53:45 -08:00
Jm f435086a5a Update generated protobufs 2021-01-16 20:50:58 -08:00
Jm 3dcdf372d7 add remote update 2021-01-16 20:12:31 -08:00
Jm cd84f2867c Updated submodule proto 2021-01-16 20:00:37 -08:00
Jm cafe00e463 Update of serialplugin 2021-01-16 19:40:47 -08:00
Jm 6da4e30215 Merge branch 'serial' of https://github.com/mc-hamster/Meshtastic-device into serial 2021-01-14 22:38:53 -08:00
Jm dbf0569e29 Update comments for serial pins recommended by @ryguy 2021-01-14 22:36:51 -08:00
Jm Casler 18220b88b3
Merge pull request #58 from mc-hamster/master 
update serial from master
 2021-01-14 22:36:17 -08:00
Jm Casler 665da2fb00
Merge pull request #57 from meshtastic/master 
Merge pull request #633 from mc-hamster/master
 2021-01-14 22:34:01 -08:00
Jm Casler 57ffe6622d
Merge pull request #56 from mc-hamster/master 
update serial from master
 2021-01-14 22:25:20 -08:00
Jm Casler 485fec9649
Merge pull request #633 from mc-hamster/master 
Fix for #632 (move web server to osthread) and #611 (move airtime to osthread)
 2021-01-14 22:06:18 -08:00
Jm bd85736226 SerialPlugin - Exclude working on non esp32 platforms. 2021-01-14 21:59:26 -08:00
Jm 4ec8986934 Fixed switching to uint32 from 16 for airtime in json report 2021-01-14 21:45:41 -08:00
Jm Casler b963216764
Merge pull request #55 from mc-hamster/serial 
Update for SerialPlugin and Airtime
 2021-01-14 21:43:28 -08:00
Jm Casler 813fd95bc8
Merge pull request #54 from geeksville/mc-master 
fix @mc-hamster build to work on linux/nrf52
 2021-01-14 21:33:27 -08:00
Kevin Hester 3598c91c29 fix @mc-hamster build to work on linux/nrf52 2021-01-15 13:30:40 +08:00
Jm 507cd1dd20 #639 - Move from counting seconds to milliseconds 2021-01-14 18:40:18 -08:00