diff --git a/mesh.options b/mesh.options index 7116b18..43519d4 100644 --- a/mesh.options +++ b/mesh.options @@ -16,7 +16,6 @@ # Big enough for 1.2.28.568032c-d *MyNodeInfo.firmware_version max_size:18 -*MyNodeInfo.hw_model_deprecated max_size:16 *MyNodeInfo.region max_size:12 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256 diff --git a/mesh.proto b/mesh.proto index f94f34f..c25c95d 100644 --- a/mesh.proto +++ b/mesh.proto @@ -466,24 +466,6 @@ message Routing { */ Error error_reason = 3; - /* - * Deprecated - this has been replced with error_reason == NONE && request_id != 0 - * This is an ack. - * This packet is a requested acknoledgement indicating that we have received - * the specified message ID. - * This packet type can be used both for immediate (0 hops) messages or can be routed through multiple hops if dest is set. - * Note: As an optimization, recipients can _also_ populate a field in payload - * if they think the recipient would appreciate that extra state. - * - * fixed32 success_id = 4; - */ - - /* - * Deprecated - this has been replced with error_reason !== NONE && request_id != 0 - * This is a nak, we failed to deliver this message. - * - * fixed32 fail_id = 5; - */ } } @@ -934,14 +916,6 @@ message MyNodeInfo { */ string region = 4 [deprecated = true]; - /* - * TBEAM, HELTEC, etc... - * Starting in 1.2.11 moved to hw_model enum in the NodeInfo object. - * Apps will still need the string here for older builds - * (so OTA update can find the right image), but if the enum is available it will be used instead. - */ - string hw_model_deprecated = 5 [deprecated = true]; - /* * 0.0.5 etc... */ diff --git a/radioconfig.proto b/radioconfig.proto index 4e6336b..b3ea1ac 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -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.