WildernessLabs · jorgedevs · Mar 22, 2024 · Mar 22, 2024 · Mar 22, 2024 · Mar 22, 2024
diff --git a/...ayMenu/Driver/BaseClasses/MenuItemBase.cs → ...isplayMenu/Driver/BaseClasses/MenuItem.cs b/...ayMenu/Driver/BaseClasses/MenuItemBase.cs → ...isplayMenu/Driver/BaseClasses/MenuItem.cs
@@ -1,6 +1,4 @@
 
-using System.Text.Json.Serialization;
-
 namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
@@ -11,37 +9,31 @@ public class MenuItem
         /// <summary>
         /// Sub items in the menu
         /// </summary>
-        [JsonPropertyName("sub")]
         public MenuItem[]? SubItems { get; set; }
 
         /// <summary>
         /// The text on the menu item
         /// </summary>
-        [JsonPropertyName("text")]
         public string Text { get; set; }
 
         /// <summary>
         /// The optional command when the item is selected
         /// </summary>
-        [JsonPropertyName("command")]
         public string Command { get; set; }
 
         /// <summary>
         /// The menu item type
         /// </summary>
-        [JsonPropertyName("type")]
         public string Type { get; set; }
 
         /// <summary>
         /// The menu item id
         /// </summary>
-        [JsonPropertyName("id")]
         public string Id { get; set; }
 
         /// <summary>
         /// The menu item value
         /// </summary>
-        [JsonPropertyName("value")]
         public object? Value { get; set; }
 
         /// <summary>
@@ -54,6 +46,19 @@ public class MenuItem
         /// </summary>
         public bool IsEditable => Value != null;
 
+        /// <summary>
+        /// Creates a new MenuItem object
+        /// </summary>
+        public MenuItem()
+        {
+            Text = string.Empty;
+            Command = string.Empty;
+            Id = string.Empty;
+            Type = string.Empty;
+            Value = null;
+            SubItems = null;
+        }
+
         /// <summary>
         /// Creates a new MenuItem object
         /// </summary>

diff --git a/....Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/Displays.TextDisplayMenu.csproj b/....Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/Displays.TextDisplayMenu.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <None Include=".\Readme.md" Pack="true" PackagePath="" />
     <None Include="..\..\..\icon.png" Pack="true" PackagePath="" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
     <ProjectReference Include="..\..\Graphics.MicroGraphics\Driver\Graphics.MicroGraphics.csproj" />
+    <ProjectReference Include="..\..\Serialization.MicroJson\Driver\Serialization.MicroJson.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/TextDisplayMenu.cs b/...ow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/TextDisplayMenu.cs
@@ -1,9 +1,9 @@
 using Meadow.Foundation.Displays.UI.InputTypes;
+using Meadow.Foundation.Serialization;
 using Meadow.Peripherals.Displays;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text.Json;
 
 namespace Meadow.Foundation.Displays.UI
 {
@@ -72,7 +72,7 @@ public TextDisplayMenu(ITextDisplay display, MenuItem[] menuItems, bool showBack
         {
             var menuString = System.Text.Encoding.Default.GetString(menuJson);
 
-            return JsonSerializer.Deserialize<MenuItem[]>(menuString);
+            return MicroJson.Deserialize<MenuItem[]>(menuString);
         }
 
         void Init(ITextDisplay display, MenuPage menuPage)

diff --git a/...splays.TextDisplayMenu/Samples/TextDisplayMenuTft_Sample/TextDisplayMenuTft_Sample.csproj b/...splays.TextDisplayMenu/Samples/TextDisplayMenuTft_Sample/TextDisplayMenuTft_Sample.csproj
@@ -20,6 +20,9 @@
     <ProjectReference Include="..\..\..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="app.build.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="meadow.config.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/..._and_Frameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenuTft_Sample/app.build.yaml b/..._and_Frameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenuTft_Sample/app.build.yaml
@@ -0,0 +1,2 @@
+Deploy:
+  NoLink: [ TextDisplayMenu ]
diff --git a/...isplayMenu/Samples/TextDisplayMenu_GameMenu_Sample/TextDisplayMenu_GameMenu_Sample.csproj b/...isplayMenu/Samples/TextDisplayMenu_GameMenu_Sample/TextDisplayMenu_GameMenu_Sample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Meadow.Sdk/1.1.0">
+<Project Sdk="Meadow.Sdk/1.1.0">
   <PropertyGroup>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
     <Company>Wilderness Labs, Inc</Company>
@@ -20,6 +20,9 @@
     <ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="app.build.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="meadow.config.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/...rameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_GameMenu_Sample/app.build.yaml b/...rameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_GameMenu_Sample/app.build.yaml
@@ -0,0 +1,2 @@
+Deploy:
+  NoLink: [ TextDisplayMenu ]
diff --git a/...rks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_Sample/TextDisplayMenu_Sample.csproj b/...rks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_Sample/TextDisplayMenu_Sample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Meadow.Sdk/1.1.0">
+<Project Sdk="Meadow.Sdk/1.1.0">
   <PropertyGroup>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
     <Company>Wilderness Labs, Inc</Company>
@@ -20,6 +20,9 @@
     <ProjectReference Include="..\..\..\..\Meadow.Foundation.Peripherals\Displays.Ssd130x\Driver\Displays.Ssd130x.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="app.build.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="meadow.config.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/...ies_and_Frameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_Sample/app.build.yaml b/...ies_and_Frameworks/Displays.TextDisplayMenu/Samples/TextDisplayMenu_Sample/app.build.yaml
@@ -0,0 +1,2 @@
+Deploy:
+  NoLink: [ TextDisplayMenu ]
diff --git a/....Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/MicroJson.TypeSafe.cs b/....Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/MicroJson.TypeSafe.cs
@@ -139,7 +139,7 @@
            {
                var table = DeserializeString(json) as Hashtable;

                return DeserializeHashtableToDictionary(table, type)
                    ?? throw new NotSupportedException($"Type '{type.Name}' not supported");
            }
            throw new NotSupportedException($"Type '{type.Name}' not supported");
@@ -278,6 +278,10 @@
                         var dto = DateTimeOffset.Parse(values[v].ToString());
                         prop.SetValue(instance, dto);
                     }
+                    else if (propType == typeof(object))
+                    {
+                        prop.SetValue(instance, DeserializeDynamic(values[v]));
+                    }
                     else
                     {
                         throw new NotSupportedException($"Unable to deserialize type '{propType}'");
@@ -314,4 +318,16 @@
 
         return true;
     }
+
+    private static object? DeserializeDynamic(object jsonValue)
+    {
+        return jsonValue switch
+        {
+            string stringValue => stringValue,
+            double doubleValue => doubleValue,
+            long longValue => longValue,
+            bool boolValue => boolValue,
+            _ => jsonValue,// Directly return the value if it doesn't need special handling
+        };
+    }
 }
