Merge pull request #44 from meshtastic/wip

2.2 changes
meshtastic · Aug 8, 2023 · a45bbcd · a45bbcd
2 parents b7cf32b + 8292c7f
commit a45bbcd
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 708 deletions.
diff --git a/Meshtastic.Test/Data/DeviceStateContainerTests.cs b/Meshtastic.Test/Data/DeviceStateContainerTests.cs
@@ -74,11 +74,11 @@ public void AddFromRadio_Should_SetMyInfo_GivenMyNodeInfo()
         {
             MyInfo = new MyNodeInfo()
             {
-                FirmwareVersion = "420"
+                RebootCount = 1234
             }
         };
         deviceStateContainer.AddFromRadio(fromRadio);
-        deviceStateContainer.MyNodeInfo.FirmwareVersion.Should().Be("420");
+        deviceStateContainer.MyNodeInfo.RebootCount.Should().Be(1234);
     }
 
     [Test]

diff --git a/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs b/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs
@@ -90,6 +90,7 @@ public MeshPacket CreateSetModuleConfigMessage(object instance)
             StoreForwardConfig => new ModuleConfig() { StoreForward = instance as StoreForwardConfig },
             TelemetryConfig => new ModuleConfig() { Telemetry = instance as TelemetryConfig },
             RemoteHardwareConfig => new ModuleConfig() { RemoteHardware = instance as RemoteHardwareConfig },
+            NeighborInfoConfig => new ModuleConfig() { NeighborInfo = instance as NeighborInfoConfig },
             _ => throw new ArgumentException("Could not determine ModuleConfig type", nameof(instance)),
         };
         return GetNewMeshPacket(new AdminMessage() { SetModuleConfig = moduleConfig! });

