Merge branch 'develop' into yesoul-s3

.github/workflows/build.yml

@@ -13,9 +13,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Ensure changelog is updated
-        uses: dangoslen/changelog-enforcer@v3.5.1
+        uses: dangoslen/changelog-enforcer@v3.6.0
       - name: Set up python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           architecture: 'x64'
@@ -31,7 +31,7 @@ jobs:
         with:
           tag: ${{ steps.date.outputs.date }}
           message: "Automatic release ${{ steps.date.outputs.date }}"
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -44,7 +44,7 @@ jobs:
       - name: Install PlatformIO
         run: python -m pip install platformio
       - name: Check pre-commit hooks
-        uses: pre-commit/[email protected].0
+        uses: pre-commit/[email protected].1
       - name: Build firmware
         run: platformio run
       - name: Build filesystem
@@ -53,12 +53,12 @@ jobs:
         run: |
           7z a SmartSpin2kFirmware-${{ steps.date.outputs.date }}.bin.zip ./.pio/build/release/*.bin
       - name: Archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: all-artifacts
           path: SmartSpin2kFirmware-${{ steps.date.outputs.date }}.bin.zip
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: all-artifacts
       - name: Get tag info
@@ -79,7 +79,7 @@ jobs:
             SmartSpin2kFirmware-${{ steps.date.outputs.date }}.bin.zip
               update-changelog:
       - name: Update changelog
-        uses: thomaseizinger/keep-a-changelog-new-release@v1
+        uses: thomaseizinger/keep-a-changelog-new-release@v2
         with:
           version: ${{ steps.date.outputs.date }}
 

.github/workflows/pre-commit.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -19,8 +19,8 @@ jobs:
             hardware:
               - 'Hardware/**'
       - name: Ensure changelog is updated
-        uses: dangoslen/changelog-enforcer@v3.5.1
+        uses: dangoslen/changelog-enforcer@v3.6.0
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
       - name: Check pre-commit hooks
-        uses: pre-commit/[email protected].0
+        uses: pre-commit/[email protected].1

CHANGELOG.md

@@ -5,12 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### Added
-
+- Added pass through shifting in both ERG and SIM mode. 
 ### Changed
 - Updated communications overview picture.
 - Updated kit purchasing links. 
 - MIN_ERG_CADENCE created and changed from 20 to 30.
 - Fixed DNS server in AP mode.
+- Fixed an issue with IC4 and variants not displaying device name in Bluetooth scanner. Fixes #500
+- Switched from using Power Table to a Torque Table for better compensation in cad variations. 
+- added test for invalid Peloton data to keep stepper from running away without resistance information.
+- Fixed a bug with Trainer Day and rapid ERG sending. 
 
 ### Hardware
 - added Yesoul S3
@@ -23,6 +27,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added Yosuda bike. 
 - Added Peloton low profile (for slammed bars) bike mount by @chaloney
 - Updated CAD for the case to work flawlessly with small tweaks to motor height. 
+- Removed some free play in the IC4 insert. 
+- Added IC Bike SE 
+- Removed some free play in the IC4 insert.  
+- Added Bowflex Velocore bike.
+- Added another Y cable picture for Peloton. 
+
 
 ## [23.6.28]
 ### Added

Hardware/Common Assets/Arm/readme.md

@@ -7,13 +7,16 @@ BH Fitness||Any|50
 Body Bike|Body Bike|Any|50 (Steep angle)
 Bowflex|C6|Any|65
 Bowflex|C7|Any|45
+Bowflex|C6|Any|85
+Bowflex|IC Bike SE|Any|100
+Bowflex|Velocore|150
 Echelon|Connect Sport|Any| 105
 HMC|HMC|Any|60mm
 Joroto|X2|Any|20
 LeMond|RevMaster|Any|75
 Peloton|Bike|Any|75 (90 for slammed bars)
 PooBoo|?|Any|60-80
-Schwinn|IC4|Any|65
+Schwinn|IC4|Any|85
 Spinning|L7|Any|20-40 (mount needs to go above SS2k)
 Vortec|Vortec|Any|20
 York|SB300|Any|20-40