diff --git a/...ization.MicroJson/Driver/MicroJson.csproj → ...son/Driver/Serialization.MicroJson.csproj b/...ization.MicroJson/Driver/MicroJson.csproj → ...son/Driver/Serialization.MicroJson.csproj
diff --git a/...ialization.MicroJson/Samples/MicroJson_ArrayList_Sample/MicroJson_ArrayList_Sample.csproj b/...ialization.MicroJson/Samples/MicroJson_ArrayList_Sample/MicroJson_ArrayList_Sample.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Driver\MicroJson.csproj" />
+    <ProjectReference Include="..\..\Driver\Serialization.MicroJson.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/.../Serialization.MicroJson/Samples/MicroJson_Complex_Sample/MicroJson_Complex_Sample.csproj b/.../Serialization.MicroJson/Samples/MicroJson_Complex_Sample/MicroJson_Complex_Sample.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Driver\MicroJson.csproj" />
+    <ProjectReference Include="..\..\Driver\Serialization.MicroJson.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...s_and_Frameworks/Serialization.MicroJson/Samples/MicroJson_Sample/MicroJson_Sample.csproj b/...s_and_Frameworks/Serialization.MicroJson/Samples/MicroJson_Sample/MicroJson_Sample.csproj
@@ -7,6 +7,6 @@
     <EmbeddedResource Include="menu.json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Driver\MicroJson.csproj" />
+    <ProjectReference Include="..\..\Driver\Serialization.MicroJson.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/MicroJson.Unit.Tests.csproj b/...Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/MicroJson.Unit.Tests.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj" />
-    <ProjectReference Include="..\..\Driver\MicroJson.csproj" />
+    <ProjectReference Include="..\..\Driver\Serialization.MicroJson.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Meadow.Foundation.sln b/Source/Meadow.Foundation.sln
@@ -1445,9 +1445,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scd30", "Scd30", "{BAACC3E2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A3EF6DB1-971C-4891-853A-369652E36959}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensors.Environmental.Scd30", "Meadow.Foundation.Peripherals\Sensors.Environmental.Scd30\Driver\Sensors.Environmental.Scd30.csproj", "{EACC5CD9-C3EB-4BB3-A137-C0F950592519}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Environmental.Scd30", "Meadow.Foundation.Peripherals\Sensors.Environmental.Scd30\Driver\Sensors.Environmental.Scd30.csproj", "{EACC5CD9-C3EB-4BB3-A137-C0F950592519}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scd30_Sample", "Meadow.Foundation.Peripherals\Sensors.Environmental.Scd30\Samples\Scd30_Sample\Scd30_Sample.csproj", "{43B00BB5-2F6A-437A-A969-B4ADF2E9F439}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scd30_Sample", "Meadow.Foundation.Peripherals\Sensors.Environmental.Scd30\Samples\Scd30_Sample\Scd30_Sample.csproj", "{43B00BB5-2F6A-437A-A969-B4ADF2E9F439}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pct2075", "Pct2075", "{7471C6BF-1995-4E56-91E9-86DAAA46C386}"
 EndProject
@@ -1473,7 +1473,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpt2046_Sample", "Meadow.Fo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization.MicroJson", "Serialization.MicroJson", "{B9C2605C-AC98-4BF1-8E3F-8F0F23A694C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroJson", "Meadow.Foundation.Libraries_and_Frameworks\Serialization.MicroJson\Driver\MicroJson.csproj", "{D8E5BFC6-EE60-4E2D-BDF9-A4FC349A5F44}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serialization.MicroJson", "Meadow.Foundation.Libraries_and_Frameworks\Serialization.MicroJson\Driver\Serialization.MicroJson.csproj", "{D8E5BFC6-EE60-4E2D-BDF9-A4FC349A5F44}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{9543AB72-69FA-4C42-90F2-56EF19C3D57A}"
 EndProject