Merge branch 'main' into matrix8x8-ht16k33

azure-pipelines.yml

@@ -54,18 +54,6 @@ stages:
         /p:BuildPackages=true
       displayName: Build
 
-    - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -warnaserror:0 -ci
-        eng/sendToHelix.proj
-        /t:Test
-        /p:TestOS=Windows_NT
-        /p:Configuration=$(BuildConfiguration)
-        /p:HelixBuild=$(Build.BuildNumber)
-        /bl:$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/SendToHelix.binlog
-      displayName: Run Helix Tests
-      condition: eq(variables['build.reason'], 'PullRequest')
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-
     - task: PublishBuildArtifacts@1
       displayName: Publish Build logs
       condition: always()

eng/sendToHelix.proj

@@ -30,25 +30,6 @@
     <HelixTargetQueue Include="$(HelixTargetQueue)"/>
   </ItemGroup>
 
-  <!-- Windows-specific settings -->
-  <ItemGroup Condition="'$(TestOS)' == 'Windows_NT'">
-    <!-- Xunit project to test -->
-    <XUnitProject Include="..\src\System.Device.Gpio.Tests\System.Device.Gpio.Tests.csproj">
-      <TargetFramework>netcoreapp3.1</TargetFramework>
-      <RuntimeTargetFramework>netcoreapp2.0</RuntimeTargetFramework>
-    </XUnitProject>
-    <!-- Target queues -->
-    <HelixTargetQueue Condition="'$(HelixAccessToken)' != ''" Include="Windows.10.Arm32.IoT"/>
-    <HelixTargetQueue Condition="'$(HelixAccessToken)' == ''" Include="Windows.10.Arm32.IoT.Open"/>
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(TestOS)' == 'Windows_NT'">
-    <DotNetCliRuntime>win-arm</DotNetCliRuntime>
-    <XUnitArguments>$(XUnitArguments) -notrait "SkipOnTestRun=Windows_NT"</XUnitArguments>
-    <!-- Issue: https://github.com/dotnet/iot/issues/934 -->
-    <XUnitArguments>$(XUnitArguments) -notrait feature=pwm</XUnitArguments>
-  </PropertyGroup>
-
   <!-- Linux-specific settings -->
   <ItemGroup Condition="'$(TestOS)' == 'Unix'">
     <!-- Xunit project to test -->

src/System.Device.Gpio/System/Device/Gpio/RaspberryBoardInfo.cs

@@ -164,7 +164,7 @@ public Model BoardModel
         0x20E0 => Model.RaspberryPi3APlus,
         0x20A0 or 0x2100 => Model.RaspberryPiComputeModule3,
         0x3111 or 0x3112 or 0x3114 or 0x3115 => Model.RaspberryPi4,
-        0x3140 => Model.RaspberryPiComputeModule4,
+        0x3140 or 0x3141 => Model.RaspberryPiComputeModule4,
         0x3130 => Model.RaspberryPi400,
         _ => Model.Unknown,
     };

src/devices/Mcp25xxx/FrequencyAndSpeed.cs

@@ -0,0 +1,176 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Iot.Device.Mcp25xxx
+{
+    /// <summary>
+    /// Standard Frequency and Speed for CAN bus
+    /// </summary>
+    public enum FrequencyAndSpeed
+    {
+        /// <summary>
+        /// 8MHz 1000kBPS
+        /// </summary>
+        _8MHz1000KBps,
+
+        /// <summary>
+        /// 8MHz 500kBPS
+        /// </summary>
+        _8MHz500KBps,
+
+        /// <summary>
+        /// 8MHz 250kBPS
+        /// </summary>
+        _8MHz250KBps,
+
+        /// <summary>
+        /// 8MHz 200kBPS
+        /// </summary>
+        _8MHz200KBps,
+
+        /// <summary>
+        /// 8MHz 125kBPS
+        /// </summary>
+        _8MHz125KBps,
+
+        /// <summary>
+        /// 8MHz 100kBPS
+        /// </summary>
+        _8MHz100KBps,
+
+        /// <summary>
+        /// 8MHz 80kBPS
+        /// </summary>
+        _8MHz80KBps,
+
+        /// <summary>
+        /// 8MHz 50kBPS
+        /// </summary>
+        _8MHz50KBps,
+
+        /// <summary>
+        /// 8MHz 40kBPS
+        /// </summary>
+        _8MHz40KBps,
+
+        /// <summary>
+        /// 8MHz 20kBPS
+        /// </summary>
+        _8MHz20KBps,
+
+        /// <summary>
+        /// 8MHz 10kBPS
+        /// </summary>
+        _8MHz10KBps,
+
+        /// <summary>
+        /// 8MHz 5kBPS
+        /// </summary>
+        _8MHz5KBps,
+
+        /// <summary>
+        /// 16MHz 1000kBPS
+        /// </summary>
+        _16MHz1000KBps,
+
+        /// <summary>
+        /// 16MHz 500kBPS
+        /// </summary>
+        _16MHz500KBps,
+
+        /// <summary>
+        /// 16MHz 250kBPS
+        /// </summary>
+        _16MHz250KBps,
+
+        /// <summary>
+        /// 16MHz 200kBPS
+        /// </summary>
+        _16MHz200KBps,
+
+        /// <summary>
+        /// 16MHz 125kBPS
+        /// </summary>
+        _16MHz125KBps,
+
+        /// <summary>
+        /// 16MHz 100kBPS
+        /// </summary>
+        _16MHz100KBps,
+
+        /// <summary>
+        /// 16MHz 80kBPS
+        /// </summary>
+        _16MHz80KBps,
+
+        /// <summary>
+        /// 16MHz 50kBPS
+        /// </summary>
+        _16MHz50KBps,
+
+        /// <summary>
+        /// 16MHz 40kBPS
+        /// </summary>
+        _16MHz40KBps,
+
+        /// <summary>
+        /// 16MHz 20kBPS
+        /// </summary>
+        _16MHz20KBps,
+
+        /// <summary>
+        /// 16MHz 10kBPS
+        /// </summary>
+        _16MHz10KBps,
+
+        /// <summary>
+        /// 16MHz 5kBPS
+        /// </summary>
+        _16MHz5KBps,
+
+        /// <summary>
+        /// 20MHz 1000kBPS
+        /// </summary>
+        _20MHz1000KBps,
+
+        /// <summary>
+        /// 20MHz 500kBPS
+        /// </summary>
+        _20MHz500KBps,
+
+        /// <summary>
+        /// 20MHz 250kBPS
+        /// </summary>
+        _20MHz250KBps,
+
+        /// <summary>
+        /// 20MHz 200kBPS
+        /// </summary>
+        _20MHz200KBps,
+
+        /// <summary>
+        /// 20MHz 125kBPS
+        /// </summary>
+        _20MHz125KBps,
+
+        /// <summary>
+        /// 20MHz 100kBPS
+        /// </summary>
+        _20MHz100KBps,
+
+        /// <summary>
+        /// 20MHz 80kBPS
+        /// </summary>
+        _20MHz80KBps,
+
+        /// <summary>
+        /// 20MHz 50kBPS
+        /// </summary>
+        _20MHz50KBps,
+
+        /// <summary>
+        /// 20MHz 40kBPS
+        /// </summary>
+        _20MHz40KBps,
+    }
+}