broke out canned messages

This commit is contained in:
Mike Kinney 2022-01-19 10:54:26 -08:00
parent 22c12e043b
commit 1774f7405c
5 changed files with 93 additions and 62 deletions

View file

@ -7,6 +7,7 @@ option go_package = "github.com/meshtastic/gomeshproto";
import "channel.proto";
import "mesh.proto";
import "radioconfig.proto";
import "cannedmessages.proto";
option java_outer_classname = "AdminProtos";
@ -81,32 +82,31 @@ message AdminMessage {
* Get the Canned Message Plugin message part1 in the response to this message.
*/
bool get_canned_message_plugin_part1_request = 36;
RadioConfig get_canned_message_plugin_part1_response = 37;
CannedMessagePluginMessagePart1 get_canned_message_plugin_part1_response = 37;
/*
* Get the Canned Message Plugin message part2 in the response to this message.
*/
bool get_canned_message_plugin_part2_request = 38;
RadioConfig get_canned_message_plugin_part2_response = 39;
CannedMessagePluginMessagePart2 get_canned_message_plugin_part2_response = 39;
/*
* Get the Canned Message Plugin message part3 in the response to this message.
*/
bool get_canned_message_plugin_part3_request = 40;
RadioConfig get_canned_message_plugin_part3_response = 41;
CannedMessagePluginMessagePart3 get_canned_message_plugin_part3_response = 41;
/*
* Get the Canned Message Plugin message part4 in the response to this message.
*/
bool get_canned_message_plugin_part4_request = 42;
RadioConfig get_canned_message_plugin_part4_response = 43;
CannedMessagePluginMessagePart4 get_canned_message_plugin_part4_response = 43;
/*
* Get the Canned Message Plugin message part5 in the response to this message.
*/
bool get_canned_message_plugin_part5_request = 44;
RadioConfig get_canned_message_plugin_part5_response = 45;
CannedMessagePluginMessagePart5 get_canned_message_plugin_part5_response = 45;
/*
* Set the canned message plugin part 1 text.

5
cannedmessages.options Normal file
View file

@ -0,0 +1,5 @@
*CannedMessagePluginMessagePart1.text max_size:200
*CannedMessagePluginMessagePart2.text max_size:200
*CannedMessagePluginMessagePart3.text max_size:200
*CannedMessagePluginMessagePart4.text max_size:200
*CannedMessagePluginMessagePart5.text max_size:200

81
cannedmessages.proto Normal file
View file

@ -0,0 +1,81 @@
syntax = "proto3";
/*
* Meshtastic protobufs
*
* For more information on protobufs (and tools to use them with the language of your choice) see
* https://developers.google.com/protocol-buffers/docs/proto3
*
* We are not placing any of these defs inside a package, because if you do the
* resulting nanopb version is super verbose package mesh.
*
* Protobuf build instructions:
*
* To build java classes for reading writing:
* protoc -I=. --java_out /tmp mesh.proto
*
* To generate Nanopb c code:
* /home/kevinh/packages/nanopb-0.4.0-linux-x86/generator-bin/protoc --nanopb_out=/tmp -I=app/src/main/proto mesh.proto
*
* Nanopb binaries available here: https://jpa.kapsi.fi/nanopb/download/ use nanopb 0.4.0
*/
option java_package = "com.geeksville.mesh";
option java_outer_classname = "CannedMessageConfigProtos";
option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
/*
* Canned message plugin part 1
*/
message CannedMessagePluginMessagePart1 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 1.
*/
string text = 1;
}
/*
* Canned message plugin part 2
*/
message CannedMessagePluginMessagePart2 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 2.
*/
string text = 1;
}
/*
* Canned message plugin part 3
*/
message CannedMessagePluginMessagePart3 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 3.
*/
string text = 1;
}
/*
* Canned message plugin part 4
*/
message CannedMessagePluginMessagePart4 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 4.
*/
string text = 1;
}
/*
* Canned message plugin part 5
*/
message CannedMessagePluginMessagePart5 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 5.
*/
string text = 1;
}

View file

@ -10,9 +10,3 @@
*UserPreferences.mqtt_password max_size:32
*UserPreferences.canned_message_plugin_allow_input_source max_size:16
*CannedMessagePluginMessagePart1.text max_size:200
*CannedMessagePluginMessagePart2.text max_size:200
*CannedMessagePluginMessagePart3.text max_size:200
*CannedMessagePluginMessagePart4.text max_size:200
*CannedMessagePluginMessagePart5.text max_size:200

View file

@ -683,54 +683,5 @@ message RadioConfig {
}
UserPreferences preferences = 1;
} // RadioConfig
message CannedMessagePluginMessagePart1 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 1.
*/
string text = 1;
}
CannedMessagePluginMessagePart1 canned_message_plugin_message_part1 = 2;
message CannedMessagePluginMessagePart2 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 2.
*/
string text = 1;
}
CannedMessagePluginMessagePart2 canned_message_plugin_message_part2 = 3;
message CannedMessagePluginMessagePart3 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 3.
*/
string text = 1;
}
CannedMessagePluginMessagePart3 canned_message_plugin_message_part3 = 4;
message CannedMessagePluginMessagePart4 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 4.
*/
string text = 1;
}
CannedMessagePluginMessagePart4 canned_message_plugin_message_part4 = 5;
message CannedMessagePluginMessagePart5 {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 5.
*/
string text = 1;
}
CannedMessagePluginMessagePart5 canned_message_plugin_message_part5 = 6;
}