Skip to content

Commit

Permalink
Merge pull request #76 from WildernessLabs/v1.11.0
Browse files Browse the repository at this point in the history
Release 1.11.0
  • Loading branch information
ctacke authored May 1, 2024
2 parents 496bdc7 + 6de31b7 commit bf6d8cb
Show file tree
Hide file tree
Showing 41 changed files with 1,904 additions and 1,106 deletions.
1 change: 1 addition & 0 deletions .github/workflows/develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Develop Build
on:
workflow_dispatch:
pull_request:
branches: [ develop ]
push:
branches: [ develop ]

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 9 additions & 5 deletions Docs/Clima.Pro/Assembly_Instructions/Weather_Sensors/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,27 @@ Next, one of the tube ends has a small rounded gap and a hole right below it. In

![](clima_support.jpg)

On the right end of the support piece you can put the anemometer. It has three possible positions to connect it to the base, keep rotating it until you see the the hole to insert another long screw and bolt to secure it to the support.
On the right end of the support piece you can put the anemometer. It has three possible positions to connect it to the base, keep rotating it until you see the the hole to insert another long screw and bolt to secure it to the support. You can thread the

![](clima_anemometer.jpg)

On the left side of the support you can place the wind vane. Like we did with the Anemometer, make sure to position it correctly to use the third and final screw and bolt to secure the sensor to the support.
On the left side of the support you can place the wind vane. Like we did with the anemometer, make sure to position it correctly to use the third and final screw and bolt to secure the sensor to the support.

![](clima_windvane.jpg)

Under the wind vane you can see a small connection port. Take the short cable of the anemometer and loop it around the support piece as we make our way to the wind vane and connect the end to the port underneath.
Take the short cable from the anemometer and carefully feed/clip it through the provided cable tidies until it reaches the wind vane.

![](clima_anemometer_cabling_to_wind_vane.jpg)

Under the wind vane you can see a small connection port. Connect the end of the anemometer into the wind vane port underneath.

![](clima_windvane_connection.jpg)

At this point, you should have something like this:

![](clima_windvane_anemometer.jpg)

About an inch lower of the tube end where the suport piece is, grab the rain meter support piece and secure it on the tube, making sure its perpendicular to the other two sensors.
About an inch/2.54cm below the tube end, where the support piece is, use the rain meter support piece and secure it onto the tube, making sure it is perpendicular to the other two sensors.

![](clima_rainmeter_support.jpg)

Expand All @@ -40,7 +44,7 @@ Take the rain meter and place it on the support piece and secure it with the las

![](clima_rainmeter_under_2.jpg)

About one inch above where the steel tubes connect, mount the Clima Meadow module on the tube.
About one inch/2.54cm above where the 2 steel tubes connect, mount the Clima Meadow module onto the tube.

![](clima_meadow.jpg)

Expand Down
62 changes: 47 additions & 15 deletions Docs/Clima.Pro/Deploy_Instructions/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,60 @@

### Step 1. - Prepare Dev Environment