diff --git a/Meshtastic/Generated/Admin.cs b/Meshtastic/Generated/Admin.cs
@@ -28,7 +28,7 @@ static AdminReflection() {
             "dGljL2NoYW5uZWwucHJvdG8aF21lc2h0YXN0aWMvY29uZmlnLnByb3RvGiJt",
             "ZXNodGFzdGljL2Nvbm5lY3Rpb25fc3RhdHVzLnByb3RvGhttZXNodGFzdGlj",
             "L2RldmljZW9ubHkucHJvdG8aFW1lc2h0YXN0aWMvbWVzaC5wcm90bxoebWVz",
-            "aHRhc3RpYy9tb2R1bGVfY29uZmlnLnByb3RvIpIPCgxBZG1pbk1lc3NhZ2US",
+            "aHRhc3RpYy9tb2R1bGVfY29uZmlnLnByb3RvIqsPCgxBZG1pbk1lc3NhZ2US",
             "HQoTZ2V0X2NoYW5uZWxfcmVxdWVzdBgBIAEoDUgAEjMKFGdldF9jaGFubmVs",
             "X3Jlc3BvbnNlGAIgASgLMhMubWVzaHRhc3RpYy5DaGFubmVsSAASGwoRZ2V0",
             "X293bmVyX3JlcXVlc3QYAyABKAhIABIuChJnZXRfb3duZXJfcmVzcG9uc2UY",
@@ -65,20 +65,21 @@ static AdminReflection() {
             "ABIWCgxub2RlZGJfcmVzZXQYZCABKAVIACKVAQoKQ29uZmlnVHlwZRIRCg1E",
             "RVZJQ0VfQ09ORklHEAASEwoPUE9TSVRJT05fQ09ORklHEAESEAoMUE9XRVJf",
             "Q09ORklHEAISEgoOTkVUV09SS19DT05GSUcQAxISCg5ESVNQTEFZX0NPTkZJ",
-            "RxAEEg8KC0xPUkFfQ09ORklHEAUSFAoQQkxVRVRPT1RIX0NPTkZJRxAGIu8B",
+            "RxAEEg8KC0xPUkFfQ09ORklHEAUSFAoQQkxVRVRPT1RIX0NPTkZJRxAGIogC",
             "ChBNb2R1bGVDb25maWdUeXBlEg8KC01RVFRfQ09ORklHEAASEQoNU0VSSUFM",
             "X0NPTkZJRxABEhMKD0VYVE5PVElGX0NPTkZJRxACEhcKE1NUT1JFRk9SV0FS",
             "RF9DT05GSUcQAxIUChBSQU5HRVRFU1RfQ09ORklHEAQSFAoQVEVMRU1FVFJZ",
             "X0NPTkZJRxAFEhQKEENBTk5FRE1TR19DT05GSUcQBhIQCgxBVURJT19DT05G",
-            "SUcQBxIZChVSRU1PVEVIQVJEV0FSRV9DT05GSUcQCBIaChZBTUJJRU5UTElH",
-            "SFRJTkdfQ09ORklHEApCEQoPcGF5bG9hZF92YXJpYW50IlsKDUhhbVBhcmFt",
-            "ZXRlcnMSEQoJY2FsbF9zaWduGAEgASgJEhAKCHR4X3Bvd2VyGAIgASgFEhEK",
-            "CWZyZXF1ZW5jeRgDIAEoAhISCgpzaG9ydF9uYW1lGAQgASgJImYKHk5vZGVS",
-            "ZW1vdGVIYXJkd2FyZVBpbnNSZXNwb25zZRJEChlub2RlX3JlbW90ZV9oYXJk",
-            "d2FyZV9waW5zGAEgAygLMiEubWVzaHRhc3RpYy5Ob2RlUmVtb3RlSGFyZHdh",
-            "cmVQaW5CYAoTY29tLmdlZWtzdmlsbGUubWVzaEILQWRtaW5Qcm90b3NaImdp",
-            "dGh1Yi5jb20vbWVzaHRhc3RpYy9nby9nZW5lcmF0ZWSqAhRNZXNodGFzdGlj",
-            "LlByb3RvYnVmc7oCAGIGcHJvdG8z"));
+            "SUcQBxIZChVSRU1PVEVIQVJEV0FSRV9DT05GSUcQCBIXChNORUlHSEJPUklO",
+            "Rk9fQ09ORklHEAkSGgoWQU1CSUVOVExJR0hUSU5HX0NPTkZJRxAKQhEKD3Bh",
+            "eWxvYWRfdmFyaWFudCJbCg1IYW1QYXJhbWV0ZXJzEhEKCWNhbGxfc2lnbhgB",
+            "IAEoCRIQCgh0eF9wb3dlchgCIAEoBRIRCglmcmVxdWVuY3kYAyABKAISEgoK",
+            "c2hvcnRfbmFtZRgEIAEoCSJmCh5Ob2RlUmVtb3RlSGFyZHdhcmVQaW5zUmVz",
+            "cG9uc2USRAoZbm9kZV9yZW1vdGVfaGFyZHdhcmVfcGlucxgBIAMoCzIhLm1l",
+            "c2h0YXN0aWMuTm9kZVJlbW90ZUhhcmR3YXJlUGluQmAKE2NvbS5nZWVrc3Zp",
+            "bGxlLm1lc2hCC0FkbWluUHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMv",
+            "Z28vZ2VuZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3Rv",
+            "Mw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.ConnectionStatusReflection.Descriptor, global::Meshtastic.Protobufs.DeviceonlyReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -1995,6 +1996,11 @@ public enum ModuleConfigType {
         ///
         /// TODO: REPLACE
         /// </summary>
+        [pbr::OriginalName("NEIGHBORINFO_CONFIG")] NeighborinfoConfig = 9,
+        /// <summary>
+        ///
+        /// TODO: REPLACE
+        /// </summary>
         [pbr::OriginalName("AMBIENTLIGHTING_CONFIG")] AmbientlightingConfig = 10,
       }
 

