Canned message - Extend messages length

pull/103/head
Balazs Kelemen 2022-01-24 21:41:27 +01:00
rodzic 95e22ccebd
commit 996940f44c
7 zmienionych plików z 26 dodań i 118 usunięć

Wyświetl plik

@ -1,7 +1,10 @@
*AdminMessage.variant anonymous_oneof:true
*AdminMessage.set_canned_message_plugin_part1 max_size:200
*AdminMessage.set_canned_message_plugin_part2 max_size:200
*AdminMessage.set_canned_message_plugin_part3 max_size:200
*AdminMessage.set_canned_message_plugin_part4 max_size:200
*AdminMessage.set_canned_message_plugin_part5 max_size:200
*AdminMessage.set_canned_message_plugin_part1 max_size:201
*AdminMessage.set_canned_message_plugin_part2 max_size:201
*AdminMessage.set_canned_message_plugin_part3 max_size:201
*AdminMessage.set_canned_message_plugin_part4 max_size:201
*AdminMessage.get_canned_message_plugin_part1_response max_size:201
*AdminMessage.get_canned_message_plugin_part2_response max_size:201
*AdminMessage.get_canned_message_plugin_part3_response max_size:201
*AdminMessage.get_canned_message_plugin_part4_response max_size:201

Wyświetl plik

@ -4,7 +4,6 @@ option java_package = "com.geeksville.mesh";
option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
import "cannedmessages.proto";
import "channel.proto";
import "mesh.proto";
import "radioconfig.proto";
@ -82,56 +81,45 @@ message AdminMessage {
* Get the Canned Message Plugin message part1 in the response to this message.
*/
bool get_canned_message_plugin_part1_request = 36;
CannedMessagePluginMessagePart1 get_canned_message_plugin_part1_response = 37;
string 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;
CannedMessagePluginMessagePart2 get_canned_message_plugin_part2_response = 39;
string 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;
CannedMessagePluginMessagePart3 get_canned_message_plugin_part3_response = 41;
string 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;
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;
CannedMessagePluginMessagePart5 get_canned_message_plugin_part5_response = 45;
string get_canned_message_plugin_part4_response = 43;
/*
* Set the canned message plugin part 1 text.
*/
CannedMessagePluginMessagePart1 set_canned_message_plugin_part1 = 46;
string set_canned_message_plugin_part1 = 44;
/*
* Set the canned message plugin part 2 text.
*/
CannedMessagePluginMessagePart2 set_canned_message_plugin_part2 = 47;
string set_canned_message_plugin_part2 = 45;
/*
* Set the canned message plugin part 3 text.
*/
CannedMessagePluginMessagePart3 set_canned_message_plugin_part3 = 48;
string set_canned_message_plugin_part3 = 46;
/*
* Set the canned message plugin part 4 text.
*/
CannedMessagePluginMessagePart4 set_canned_message_plugin_part4 = 49;
/*
* Set the canned message plugin part 5 text.
*/
CannedMessagePluginMessagePart5 set_canned_message_plugin_part5 = 50;
string set_canned_message_plugin_part4 = 47;
/*
* Tell the node to shutdown in this many seconds (or <0 to cancel shutdown)

Wyświetl plik

@ -1,5 +1,4 @@
*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
*CannedMessagePluginConfig.messagesPart1 max_size:201
*CannedMessagePluginConfig.messagesPart2 max_size:201
*CannedMessagePluginConfig.messagesPart3 max_size:201
*CannedMessagePluginConfig.messagesPart4 max_size:201

Wyświetl plik

@ -25,57 +25,14 @@ option optimize_for = LITE_RUNTIME;
option go_package = "github.com/meshtastic/gomeshproto";
/*
* Canned message plugin part 1
* Canned message plugin configuration.
*/
message CannedMessagePluginMessagePart1 {
message CannedMessagePluginConfig {
/*
* Predefined messages for canned message plugin separated by '|' characters.
* This is part 1.
*/
string text = 1;
string messagesPart1 = 11;
string messagesPart2 = 12;
string messagesPart3 = 13;
string messagesPart4 = 14;
}
/*
* 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;
}

Wyświetl plik

@ -7,11 +7,5 @@
# FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
*DeviceState.receive_queue max_count:1
*DeviceState.canned_message_plugin_message_part1 max_size:200
*DeviceState.canned_message_plugin_message_part2 max_size:200
*DeviceState.canned_message_plugin_message_part3 max_size:200
*DeviceState.canned_message_plugin_message_part4 max_size:200
*DeviceState.canned_message_plugin_message_part5 max_size:200
*ChannelFile.channels max_count:8

Wyświetl plik

@ -72,31 +72,6 @@ message DeviceState {
*/
bool did_gps_reset = 11;
/*
* Canned Message Plugin message part1.
*/
string canned_message_plugin_message_part1 = 13;
/*
* Canned Message Plugin message part2.
*/
string canned_message_plugin_message_part2 = 14;
/*
* Canned Message Plugin message part3.
*/
string canned_message_plugin_message_part3 = 15;
/*
* Canned Message Plugin message part4.
*/
string canned_message_plugin_message_part4 = 16;
/*
* Canned Message Plugin message part5.
*/
string canned_message_plugin_message_part5 = 17;
}
/*

Wyświetl plik

@ -673,14 +673,6 @@ message RadioConfig {
*/
string canned_message_plugin_allow_input_source = 171;
/*
* Predefined messages for CannedMessagePlugin separated by '|' characters.
* Note: Split out the messages out to their own messages because we want to store 1,000 characters.
* and the entire message must fit within 256 bytes.
* Not sure if we should deprecate this or just remove it since we're in dev phase.
*/
string canned_message_plugin_messages = 172 [deprecated = true];
/*
* CannedMessagePlugin also sends a bell character with the messages.
* ExternalNotificationPlugin can benefit from this feature.