From a9c88ef5e4ef1284e3efe47f7f8a17819fa8db0a Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 7 Aug 2022 18:39:54 -0500 Subject: [PATCH 1/5] Device metadata admin message --- admin.proto | 11 +++++++++++ device_metadata.proto | 14 ++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 device_metadata.proto diff --git a/admin.proto b/admin.proto index bc3c0df..9da6e02 100644 --- a/admin.proto +++ b/admin.proto @@ -8,6 +8,7 @@ import "channel.proto"; import "config.proto"; import "mesh.proto"; import "module_config.proto"; +import "device_metadata.proto"; option java_outer_classname = "AdminProtos"; @@ -263,5 +264,15 @@ message AdminMessage { * Tell the node to shutdown in this many seconds (or <0 to cancel shutdown) */ int32 shutdown_seconds = 51; + + /* + * Request the node to send device metadata (firmware, protobuf version, etc) + */ + uint32 get_device_metadata_request = 52; + + /* + * Device metadata response + */ + DeviceMetadata get_device_metadata_response = 53; } } diff --git a/device_metadata.proto b/device_metadata.proto new file mode 100644 index 0000000..2ab2091 --- /dev/null +++ b/device_metadata.proto @@ -0,0 +1,14 @@ +/* + * Device metadata response + */ + message DeviceMetadata { + /* + * Device firmware version string + */ + string firmware_version = 0; + + /* + * Device state version + */ + uint32 device_state_version = 1; +} \ No newline at end of file From d3d75475daffabcc4be238a20ab5acdf359c83d7 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 7 Aug 2022 18:48:40 -0500 Subject: [PATCH 2/5] Remove response --- admin.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin.proto b/admin.proto index 9da6e02..6079892 100644 --- a/admin.proto +++ b/admin.proto @@ -269,10 +269,5 @@ message AdminMessage { * Request the node to send device metadata (firmware, protobuf version, etc) */ uint32 get_device_metadata_request = 52; - - /* - * Device metadata response - */ - DeviceMetadata get_device_metadata_response = 53; } } From 9caca13d550efc080617f1cb78550ab444aeff1e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 7 Aug 2022 18:50:18 -0500 Subject: [PATCH 3/5] Indices --- device_metadata.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device_metadata.proto b/device_metadata.proto index 2ab2091..6ced916 100644 --- a/device_metadata.proto +++ b/device_metadata.proto @@ -5,10 +5,10 @@ /* * Device firmware version string */ - string firmware_version = 0; + string firmware_version = 1; /* * Device state version */ - uint32 device_state_version = 1; + uint32 device_state_version = 2; } \ No newline at end of file From 484e16f8c9a6c94b19cbfa38716e7804f47e9b2e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 7 Aug 2022 18:52:28 -0500 Subject: [PATCH 4/5] Proto stuffs --- device_metadata.proto | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/device_metadata.proto b/device_metadata.proto index 6ced916..7c322d0 100644 --- a/device_metadata.proto +++ b/device_metadata.proto @@ -1,3 +1,11 @@ +syntax = "proto3"; + +option java_package = "com.geeksville.mesh"; +option optimize_for = LITE_RUNTIME; +option go_package = "github.com/meshtastic/gomeshproto"; + +option java_outer_classname = "DeviceMetadataProtos"; + /* * Device metadata response */ From f82e3208c96141e8f1bcdabd529bf6b3672035fc Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 7 Aug 2022 18:53:58 -0500 Subject: [PATCH 5/5] Lint --- admin.proto | 1 - device_metadata.proto | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/admin.proto b/admin.proto index 6079892..38342ce 100644 --- a/admin.proto +++ b/admin.proto @@ -8,7 +8,6 @@ import "channel.proto"; import "config.proto"; import "mesh.proto"; import "module_config.proto"; -import "device_metadata.proto"; option java_outer_classname = "AdminProtos"; diff --git a/device_metadata.proto b/device_metadata.proto index 7c322d0..4ec35a5 100644 --- a/device_metadata.proto +++ b/device_metadata.proto @@ -9,7 +9,7 @@ option java_outer_classname = "DeviceMetadataProtos"; /* * Device metadata response */ - message DeviceMetadata { +message DeviceMetadata { /* * Device firmware version string */