Wykres commitów

2029 Commity (84b9028ecb7cef1e9c183a43b8819bc86b1f9a6a)

Autor SHA1 Wiadomość Data
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 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
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