diff --git a/Meshtastic/Generated/Deviceonly.cs b/Meshtastic/Generated/Deviceonly.cs
@@ -27,43 +27,42 @@ static DeviceonlyReflection() {
             "ChttZXNodGFzdGljL2RldmljZW9ubHkucHJvdG8SCm1lc2h0YXN0aWMaGG1l",
             "c2h0YXN0aWMvY2hhbm5lbC5wcm90bxoabWVzaHRhc3RpYy9sb2NhbG9ubHku",
             "cHJvdG8aFW1lc2h0YXN0aWMvbWVzaC5wcm90bxoabWVzaHRhc3RpYy90ZWxl",
-            "bWV0cnkucHJvdG8aHm1lc2h0YXN0aWMvbW9kdWxlX2NvbmZpZy5wcm90byK+",
+            "bWV0cnkucHJvdG8aHm1lc2h0YXN0aWMvbW9kdWxlX2NvbmZpZy5wcm90byKT",
             "AwoLRGV2aWNlU3RhdGUSJwoHbXlfbm9kZRgCIAEoCzIWLm1lc2h0YXN0aWMu",
-            "TXlOb2RlSW5mbxIfCgVvd25lchgDIAEoCzIQLm1lc2h0YXN0aWMuVXNlchIp",
-            "Cgdub2RlX2RiGAQgAygLMhQubWVzaHRhc3RpYy5Ob2RlSW5mb0ICGAESLQoN",
-            "cmVjZWl2ZV9xdWV1ZRgFIAMoCzIWLm1lc2h0YXN0aWMuTWVzaFBhY2tldBIP",
-            "Cgd2ZXJzaW9uGAggASgNEi8KD3J4X3RleHRfbWVzc2FnZRgHIAEoCzIWLm1l",
-            "c2h0YXN0aWMuTWVzaFBhY2tldBIPCgdub19zYXZlGAkgASgIEhUKDWRpZF9n",
-            "cHNfcmVzZXQYCyABKAgSKwoLcnhfd2F5cG9pbnQYDCABKAsyFi5tZXNodGFz",
-            "dGljLk1lc2hQYWNrZXQSRAoZbm9kZV9yZW1vdGVfaGFyZHdhcmVfcGlucxgN",
-            "IAMoCzIhLm1lc2h0YXN0aWMuTm9kZVJlbW90ZUhhcmR3YXJlUGluEi4KDG5v",
-            "ZGVfZGJfbGl0ZRgOIAMoCzIYLm1lc2h0YXN0aWMuTm9kZUluZm9MaXRlIswB",
-            "CgxOb2RlSW5mb0xpdGUSCwoDbnVtGAEgASgNEh4KBHVzZXIYAiABKAsyEC5t",
-            "ZXNodGFzdGljLlVzZXISKgoIcG9zaXRpb24YAyABKAsyGC5tZXNodGFzdGlj",
-            "LlBvc2l0aW9uTGl0ZRILCgNzbnIYBCABKAISEgoKbGFzdF9oZWFyZBgFIAEo",
-            "BxIxCg5kZXZpY2VfbWV0cmljcxgGIAEoCzIZLm1lc2h0YXN0aWMuRGV2aWNl",
-            "TWV0cmljcxIPCgdjaGFubmVsGAcgASgNIpABCgxQb3NpdGlvbkxpdGUSEgoK",
-            "bGF0aXR1ZGVfaRgBIAEoDxITCgtsb25naXR1ZGVfaRgCIAEoDxIQCghhbHRp",
-            "dHVkZRgDIAEoBRIMCgR0aW1lGAQgASgHEjcKD2xvY2F0aW9uX3NvdXJjZRgF",
-            "IAEoDjIeLm1lc2h0YXN0aWMuUG9zaXRpb24uTG9jU291cmNlIkUKC0NoYW5u",
-            "ZWxGaWxlEiUKCGNoYW5uZWxzGAEgAygLMhMubWVzaHRhc3RpYy5DaGFubmVs",
-            "Eg8KB3ZlcnNpb24YAiABKA0ilwIKCE9FTVN0b3JlEhYKDm9lbV9pY29uX3dp",
-            "ZHRoGAEgASgNEhcKD29lbV9pY29uX2hlaWdodBgCIAEoDRIVCg1vZW1faWNv",
-            "bl9iaXRzGAMgASgMEikKCG9lbV9mb250GAQgASgOMhcubWVzaHRhc3RpYy5T",
-            "Y3JlZW5Gb250cxIQCghvZW1fdGV4dBgFIAEoCRITCgtvZW1fYWVzX2tleRgG",
-            "IAEoDBIxChBvZW1fbG9jYWxfY29uZmlnGAcgASgLMhcubWVzaHRhc3RpYy5M",
-            "b2NhbENvbmZpZxI+ChdvZW1fbG9jYWxfbW9kdWxlX2NvbmZpZxgIIAEoCzId",
-            "Lm1lc2h0YXN0aWMuTG9jYWxNb2R1bGVDb25maWciVQoVTm9kZVJlbW90ZUhh",
-            "cmR3YXJlUGluEhAKCG5vZGVfbnVtGAEgASgNEioKA3BpbhgCIAEoCzIdLm1l",
-            "c2h0YXN0aWMuUmVtb3RlSGFyZHdhcmVQaW4qPgoLU2NyZWVuRm9udHMSDgoK",
-            "Rk9OVF9TTUFMTBAAEg8KC0ZPTlRfTUVESVVNEAESDgoKRk9OVF9MQVJHRRAC",
-            "Ql8KE2NvbS5nZWVrc3ZpbGxlLm1lc2hCCkRldmljZU9ubHlaImdpdGh1Yi5j",
-            "b20vbWVzaHRhc3RpYy9nby9nZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3Rv",
-            "YnVmc7oCAGIGcHJvdG8z"));
+            "TXlOb2RlSW5mbxIfCgVvd25lchgDIAEoCzIQLm1lc2h0YXN0aWMuVXNlchIt",
+            "Cg1yZWNlaXZlX3F1ZXVlGAUgAygLMhYubWVzaHRhc3RpYy5NZXNoUGFja2V0",
+            "Eg8KB3ZlcnNpb24YCCABKA0SLwoPcnhfdGV4dF9tZXNzYWdlGAcgASgLMhYu",
+            "bWVzaHRhc3RpYy5NZXNoUGFja2V0Eg8KB25vX3NhdmUYCSABKAgSFQoNZGlk",
+            "X2dwc19yZXNldBgLIAEoCBIrCgtyeF93YXlwb2ludBgMIAEoCzIWLm1lc2h0",
+            "YXN0aWMuTWVzaFBhY2tldBJEChlub2RlX3JlbW90ZV9oYXJkd2FyZV9waW5z",
+            "GA0gAygLMiEubWVzaHRhc3RpYy5Ob2RlUmVtb3RlSGFyZHdhcmVQaW4SLgoM",
+            "bm9kZV9kYl9saXRlGA4gAygLMhgubWVzaHRhc3RpYy5Ob2RlSW5mb0xpdGUi",
+            "zAEKDE5vZGVJbmZvTGl0ZRILCgNudW0YASABKA0SHgoEdXNlchgCIAEoCzIQ",
+            "Lm1lc2h0YXN0aWMuVXNlchIqCghwb3NpdGlvbhgDIAEoCzIYLm1lc2h0YXN0",
+            "aWMuUG9zaXRpb25MaXRlEgsKA3NuchgEIAEoAhISCgpsYXN0X2hlYXJkGAUg",
+            "ASgHEjEKDmRldmljZV9tZXRyaWNzGAYgASgLMhkubWVzaHRhc3RpYy5EZXZp",
+            "Y2VNZXRyaWNzEg8KB2NoYW5uZWwYByABKA0ikAEKDFBvc2l0aW9uTGl0ZRIS",
+            "CgpsYXRpdHVkZV9pGAEgASgPEhMKC2xvbmdpdHVkZV9pGAIgASgPEhAKCGFs",
+            "dGl0dWRlGAMgASgFEgwKBHRpbWUYBCABKAcSNwoPbG9jYXRpb25fc291cmNl",
+            "GAUgASgOMh4ubWVzaHRhc3RpYy5Qb3NpdGlvbi5Mb2NTb3VyY2UiRQoLQ2hh",
+            "bm5lbEZpbGUSJQoIY2hhbm5lbHMYASADKAsyEy5tZXNodGFzdGljLkNoYW5u",
+            "ZWwSDwoHdmVyc2lvbhgCIAEoDSKXAgoIT0VNU3RvcmUSFgoOb2VtX2ljb25f",
+            "d2lkdGgYASABKA0SFwoPb2VtX2ljb25faGVpZ2h0GAIgASgNEhUKDW9lbV9p",
+            "Y29uX2JpdHMYAyABKAwSKQoIb2VtX2ZvbnQYBCABKA4yFy5tZXNodGFzdGlj",
+            "LlNjcmVlbkZvbnRzEhAKCG9lbV90ZXh0GAUgASgJEhMKC29lbV9hZXNfa2V5",
+            "GAYgASgMEjEKEG9lbV9sb2NhbF9jb25maWcYByABKAsyFy5tZXNodGFzdGlj",
+            "LkxvY2FsQ29uZmlnEj4KF29lbV9sb2NhbF9tb2R1bGVfY29uZmlnGAggASgL",
+            "Mh0ubWVzaHRhc3RpYy5Mb2NhbE1vZHVsZUNvbmZpZyJVChVOb2RlUmVtb3Rl",
+            "SGFyZHdhcmVQaW4SEAoIbm9kZV9udW0YASABKA0SKgoDcGluGAIgASgLMh0u",
+            "bWVzaHRhc3RpYy5SZW1vdGVIYXJkd2FyZVBpbio+CgtTY3JlZW5Gb250cxIO",
+            "CgpGT05UX1NNQUxMEAASDwoLRk9OVF9NRURJVU0QARIOCgpGT05UX0xBUkdF",
+            "EAJCXwoTY29tLmdlZWtzdmlsbGUubWVzaEIKRGV2aWNlT25seVoiZ2l0aHVi",
+            "LmNvbS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJv",
+            "dG9idWZzugIAYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.LocalonlyReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, global::Meshtastic.Protobufs.TelemetryReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Meshtastic.Protobufs.ScreenFonts), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.DeviceState), global::Meshtastic.Protobufs.DeviceState.Parser, new[]{ "MyNode", "Owner", "NodeDb", "ReceiveQueue", "Version", "RxTextMessage", "NoSave", "DidGpsReset", "RxWaypoint", "NodeRemoteHardwarePins", "NodeDbLite" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.DeviceState), global::Meshtastic.Protobufs.DeviceState.Parser, new[]{ "MyNode", "Owner", "ReceiveQueue", "Version", "RxTextMessage", "NoSave", "DidGpsReset", "RxWaypoint", "NodeRemoteHardwarePins", "NodeDbLite" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.NodeInfoLite), global::Meshtastic.Protobufs.NodeInfoLite.Parser, new[]{ "Num", "User", "Position", "Snr", "LastHeard", "DeviceMetrics", "Channel" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.PositionLite), global::Meshtastic.Protobufs.PositionLite.Parser, new[]{ "LatitudeI", "LongitudeI", "Altitude", "Time", "LocationSource" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.ChannelFile), global::Meshtastic.Protobufs.ChannelFile.Parser, new[]{ "Channels", "Version" }, null, null, null, null),
@@ -144,7 +143,6 @@ public DeviceState() {
     public DeviceState(DeviceState other) : this() {
       myNode_ = other.myNode_ != null ? other.myNode_.Clone() : null;
       owner_ = other.owner_ != null ? other.owner_.Clone() : null;
-      nodeDb_ = other.nodeDb_.Clone();
       receiveQueue_ = other.receiveQueue_.Clone();
       version_ = other.version_;
       rxTextMessage_ = other.rxTextMessage_ != null ? other.rxTextMessage_.Clone() : null;
@@ -194,23 +192,6 @@ public DeviceState Clone() {
       }
     }
 
-    /// <summary>Field number for the "node_db" field.</summary>
-    public const int NodeDbFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Meshtastic.Protobufs.NodeInfo> _repeated_nodeDb_codec
-        = pb::FieldCodec.ForMessage(34, global::Meshtastic.Protobufs.NodeInfo.Parser);
-    private readonly pbc::RepeatedField<global::Meshtastic.Protobufs.NodeInfo> nodeDb_ = new pbc::RepeatedField<global::Meshtastic.Protobufs.NodeInfo>();
-    /// <summary>
-    ///
-    /// Deprecated in 2.1.x
-    /// Old node_db. See NodeInfoLite node_db_lite
-    /// </summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Meshtastic.Protobufs.NodeInfo> NodeDb {
-      get { return nodeDb_; }
-    }
-
     /// <summary>Field number for the "receive_queue" field.</summary>
     public const int ReceiveQueueFieldNumber = 5;
     private static readonly pb::FieldCodec<global::Meshtastic.Protobufs.MeshPacket> _repeated_receiveQueue_codec
