332 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jm Casler	afd54981e0	Update storeforward.proto	2021-12-08 23:14:03 -08:00
Jm Casler	c5e15edbad	Merge branch 'meshtastic:master' into master	2021-12-08 18:35:47 -08:00
Jm Casler	1d84aff375	Add heartbeat.Secondary to SF protobuf	2021-12-08 18:34:08 -08:00
Jm Casler	f9fed7a630	Merge pull request #55 from mc-hamster/master ... Update storeforward.proto	2021-12-08 17:05:04 -08:00
Jm Casler	dec2b3b50e	Update storeforward.proto	2021-12-08 17:04:10 -08:00
Jm Casler	6fabb92e29	Merge pull request #1 from meshtastic/master ... Update from head	2021-12-07 11:50:32 -08:00
Jm Casler	e80e760844	Merge branch 'master' into master	2021-12-07 11:50:21 -08:00
Jm Casler	86e79e9298	Reduce size of airtime repeated struct in mynodeinfo	2021-12-07 11:46:21 -08:00
Jm Casler	c7b65fb525	Fix typo	2021-12-07 11:31:09 -08:00
Jm Casler	4fde06fd7e	Merge pull request #53 from mc-hamster/master ... Add airtime protos	2021-12-07 11:28:09 -08:00
Jm Casler	b2410cc123	Merge branch 'meshtastic:master' into master	2021-12-07 11:27:33 -08:00
Jm Casler	03cb7c4b22	Add airtime protos ... Feature request: add airtime to NodeInfo #970 https://github.com/meshtastic/Meshtastic-device/issues/970	2021-12-07 11:26:30 -08:00
Jm Casler	e69559a91e	Merge pull request #52 from mc-hamster/master ... Rename java outer class for SF	2021-12-06 20:15:28 -08:00
Jm Casler	d09f775613	Merge branch 'meshtastic:master' into master	2021-12-06 20:15:08 -08:00
Jm Casler	449bf38457	Rename java outer class for SF	2021-12-06 20:14:24 -08:00
Jm Casler	a05411df39	Merge pull request #51 from mc-hamster/master ... Add additional channel configs	2021-12-06 14:35:40 -08:00
Jm Casler	d5d6f96fde	Merge branch 'meshtastic:master' into master	2021-12-06 14:34:55 -08:00
Jm Casler	434de432c7	Add additional channel configs ... https://github.com/meshtastic/Meshtastic-device/issues/965	2021-12-06 14:34:11 -08:00
Jm Casler	de58a68260	Merge pull request #50 from joshpirihi/master ... Add on_battery_shutdown_after_secs preference	2021-12-05 21:41:20 -08:00
Joshua Pirihi	acc993ebd5	Add on_battery_shutdown_after_secs preference	2021-12-06 14:44:27 +13:00
Jm Casler	de734f7c32	Update comment for bitrate	2021-12-05 10:40:30 -08:00
Jm Casler	fb1ed61e22	Add calculated bitrate in mesh.proto	2021-12-05 10:14:17 -08:00
Jm Casler	5a556ee4a9	Merge pull request #49 from mc-hamster/master ... Rename S&F structure	2021-12-02 16:52:14 -08:00
Jm Casler	99d7f1256f	Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-protobufs	2021-12-02 16:50:56 -08:00
Jm Casler	fb2545f234	Rename S&F structure, remove max	2021-12-02 16:50:12 -08:00
Jm Casler	774db7a33a	Merge branch 'meshtastic:master' into master	2021-12-02 16:42:12 -08:00
Jm Casler	9b6a86efbe	Fixing conflict.	2021-12-02 16:41:59 -08:00
Jm Casler	05e9381f06	Renamed the SF structure to StoreAndForward	2021-12-02 16:35:11 -08:00
Jm Casler	3ba36ec5db	Merge pull request #48 from mkinney/add_lint ... Add lint	2021-11-30 14:40:25 -08:00
Mike Kinney	5187d328c6	fix caps and initial spacing on comments	2021-11-30 12:02:16 -08:00
Mike Kinney	dee54fa738	add protolint; make all files indentation consistent with 2 spaces	2021-11-30 11:45:01 -08:00
Jm Casler	0de53c84a2	Merge pull request #37 from a-f-G-U-C/add-zps-port ... add ZPS port	2021-11-29 08:02:16 -08:00
Jm Casler	04c83fb9f1	Merge pull request #40 from Hydra-Designs/master ... Add auto_screen_carousel_secs preference for automatic screen toggling	2021-11-29 08:01:41 -08:00
Ben Meadors	8f409a26ab	Merge branch 'meshtastic:master' into master	2021-11-29 07:01:20 -06:00
Jm Casler	c0869868e4	Merge pull request #42 from mc-hamster/master ... Update to protobufs for S&F	2021-11-28 19:24:25 -08:00
Jm Casler	9d325fd103	Update to protobufs for S&F	2021-11-28 19:22:43 -08:00
Jm Casler	b82ebc0e79	Update draft of SF Protobuf	2021-11-27 10:44:35 -08:00
Jm Casler	33fd03ca0d	Draft of SF protobuf	2021-11-27 10:03:15 -08:00
Ben Meadors	a811780943	Merge branch 'meshtastic:master' into master	2021-11-27 09:14:33 -06:00
Jm Casler	1babd02e62	Merge pull request #41 from mc-hamster/master ... Added position_broadcast_smart for #934	2021-11-26 12:17:42 -08:00
Jm Casler	593c2296c6	Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-protobufs	2021-11-26 12:13:15 -08:00
Jm Casler	e89f568ef5	Added position_broadcast_smart for #934 ... Added position_broadcast_smart for #934	2021-11-26 12:13:12 -08:00
Jm Casler	bd02840265	Merge branch 'meshtastic:master' into master	2021-11-26 12:10:39 -08:00
Ben Meadors	df4e501a0a	Add auto_screen_carousel_secs preference	2021-11-25 20:38:00 -06:00
Jm Casler	aa4ff47d9c	Update to 0.4.4	2021-11-23 11:26:32 -08:00
Jm Casler	ddd136dc0a	Merge pull request #39 from mc-hamster/master ... Update README.md	2021-11-23 10:45:11 -08:00
Jm Casler	85bd830de9	Update README.md	2021-11-23 10:44:00 -08:00
Sacha Weatherstone	797363bb87	Merge pull request #38 from a-f-G-U-C/eirp-info ... add node output power info fields	2021-11-21 00:32:19 +11:00
a-f-G-U-C	de94cf09c1	add node output power info fields	2021-11-20 12:32:34 +00:00
a-f-G-U-C	e6735ff6bd	Merge branch 'meshtastic:master' into add-zps-port	2021-11-20 12:27:54 +00:00