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

3054 Commity (f09aa9bec094a1fc8473b6f30e9c00bc4f7f9d5c)

Autor SHA1 Wiadomość Data
Jm Casler f09aa9bec0 Fix promote-release #947 
Fix promote-release #947
 2021-12-02 19:40:40 -08:00
Jm Casler a7b3b4386f
Merge pull request #946 from mc-hamster/StoreAndForward 
Store and forward generated protos & add Mac config in platform.ini
 2021-12-02 19:15:23 -08:00
Jm Casler 6a426d5d71 Update S&F with new object name 2021-12-02 17:27:38 -08:00
Jm Casler 0ca061a457 uncomment meshtastic-diy-v1 2021-12-02 17:20:04 -08:00
Jm Casler f1ef1eeaff Add monitor & upload for mac (commented out) 2021-12-02 17:19:21 -08:00
Jm Casler 1175c981c0 Update generated protos for S&F 2021-12-02 17:16:39 -08:00
Jm Casler 1d3387466f Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2021-12-02 16:44:14 -08:00
Jm Casler fcccddc4ad updating proto submodule to latest 2021-12-02 16:44:00 -08:00
Jm Casler be44fa11b1
Merge pull request #944 from mc-hamster/StoreAndForward 
Store and forward
 2021-12-02 11:50:57 -08:00
Jm Casler de104a2707
Merge branch 'master' into StoreAndForward 2021-12-02 09:27:42 -08:00
Ben Meadors 9d019c1a99
Adding batch script for generating uf2 files for NRF boards (#945) 
* Updated generated protos

* Added uf2-converter batch for windows machines
 2021-12-02 10:19:25 -06:00
Jm Casler 11d954422b
Merge branch 'meshtastic:master' into StoreAndForward 2021-12-01 17:58:51 -08:00
Jm Casler f4d348173c Refresh node info to ensure our information is current for smart position. #934 2021-12-01 17:56:47 -08:00
Jm Casler 79eb5546a1
Merge pull request #943 from mc-hamster/StoreAndForward 
Little update to #934
 2021-12-01 17:24:37 -08:00
Jm Casler 4f10ab8d04 Little update to #934 
updated lastGpsSend
 2021-12-01 17:24:01 -08:00
Jm Casler 59ef28dfa7 updating proto submodule to latest 2021-11-29 21:43:46 -08:00
Jm Casler d87106900b
Merge pull request #942 from mc-hamster/OneButton 
Upgrade to OneButton 2.0.3 #941
 2021-11-29 09:15:57 -08:00
Jm Casler 241325d245 Upgrade to OneButton 2.0.3 #941 2021-11-29 09:09:25 -08:00
Jm Casler 0118f3991a
Merge pull request #937 from Hydra-Designs/master 
Automatic screen carousel behavior implementation (auto_screen_carousel_secs user preference)
 2021-11-29 08:56:53 -08:00
Ben Meadors 2a617ba7b2 Upstream proto addition 2021-11-29 10:05:32 -06:00
Ben Meadors bbf3091889
Merge branch 'master' into master 2021-11-29 09:58:16 -06:00
Jm Casler 5199b4d3c7
Merge pull request #924 from rxt1077/issue-919 
ACK retried want_ack packets #919
 2021-11-29 07:06:11 -08:00
Ben Meadors 99d35b175c Merge remote-tracking branch 'upstream/master' 2021-11-29 07:02:56 -06:00
Jm Casler 98d0907f4d
Merge branch 'master' into issue-919 2021-11-28 22:36:41 -08:00
Jm Casler 5f6d97151c
Merge pull request #940 from mc-hamster/StoreAndForward 
Fix for: Wifi admin mode no longer works #939
 2021-11-28 22:16:13 -08:00
Jm Casler 8cefa82ff1
Merge branch 'meshtastic:master' into StoreAndForward 2021-11-28 21:57:02 -08:00
Jm Casler 623b846713 Fix for: Wifi admin mode no longer works #939 
Fix for: Wifi admin mode no longer works #939
 2021-11-28 21:56:34 -08:00
Jm Casler e791a5aa2f
Merge branch 'master' into issue-919 2021-11-28 20:13:56 -08:00
Jm Casler 82332c9cd0
Merge pull request #938 from mc-hamster/StoreAndForward 
Changes for S&F and Smart Positioning #934
 2021-11-28 20:13:18 -08:00
Jm Casler d5506bb33c Cleanup (Comments & Formatting) of S&F and PrositionPlugin.cpp 2021-11-28 19:41:34 -08:00
Jm Casler 937f67c4ec Check in partial work on S&F 2021-11-28 19:34:35 -08:00
Jm Casler 3ed4a1e3e1
Merge branch 'master' into StoreAndForward 2021-11-28 19:31:49 -08:00
Jm Casler 757de54a4f
Merge pull request #935 from rxt1077/issue-927 
#927 add SSL notification at boot
 2021-11-28 19:30:29 -08:00
Jm Casler 5cf0b6b3b1 Merge branch 'StoreAndForward' of https://github.com/mc-hamster/Meshtastic-device into StoreAndForward 2021-11-28 19:27:54 -08:00
Jm Casler 809179ce0e
Merge branch 'meshtastic:master' into StoreAndForward 2021-11-28 19:26:48 -08:00
Jm Casler d7315778d6 Generated protos for S&F 2021-11-28 19:25:50 -08:00
Ben Meadors 69a2029ade
Removed unnecessary debug print 2021-11-27 09:29:39 -06:00
Ben Meadors 7a649e3fc3 Regen protobufs from upstream 2021-11-27 09:16:26 -06:00
Ben Meadors f019151e3f auto_screen_carousel_secs behavior implementation 2021-11-27 09:11:58 -06:00
Jm Casler 88fd671880 Tweaking values of Smart Position #934 
Tweaking values of Smart Position #934
 2021-11-26 21:26:36 -08:00
Jm Casler d72c091ead
Merge branch 'master' into issue-927 2021-11-26 19:50:40 -08:00
Jm Casler 3ec508169a Implementation of smart positioning #934 
Initial check in for https://github.com/meshtastic/Meshtastic-device/issues/934
 2021-11-26 19:12:00 -08:00
Jm Casler 1775770e54
Merge pull request #936 from mc-hamster/StoreAndForward 
Update protobufs with the latest from meshtastic-protobufs
 2021-11-26 19:09:53 -08:00
Jm Casler f6fde55363 Update protobufs with the latest from meshtastic-protobufs 2021-11-26 18:25:08 -08:00
Jm Casler e548de3c88 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2021-11-26 18:14:45 -08:00
Jm Casler f75aac8ebf updating submodule to latest 2021-11-26 18:13:21 -08:00
Sacha Weatherstone bc311ac9f6
Merge branch 'master' into issue-927 2021-11-27 08:59:22 +11:00
Sacha Weatherstone d4c6007047
Merge pull request #932 from joarSv/feature/define-battery-pin-tlorav1 
Define battery pin
 2021-11-27 08:58:33 +11:00
Ryan Tolboom c5f210384f add SSL notification at boot 2021-11-26 15:09:16 -05:00
Joar Svensson d685682dd9 Define battery pin 2021-11-26 13:28:20 +01:00