Merge pull request #72 from WildernessLabs/jorge-updates

Fix Config files
WildernessLabs · Jul 8, 2024 · c28e7a7 · c28e7a7
2 parents b45b854 + 02f9412
commit c28e7a7
Show file tree

Hide file tree

Showing 59 changed files with 657 additions and 536 deletions.
diff --git a/...es/templates/Meadow.StartKit/___safeprojectname___.Core/___safeprojectname___.Core.csproj b/...es/templates/Meadow.StartKit/___safeprojectname___.Core/___safeprojectname___.Core.csproj
@@ -5,12 +5,10 @@
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
-
     <ItemGroup>
         <EmbeddedResource Include="Assets\net-connected.bmp" />
         <EmbeddedResource Include="Assets\net-disconnected.bmp" />
     </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Meadow.Foundation" Version="*" />
         <PackageReference Include="Meadow.Foundation.Graphics.MicroLayout" Version="*" />

diff --git a/...me___.Desktop/___safeprojectname___App.cs → ...feprojectname___.Desktop/App/MeadowApp.cs b/...me___.Desktop/___safeprojectname___App.cs → ...feprojectname___.Desktop/App/MeadowApp.cs
@@ -7,7 +7,7 @@
 
 namespace ___safeprojectname___.DT;
 
-internal class ___safeprojectname___App : App<Desktop>
+internal class MeadowApp : App<Desktop>
 {
     private MainController mainController;
 

diff --git a/....Desktop/___safeprojectname___Hardware.cs → ...Hardware/___safeprojectname___Hardware.cs b/....Desktop/___safeprojectname___Hardware.cs → ...Hardware/___safeprojectname___Hardware.cs
diff --git a/...plates/Meadow.StartKit/___safeprojectname___.Desktop/___safeprojectname___.Desktop.csproj b/...plates/Meadow.StartKit/___safeprojectname___.Desktop/___safeprojectname___.Desktop.csproj
@@ -5,14 +5,17 @@
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="Meadow.Desktop" Version="*" />
         <PackageReference Include="Meadow.Foundation" Version="*" />
         <PackageReference Include="Meadow.Foundation.Graphics.MicroLayout" Version="*" />
         <PackageReference Include="Meadow.Foundation.Sensors.Hid.Keyboard" Version="*" />
     </ItemGroup>
-
+    <ItemGroup>
+        <None Include="app.config.yaml">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\___safeprojectname___.Core\___safeprojectname___.Core.csproj" />
     </ItemGroup>

diff --git a/...Project_Templates/templates/Meadow.StartKit/___safeprojectname___.Desktop/app.config.yaml b/...Project_Templates/templates/Meadow.StartKit/___safeprojectname___.Desktop/app.config.yaml
@@ -12,7 +12,7 @@ Logging:
         Default: Information
 
 # Meadow.Cloud configuration.
-MeadowCloud:
+#MeadowCloud:
 
     # Enable Logging, Events, Command + Control
 #    Enabled: false
diff --git a/...Apps/___safeprojectname___F7FeatherApp.cs → ...jectname___.F7/Apps/MeadowF7FeatherApp.cs b/...Apps/___safeprojectname___F7FeatherApp.cs → ...jectname___.F7/Apps/MeadowF7FeatherApp.cs
@@ -6,7 +6,7 @@
 
 namespace ___safeprojectname___.F7;
 
-public class ___safeprojectname___F7FeatherApp : App<F7FeatherV2>
+public class MeadowF7FeatherApp : App<F7FeatherV2>
 {
     private MainController mainController;
 

diff --git a/...pps/___safeprojectname___ProjectLabApp.cs → ...ectname___.F7/Apps/MeadowProjectLabApp.cs b/...pps/___safeprojectname___ProjectLabApp.cs → ...ectname___.F7/Apps/MeadowProjectLabApp.cs
@@ -6,7 +6,7 @@
 
 namespace ___safeprojectname___.F7;
 
-public class ___safeprojectname___ProjectLabApp : App<F7CoreComputeV2>
+public class MeadowProjectLabApp : App<F7CoreComputeV2>
 {
     private MainController mainController;
 

diff --git a/...lates/templates/Meadow.StartKit/___safeprojectname___.F7/Controllers/NetworkController.cs b/...lates/templates/Meadow.StartKit/___safeprojectname___.F7/Controllers/NetworkController.cs
@@ -13,6 +13,8 @@ internal class NetworkController : INetworkController
 
     public event EventHandler? NetworkStatusChanged;
 
+    private IWiFiNetworkAdapter? wifi;
+
     public NetworkController(F7MicroBase device)
     {
         wifi = device.NetworkAdapters.Primary<IWiFiNetworkAdapter>();
@@ -31,8 +33,6 @@ private void OnNetworkConnected(INetworkAdapter sender, NetworkConnectionEventAr
         // Handle logic when connected.
     }
 
-    private IWiFiNetworkAdapter? wifi;
-
     public bool IsConnected
     {
         get => wifi.IsConnected;

diff --git a/...plates/templates/Meadow.StartKit/___safeprojectname___.F7/___safeprojectname___.F7.csproj b/...plates/templates/Meadow.StartKit/___safeprojectname___.F7/___safeprojectname___.F7.csproj
@@ -7,13 +7,11 @@
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="Meadow.F7" Version="*" />
         <PackageReference Include="Meadow.Foundation" Version="*" />
         <PackageReference Include="Meadow.ProjectLab" Version="*" />
     </ItemGroup>
-
     <ItemGroup>
         <None Update="meadow.config.yaml">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -25,7 +23,6 @@
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\___safeprojectname___.Core\___safeprojectname___.Core.csproj" />
     </ItemGroup>

diff --git a/..._SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/app.config.yaml b/..._SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/app.config.yaml
@@ -21,7 +21,7 @@ Logging:
         Default: Information
 
 # Meadow.Cloud configuration.
-MeadowCloud:
+#MeadowCloud:
 
     # Enable Logging, Events, Command + Control
 #    Enabled: false

diff --git a/...K/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/meadow.config.yaml b/...K/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/meadow.config.yaml
@@ -12,7 +12,7 @@ Device:
 #    SdStorageSupported: true
 
 # Control how the ESP coprocessor will start and operate.
-Coprocessor:
+#Coprocessor:
 
     # Should the ESP32 automatically attempt to connect to an access point at startup?
     # If set to true, wifi.yaml credentials must be stored in the device.
@@ -25,7 +25,7 @@ Coprocessor:
 #    MaximumRetryCount: 7
 
 # Network configuration.
-Network:
+#Network:
 
     # Network Interface (Default value is WiFi with DHCP)
 #    Interfaces:

diff --git a/...SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/wifi.config.yaml b/...SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.F7/wifi.config.yaml
@@ -3,7 +3,7 @@
 # http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/WiFi_Configuration/
 
 # WiFi network credentials
-Credentials:
+#Credentials:
 
     # WiFi SSID
 #    Ssid: YourSSID

diff --git a/...ctname___.RPi/___safeprojectname___App.cs → ...__safeprojectname___.RPi/App/MeadowApp.cs b/...ctname___.RPi/___safeprojectname___App.cs → ...__safeprojectname___.RPi/App/MeadowApp.cs
@@ -7,7 +7,7 @@
 
 namespace ___safeprojectname___.RPi;
 
-internal class ___safeprojectname___App : App<RaspberryPi>
+internal class MeadowApp : App<RaspberryPi>
 {
     private ___safeprojectname___Hardware hardware;
     private MainController mainController;

diff --git a/...e___.RPi/___safeprojectname___Hardware.cs → ...Hardware/___safeprojectname___Hardware.cs b/...e___.RPi/___safeprojectname___Hardware.cs → ...Hardware/___safeprojectname___Hardware.cs
diff --git a/...ates/templates/Meadow.StartKit/___safeprojectname___.RPi/___safeprojectname___.RPi.csproj b/...ates/templates/Meadow.StartKit/___safeprojectname___.RPi/___safeprojectname___.RPi.csproj
@@ -5,13 +5,16 @@
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="Meadow.Foundation" Version="*" />
         <PackageReference Include="Meadow.Foundation.Displays.Gtk" Version="*" />
         <PackageReference Include="Meadow.Linux" Version="*" />
     </ItemGroup>
-
+    <ItemGroup>
+        <None Include="app.config.yaml">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\___safeprojectname___.Core\___safeprojectname___.Core.csproj" />
     </ItemGroup>

diff --git a/...SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.RPi/app.config.yaml b/...SDK/Project_Templates/templates/Meadow.StartKit/___safeprojectname___.RPi/app.config.yaml
@@ -12,7 +12,7 @@ Logging:
         Default: Information
 
 # Meadow.Cloud configuration.
-MeadowCloud:
+#MeadowCloud:
 
     # Enable Logging, Events, Command + Control
 #    Enabled: false
diff --git a/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/app.config.yaml b/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/app.config.yaml
@@ -21,7 +21,7 @@ Logging:
         Default: Information
 
 # Meadow.Cloud configuration.
-MeadowCloud:
+#MeadowCloud:
 
     # Enable Logging, Events, Command + Control
 #    Enabled: false

diff --git a/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/meadow.config.yaml b/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/meadow.config.yaml
@@ -1,62 +1,62 @@
-# Acceptable values for true: true, 1, yes
-# Acceptable values for false: false, 0, no
-
-# Main Device Config
-Device:
-
-    # Name of the device on the network.
-    Name: MeadowDevice
-
-    # Uncomment if SD card hardware present on this hardware 
-    # (e.g., Core-Compute module with SD add-on)? Optional; default value is `false`.
-#    SdStorageSupported: true
-
-# Control how the ESP coprocessor will start and operate.
-Coprocessor:
-
-    # Should the ESP32 automatically attempt to connect to an access point at startup?
-    # If set to true, wifi.yaml credentials must be stored in the device.
-#    AutomaticallyStartNetwork: true
-
-    # Should the ESP32 automatically reconnect to the configured access point?
-#    AutomaticallyReconnect: true
-
-    # Maximum number of retry attempts for connections etc. before an error code is returned.
-#    MaximumRetryCount: 7
-
-# Network configuration.
-Network:
-
-    # Network Interface (Default value is WiFi with DHCP)
-#    Interfaces:
-#        - Name: Ethernet
-#          UseDHCP: false
-#          IPAddress: 192.168.1.60
-#          NetMask: 255.255.255.0
-#          Gateway: 192.168.1.254
-#        - Name: WiFi
-#          UseDHCP: true
-#          IPAddress:
-#          NetMask:
-#          Gateway:
-
-    # Default Interface
-#    DefaultInterface: Wifi
-
-    # Automatically attempt to get the time at startup?
-#    GetNetworkTimeAtStartup: true
-
-    # Time synchronization period in seconds.
-#    NtpRefreshPeriod: 600
-
-    # Name of the NTP servers.
-#    NtpServers:
-#        - 0.pool.ntp.org
-#        - 1.pool.ntp.org
-#        - 2.pool.ntp.org
-#        - 3.pool.ntp.org
-
-    # IP addresses of the DNS servers.
-#    DnsServers:
-#        - 1.1.1.1
+# Acceptable values for true: true, 1, yes
+# Acceptable values for false: false, 0, no
+
+# Main Device Config
+Device:
+
+    # Name of the device on the network.
+    Name: MeadowDevice
+
+    # Uncomment if SD card hardware present on this hardware 
+    # (e.g., Core-Compute module with SD add-on)? Optional; default value is `false`.
+#    SdStorageSupported: true
+
+# Control how the ESP coprocessor will start and operate.
+#Coprocessor:
+
+    # Should the ESP32 automatically attempt to connect to an access point at startup?
+    # If set to true, wifi.yaml credentials must be stored in the device.
+#    AutomaticallyStartNetwork: true
+
+    # Should the ESP32 automatically reconnect to the configured access point?
+#    AutomaticallyReconnect: true
+
+    # Maximum number of retry attempts for connections etc. before an error code is returned.
+#    MaximumRetryCount: 7
+
+# Network configuration.
+#Network:
+
+    # Network Interface (Default value is WiFi with DHCP)
+#    Interfaces:
+#        - Name: Ethernet
+#          UseDHCP: false
+#          IPAddress: 192.168.1.60
+#          NetMask: 255.255.255.0
+#          Gateway: 192.168.1.254
+#        - Name: WiFi
+#          UseDHCP: true
+#          IPAddress:
+#          NetMask:
+#          Gateway:
+
+    # Default Interface
+#    DefaultInterface: Wifi
+
+    # Automatically attempt to get the time at startup?
+#    GetNetworkTimeAtStartup: true
+
+    # Time synchronization period in seconds.
+#    NtpRefreshPeriod: 600
+
+    # Name of the NTP servers.
+#    NtpServers:
+#        - 0.pool.ntp.org
+#        - 1.pool.ntp.org
+#        - 2.pool.ntp.org
+#        - 3.pool.ntp.org
+
+    # IP addresses of the DNS servers.
+#    DnsServers:
+#        - 1.1.1.1
 #        - 8.8.8.8
diff --git a/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/wifi.config.yaml b/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeCSharp/wifi.config.yaml
@@ -1,12 +1,12 @@
-# Uncomment to set the default Wi-Fi credentials. (This file will be processed into secure storage on the ESP32 and then deleted from the device.)
-# To learn more about these config options, including custom application configuration settings, check out the Application Settings Configuration documentation.
-# http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/WiFi_Configuration/
-
-# WiFi network credentials
-Credentials:
-
-    # WiFi SSID
-#    Ssid: YourSSID
-
-    # WiFi Password
+# Uncomment to set the default Wi-Fi credentials. (This file will be processed into secure storage on the ESP32 and then deleted from the device.)
+# To learn more about these config options, including custom application configuration settings, check out the Application Settings Configuration documentation.
+# http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/WiFi_Configuration/
+
+# WiFi network credentials
+#Credentials:
+
+    # WiFi SSID
+#    Ssid: YourSSID
+
+    # WiFi Password
 #    Password: SSIDPassword
diff --git a/...SDK/Project_Templates/templates/MeadowCoreComputeFSharp/MeadowApplication.Template.fsproj b/...SDK/Project_Templates/templates/MeadowCoreComputeFSharp/MeadowApplication.Template.fsproj
@@ -26,4 +26,4 @@
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-</Project>
+</Project>
diff --git a/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeFSharp/app.config.yaml b/Meadow_DotNet_SDK/Project_Templates/templates/MeadowCoreComputeFSharp/app.config.yaml
@@ -21,7 +21,7 @@ Logging:
         Default: Information
 
 # Meadow.Cloud configuration.
-MeadowCloud:
+#MeadowCloud:
 
     # Enable Logging, Events, Command + Control
 #    Enabled: false