Merge pull request #156 from andrekir/local

Issue #155 - proto needs refactor for 1.3 clients
This commit is contained in:
Thomas Göttgens 2022-05-30 20:58:25 +02:00 committed by GitHub
commit 695b242113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 92 additions and 74 deletions

View file

@ -5,6 +5,7 @@ option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
import "channel.proto";
import "config.proto";
option java_outer_classname = "AppOnlyProtos";
@ -18,7 +19,12 @@ option java_outer_classname = "AppOnlyProtos";
message ChannelSet {
/*
* TODO: REPLACE
* Channel list with settings
*/
repeated ChannelSettings settings = 1;
}
/*
* LoRa config
*/
Config.LoRaConfig lora_config = 2;
}

View file

@ -5,13 +5,10 @@ option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
import "channel.proto";
import "config.proto";
import "mesh.proto";
import "module_config.proto";
option java_outer_classname = "DeviceOnly";
/*
* This message is never sent over the wire, but it is used for serializing DB
* state to flash in the device code
@ -136,72 +133,3 @@ message OEMStore {
*/
string oem_text = 5;
}
message LocalConfig {
/*
* TODO: REPLACE
*/
Config.DeviceConfig device = 1;
/*
* TODO: REPLACE
*/
Config.PositionConfig position = 2;
/*
* TODO: REPLACE
*/
Config.PowerConfig power = 3;
/*
* TODO: REPLACE
*/
Config.WiFiConfig wifi = 4;
/*
* TODO: REPLACE
*/
Config.DisplayConfig display = 5;
/*
* TODO: REPLACE
*/
Config.LoRaConfig lora = 6;
}
message LocalModuleConfig {
/*
* TODO: REPLACE
*/
ModuleConfig.MQTTConfig mqtt = 1;
/*
* TODO: REPLACE
*/
ModuleConfig.SerialConfig serial = 2;
/*
* TODO: REPLACE
*/
ModuleConfig.ExternalNotificationConfig external_notification = 3;
/*
* TODO: REPLACE
*/
ModuleConfig.StoreForwardConfig store_forward = 4;
/*
* TODO: REPLACE
*/
ModuleConfig.RangeTestConfig range_test = 5;
/*
* TODO: REPLACE
*/
ModuleConfig.TelemetryConfig telemetry = 6;
/*
* TODO: REPLACE
*/
ModuleConfig.CannedMessageConfig canned_message = 7;
}

84
localonly.proto Normal file
View file

@ -0,0 +1,84 @@
syntax = "proto3";
option java_package = "com.geeksville.mesh";
option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
import "config.proto";
import "module_config.proto";
option java_outer_classname = "LocalOnlyProtos";
/*
* Protobuf structures common to apponly.proto and deviceonly.proto
* This is never sent over the wire, only for local use
*/
message LocalConfig {
/*
* TODO: REPLACE
*/
Config.DeviceConfig device = 1;
/*
* TODO: REPLACE
*/
Config.PositionConfig position = 2;
/*
* TODO: REPLACE
*/
Config.PowerConfig power = 3;
/*
* TODO: REPLACE
*/
Config.WiFiConfig wifi = 4;
/*
* TODO: REPLACE
*/
Config.DisplayConfig display = 5;
/*
* TODO: REPLACE
*/
Config.LoRaConfig lora = 6;
}
message LocalModuleConfig {
/*
* TODO: REPLACE
*/
ModuleConfig.MQTTConfig mqtt = 1;
/*
* TODO: REPLACE
*/
ModuleConfig.SerialConfig serial = 2;
/*
* TODO: REPLACE
*/
ModuleConfig.ExternalNotificationConfig external_notification = 3;
/*
* TODO: REPLACE
*/
ModuleConfig.StoreForwardConfig store_forward = 4;
/*
* TODO: REPLACE
*/
ModuleConfig.RangeTestConfig range_test = 5;
/*
* TODO: REPLACE
*/
ModuleConfig.TelemetryConfig telemetry = 6;
/*
* TODO: REPLACE
*/
ModuleConfig.CannedMessageConfig canned_message = 7;
}