* **Download and install [Visual Studio](https://visualstudio.microsoft.com/)** - For either Windows or macOS. Community edition will work fine.
* **Download and install [Visual Studio](https://visualstudio.microsoft.com/) or [Visual Studio Code](https://code.visualstudio.com/)** - For either Windows or macOS. Community edition will work fine.

* **Follow the [Meadow.OS Deployment Guide](http://developer.wildernesslabs.co/Meadow/Getting_Started/Deploying_Meadow/)**:
* Install Meadow.CLI
* Download the latest Meadow.OS and flash it to the Meadow board.
* The above guide should show you how to install `Meadow.CLI`
* Walk your through out to download the latest Meadow.OS and flash it to the Clima Meadow board.

* **Follow the [`Hello, Meadow` Guide](http://developer.wildernesslabs.co/Meadow/Getting_Started/Hello_World/)**:
* Install the Meadow Visual Studio Extension(s).
* Create and deploy the Meadow template application to ensure everthing is setup correctly.
* The above guid should show you to Install the Visual Studio and VSCode Extension(s) for Meadow.

### Expected Development version stack (RC-1)
At this point, you should have the following versions on your dev machine and Meadow:
* Meadow.CLI - v.0.90.0
* VS Tools for Meadow - v0.90.0
At this point, you should have the following versions on your development machine
* Meadow.CLI - `v2.x`
* Visual Studio
* MacOS - `v1.9.x`
* Windows - `v1.9.x`
* VS Code - `v1.9.x`

* Meadow
* Meadow.OS - v0.9.0.2
* Mono Runtime - v0.9.0.2
* ESP32 Coprocessor - v0.9.0.2

And if you run this command line: `meadow device info`, you should see something similar to:
```
Meadow by Wilderness Labs
Board Information
Model: F7Micro
Hardware version: F7CoreComputeV2
Device name: MeadowF7
Hardware Information
Processor type: STM32F777IIK6
ID: [Specific ID for your Meadow]
Serial number: [Specific Serial No. for your Meadow]
Coprocessor type: ESP32
MAC Address -
WiFi: [Specific Mac Address for your Meadow]
Firmware Versions
OS: 1.10.0.2
Runtime: 1.10.0.2
Coprocessor: 1.10.0.1
Protocol: 8
```

### Step 2. - Deploy the Clima App

* **Clone the Clima Repo** - [Clone](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop) the [Clima(this) repository](https://github.com/wildernesslabs/Clima) locally.
* **Open the Clima VS Solution** - Navigate to the `source` folder and open the `Clima.sln` file in Visual Studio, or the `source` folder in VS Code.
* **Add WiFi Credentials** - Edit the `secrets.cs` file to have the correct credentials for the WiFi your Clima will connect to.
* **Deploy the MeadowClimaProKit App**
**Clone the Clima Repo**:

[Clone](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop) the [Clima(this) repository](https://github.com/wildernesslabs/Clima) locally.

**Open the Clima VS Solution**:

With either Visual Studio or VSCode running, navigate to the `source` folder and open the `Meadow.Clima.sln`.

**Add WiFi Credentials**:

Edit the `secrets.cs` file to have the correct credentials for the WiFi your Clima will connect to.

**Deploy the MeadowClimaProKit App**
Binary file not shown.
Binary file added Industrial_Design/v4/Clima4_Enclosure_Bottom.stl
Binary file not shown.
Binary file added Industrial_Design/v4/Clima4_Enclosure_Top.stl
Binary file not shown.
231 changes: 231 additions & 0 deletions Source/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
# Remove the line below if you want to inherit .editorconfig settings from higher directories
root = true

# C# files
[*.cs]

#### Core EditorConfig Options ####

# Indentation and spacing
indent_size = 4
indent_style = space
tab_width = 4

# New line preferences
end_of_line = crlf
insert_final_newline = false

#### .NET Coding Conventions ####

# Organize usings
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false
file_header_template = unset

# this. and Me. preferences
dotnet_style_qualification_for_event = false
dotnet_style_qualification_for_field = false
dotnet_style_qualification_for_method = false
dotnet_style_qualification_for_property = false

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true
dotnet_style_predefined_type_for_member_access = true

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity

# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members

# Expression-level preferences
dotnet_style_coalesce_expression = true
dotnet_style_collection_initializer = true
dotnet_style_explicit_tuple_names = true
dotnet_style_namespace_match_folder = true
dotnet_style_null_propagation = true
dotnet_style_object_initializer = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true
dotnet_style_prefer_collection_expression = true
dotnet_style_prefer_compound_assignment = true
dotnet_style_prefer_conditional_expression_over_assignment = true
dotnet_style_prefer_conditional_expression_over_return = true
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
dotnet_style_prefer_inferred_anonymous_type_member_names = true
dotnet_style_prefer_inferred_tuple_names = true
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
dotnet_style_prefer_simplified_boolean_expressions = true
dotnet_style_prefer_simplified_interpolation = true

# Field preferences
dotnet_style_readonly_field = true

# Parameter preferences
dotnet_code_quality_unused_parameters = all

# Suppression preferences
dotnet_remove_unnecessary_suppression_exclusions = none

# New line preferences
dotnet_style_allow_multiple_blank_lines_experimental = false
dotnet_style_allow_statement_immediately_after_block_experimental = false

#### C# Coding Conventions ####

# var preferences
csharp_style_var_elsewhere = true
csharp_style_var_for_built_in_types = true
csharp_style_var_when_type_is_apparent = true

# Expression-bodied members
csharp_style_expression_bodied_accessors = true
csharp_style_expression_bodied_constructors = false
csharp_style_expression_bodied_indexers = true
csharp_style_expression_bodied_lambdas = true
csharp_style_expression_bodied_local_functions = false
csharp_style_expression_bodied_methods = false
csharp_style_expression_bodied_operators = false
csharp_style_expression_bodied_properties = true

# Pattern matching preferences
csharp_style_pattern_matching_over_as_with_null_check = true
csharp_style_pattern_matching_over_is_with_cast_check = true
csharp_style_prefer_extended_property_pattern = true
csharp_style_prefer_not_pattern = true
csharp_style_prefer_pattern_matching = false
csharp_style_prefer_switch_expression = true

# Null-checking preferences
csharp_style_conditional_delegate_call = true

# Modifier preferences
csharp_prefer_static_local_function = true
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
csharp_style_prefer_readonly_struct = true
csharp_style_prefer_readonly_struct_member = true

# Code-block preferences
csharp_prefer_braces = true
csharp_prefer_simple_using_statement = true
csharp_style_namespace_declarations = file_scoped
csharp_style_prefer_method_group_conversion = true
csharp_style_prefer_primary_constructors = true
csharp_style_prefer_top_level_statements = false

# Expression-level preferences
csharp_prefer_simple_default_expression = true
csharp_style_deconstructed_variable_declaration = false
csharp_style_implicit_object_creation_when_type_is_apparent = true
csharp_style_inlined_variable_declaration = true
csharp_style_prefer_index_operator = true
csharp_style_prefer_local_over_anonymous_function = true
csharp_style_prefer_null_check_over_type_check = true
csharp_style_prefer_range_operator = true
csharp_style_prefer_tuple_swap = true
csharp_style_prefer_utf8_string_literals = true
csharp_style_throw_expression = true
csharp_style_unused_value_assignment_preference = discard_variable
csharp_style_unused_value_expression_statement_preference = discard_variable

# 'using' directive preferences
csharp_using_directive_placement = outside_namespace

# New line preferences
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
csharp_style_allow_embedded_statements_on_same_line_experimental = true

#### C# Formatting Rules ####

# New line preferences
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_labels = one_less_than_current
csharp_indent_switch_labels = true

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# Wrapping preferences
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true

#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<EmbeddedResource Include="img_wifi_connecting.jpg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.10.2" />
<PackageReference Include="Meadow.F7" Version="1.10.2" />
<PackageReference Include="Meadow.Foundation" Version="1.10.2" />
<PackageReference Include="Meadow.Foundation.Displays.TextDisplayMenu" Version="1.10.2" />
<PackageReference Include="Meadow.Foundation.Displays.TftSpi" Version="1.10.2" />
<PackageReference Include="SimpleJpegDecoder" Version="0.4.0" />
<PackageReference Include="sqlite-net-static" Version="1.8.116" />
<PackageReference Include="System.Text.Json" Version="*" />
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.11.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<PackageReference Include="Meadow.Foundation" Version="1.11.0" />
<PackageReference Include="Meadow.Foundation.Displays.TextDisplayMenu" Version="1.11.0" />
<PackageReference Include="Meadow.Foundation.Displays.TftSpi" Version="1.11.0" />
<PackageReference Include="SimpleJpegDecoder" Version="0.4.0" />
<PackageReference Include="sqlite-net-static" Version="1.8.116" />
<PackageReference Include="System.Text.Json" Version="*" />
</ItemGroup>
<ItemGroup>
<None Update="meadow.config.yaml">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<LangVersion>9.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.10.2" />
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.11.0" />
<ProjectReference Include="..\..\Meadow.Clima\Meadow.Clima.csproj" />
<PackageReference Include="System.Text.Json" Version="*" />
<PackageReference Include="sqlite-net-static" Version="*" />
Expand Down
2 changes: 2 additions & 0 deletions Source/Clima_Demo/Clima_Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<OutputType>Library</OutputType>
<AssemblyName>App</AssemblyName>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Meadow.Clima\Meadow.Clima.csproj" />
Expand Down
Loading

0 comments on commit bf6d8cb

Please sign in to comment.