mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
2 012 Commity
28 Gałęzie
249 Tagi
198 MiB
Wykres commitów

2012 Commity (2684257e7ecd8dfd82cb13aad62e83cce029f0f1)

Autor SHA1 Wiadomość Data
Kevin Hester 2684257e7e update protobufs 2021-01-16 09:59:43 +08:00
Kevin Hester 51fb1021df Merge remote-tracking branch 'root/master' into eink 
# Conflicts:
#	platformio.ini
 2021-01-16 09:59:08 +08:00
Kevin Hester 51d0d0d6c5 begin new ttgo eink board 2021-01-16 09:57:55 +08:00
Kevin Hester 047df76373 move rev 0.1 of the ttgo eink board to eink0.1 2021-01-16 09:55:06 +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
Jm e39506824d Added more comments 2021-01-14 18:08:23 -08:00
Jm f68a31ab28 serialplugin - ability to configure ACK 2021-01-13 23:21:55 -08:00
Jm b1181deb58 serialplugin - Added my todo list 2021-01-13 23:02:13 -08:00
Jm 89b32dd7ee Fix comments in serial plugin 2021-01-13 22:51:36 -08:00
Jm c54e87f9a2 Update SerialPlugin.cpp 
Added documentation.
 2021-01-13 22:50:02 -08:00
Jm eee7e1de57 Update to serial plugin 2021-01-13 22:39:11 -08:00
Jm 3c60df1565 Partial work on the SerialPlugin 2021-01-13 20:22:59 -08:00
Jm Casler a827017bd2
Merge pull request #53 from crossan007/master 
add power statistics for #635
 2021-01-11 17:54:27 -08:00
Charles Crossan 95c502c658 fix typo 2021-01-11 20:30:02 -05:00
Charles Crossan 0f573901d5 didn't need power.h 2021-01-11 20:28:09 -05:00
Charles Crossan fdc9bf5783 add power statistics for #635 2021-01-11 20:25:02 -05:00
Jm Casler 37e0f9a325
Merge pull request #52 from mc-hamster/osthread 
maybe this will fix the linux build?
 2021-01-09 19:32:40 -08:00
Jm 0c06d8db3c maybe this will fix the linux build? 2021-01-09 19:31:16 -08:00
Jm Casler 0be4bbb369
Merge pull request #51 from mc-hamster/osthread 
Does this fix the linux build?
 2021-01-09 19:17:45 -08:00
Jm f02ab88393 Does this fix the linux build? 2021-01-09 19:15:10 -08:00
Jm Casler c9d4de8808
Merge pull request #50 from mc-hamster/osthread 
fixed in linux now?
 2021-01-09 19:07:16 -08:00
Jm adb912b665 fixed in linux now? 2021-01-09 19:06:34 -08:00
Jm Casler 3f5da1e03e
Merge pull request #49 from mc-hamster/osthread 
another linux fix?
 2021-01-09 18:37:04 -08:00
Jm 0a40d920e3 Update BluetoothUtil.cpp 
yet another linux fix?
 2021-01-09 18:36:23 -08:00
Jm Casler 39311f1e40
Merge pull request #48 from mc-hamster/osthread 
is linux fixed now?
 2021-01-09 18:27:32 -08:00
Jm 9cd24a5646 is linux fixed now? 2021-01-09 18:27:03 -08:00
Jm Casler 1c0efde315
Merge pull request #47 from mc-hamster/osthread 
is linux fixed now?
 2021-01-09 18:09:57 -08:00
Jm c82905bbdd is linux fixed now? 2021-01-09 18:09:16 -08:00
Jm Casler 275eace968
Merge pull request #46 from mc-hamster/osthread 
more linux fixes
 2021-01-09 17:52:09 -08:00
Jm 5688c8b81e more linux build fixes 2021-01-09 17:50:58 -08:00
Jm 8b2798abd5 Added a few commented out default_envs 2021-01-09 17:44:20 -08:00
Jm Casler 6d977923b6
Merge pull request #45 from mc-hamster/osthread 
more fixes for linux build
 2021-01-09 17:34:34 -08:00
Jm 52dacaed37 more fixes for linux build 2021-01-09 17:30:36 -08:00
Jm Casler 7a381eaea1
Merge pull request #44 from mc-hamster/osthread 
Fix for breaking the linux build
 2021-01-09 13:47:43 -08:00
Jm 69391e186b Fix for breaking the linux build 2021-01-09 13:47:10 -08:00
Jm Casler 06f8beaa17
Merge pull request #43 from mc-hamster/osthread 
fix for building on NRF platform.
 2021-01-08 23:00:36 -08:00
Jm 3798f4ca5b fix for building on NRF platform. 2021-01-08 22:59:37 -08:00
Jm Casler 4fd243a6e4
Merge pull request #42 from mc-hamster/osthread 
Moving web server and airtime to osthread model. Moved web server to mesh/wifi
 2021-01-08 22:29:45 -08:00
Jm d458f673be Web server is now treaded and moved to mesh/wifi/* 2021-01-08 22:25:44 -08:00
Jm cfcb00b943 that's enough for tonight. web server is in its own thread, needs to be further optimized but it works enough. next is to refactor. 2021-01-08 20:43:51 -08:00
Jm 977e47d109 partial work 2021-01-08 20:06:11 -08:00
Jm Casler cfeb40f36d
Merge pull request #41 from mc-hamster/master 
Updated osthread branch from master
 2021-01-08 19:57:19 -08:00
Jm Casler 4fcc3ac1de
Merge pull request #40 from meshtastic/master 
Updated my master from head
 2021-01-08 19:54:57 -08:00
Kevin Hester f4afa6931b
Merge pull request #630 from geeksville/dev 
Dev
 2021-01-08 13:38:23 +08:00