Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Config files #72

Merged
merged 11 commits into from
Jul 8, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -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="*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace ___safeprojectname___.DT;

internal class ___safeprojectname___App : App<Desktop>
internal class MeadowApp : App<Desktop>
{
private MainController mainController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Logging:
Default: Information

# Meadow.Cloud configuration.
MeadowCloud:
#MeadowCloud:

# Enable Logging, Events, Command + Control
# Enabled: false
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace ___safeprojectname___.F7;

public class ___safeprojectname___F7FeatherApp : App<F7FeatherV2>
public class MeadowF7FeatherApp : App<F7FeatherV2>
{
private MainController mainController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace ___safeprojectname___.F7;

public class ___safeprojectname___ProjectLabApp : App<F7CoreComputeV2>
public class MeadowProjectLabApp : App<F7CoreComputeV2>
{
private MainController mainController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ internal class NetworkController : INetworkController

public event EventHandler? NetworkStatusChanged;

private IWiFiNetworkAdapter? wifi;

public NetworkController(F7MicroBase device)
{
wifi = device.NetworkAdapters.Primary<IWiFiNetworkAdapter>();
Expand All @@ -31,8 +33,6 @@ private void OnNetworkConnected(INetworkAdapter sender, NetworkConnectionEventAr
// Handle logic when connected.
}

private IWiFiNetworkAdapter? wifi;

public bool IsConnected
{
get => wifi.IsConnected;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -25,7 +23,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\___safeprojectname___.Core\___safeprojectname___.Core.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Logging:
Default: Information

# Meadow.Cloud configuration.
MeadowCloud:
#MeadowCloud:

# Enable Logging, Events, Command + Control
# Enabled: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -25,7 +25,7 @@ Coprocessor:
# MaximumRetryCount: 7

# Network configuration.
Network:
#Network:

# Network Interface (Default value is WiFi with DHCP)
# Interfaces:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/WiFi_Configuration/

# WiFi network credentials
Credentials:
#Credentials:

# WiFi SSID
# Ssid: YourSSID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Logging:
Default: Information

# Meadow.Cloud configuration.
MeadowCloud:
#MeadowCloud:

# Enable Logging, Events, Command + Control
# Enabled: false
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Logging:
Default: Information

# Meadow.Cloud configuration.
MeadowCloud:
#MeadowCloud:

# Enable Logging, Events, Command + Control
# Enabled: false
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Logging:
Default: Information

# Meadow.Cloud configuration.
MeadowCloud:
#MeadowCloud:

# Enable Logging, Events, Command + Control
# Enabled: false
Expand Down
Loading
Loading