@@ -360,7 +341,6 @@ public bool Equals(DeviceState other) {
       }
       if (!object.Equals(MyNode, other.MyNode)) return false;
       if (!object.Equals(Owner, other.Owner)) return false;
-      if(!nodeDb_.Equals(other.nodeDb_)) return false;
       if(!receiveQueue_.Equals(other.receiveQueue_)) return false;
       if (Version != other.Version) return false;
       if (!object.Equals(RxTextMessage, other.RxTextMessage)) return false;
@@ -378,7 +358,6 @@ public override int GetHashCode() {
       int hash = 1;
       if (myNode_ != null) hash ^= MyNode.GetHashCode();
       if (owner_ != null) hash ^= Owner.GetHashCode();
-      hash ^= nodeDb_.GetHashCode();
       hash ^= receiveQueue_.GetHashCode();
       if (Version != 0) hash ^= Version.GetHashCode();
       if (rxTextMessage_ != null) hash ^= RxTextMessage.GetHashCode();
@@ -413,7 +392,6 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(26);
         output.WriteMessage(Owner);
       }
-      nodeDb_.WriteTo(output, _repeated_nodeDb_codec);
       receiveQueue_.WriteTo(output, _repeated_receiveQueue_codec);
       if (rxTextMessage_ != null) {
         output.WriteRawTag(58);
@@ -455,7 +433,6 @@ public void WriteTo(pb::CodedOutputStream output) {
         output.WriteRawTag(26);
         output.WriteMessage(Owner);
       }
-      nodeDb_.WriteTo(ref output, _repeated_nodeDb_codec);
       receiveQueue_.WriteTo(ref output, _repeated_receiveQueue_codec);
       if (rxTextMessage_ != null) {
         output.WriteRawTag(58);
@@ -495,7 +472,6 @@ public int CalculateSize() {
       if (owner_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(Owner);
       }
-      size += nodeDb_.CalculateSize(_repeated_nodeDb_codec);
       size += receiveQueue_.CalculateSize(_repeated_receiveQueue_codec);
       if (Version != 0) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Version);
@@ -538,7 +514,6 @@ public void MergeFrom(DeviceState other) {
         }
         Owner.MergeFrom(other.Owner);
       }
-      nodeDb_.Add(other.nodeDb_);
       receiveQueue_.Add(other.receiveQueue_);
       if (other.Version != 0) {
         Version = other.Version;
@@ -592,10 +567,6 @@ public void MergeFrom(pb::CodedInputStream input) {
             input.ReadMessage(Owner);
             break;
           }
-          case 34: {
-            nodeDb_.AddEntriesFrom(input, _repeated_nodeDb_codec);
-            break;
-          }
           case 42: {
             receiveQueue_.AddEntriesFrom(input, _repeated_receiveQueue_codec);
             break;
@@ -663,10 +634,6 @@ public void MergeFrom(pb::CodedInputStream input) {
             input.ReadMessage(Owner);
             break;
           }
-          case 34: {
-            nodeDb_.AddEntriesFrom(ref input, _repeated_nodeDb_codec);
-            break;
-          }
           case 42: {
             receiveQueue_.AddEntriesFrom(ref input, _repeated_receiveQueue_codec);
             break;