Merge branch 'develop' into Sunny_B1805

doudar · Dec 7, 2024 · 656d657 · 656d657
2 parents 34bcf0f + 8e747c6
commit 656d657
Show file tree

Hide file tree

Showing 66 changed files with 170,519 additions and 7,879 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Hardware
 
+## [24.11.25]
+
+### Added
+
+### Changed
+
+### Hardware
+- Added rubber band holder to Peloton mount.
+- Decreased Peloton insert size slightly. 
+- Added rubber band holder to IC4/C6 mount.
+- Added Sunny B1805 Bike. 
+
+## [24.11.16]
+
+### Added
+
+### Changed
+
+### Hardware
+- Decreased tolerances around bearings and gears.
+
 
 ## [24.11.10]
 
@@ -21,6 +42,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Multiple Homing refinements.
 - Working with resistance mode on QZ & Peloton
+- PowerTable Import via Custom Characteristic fixed. 
+- Check for cadence (before homing) so that we don't home when nobody is around.
+- Don't depower the stepper if there is cadence. 
 
 ### Hardware
 - Added Sunny B1805 insert. 

diff --git a/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.AD_PRT b/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.AD_PRT
diff --git a/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.step b/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.step
diff --git a/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.stp b/Hardware/Common Assets/Bike Mount/CAD/IC4 Mount.stp
diff --git a/Hardware/Common Assets/Bike Mount/CAD/Peloton.f3d b/Hardware/Common Assets/Bike Mount/CAD/Peloton.f3d
diff --git a/Hardware/Common Assets/Bike Mount/IC4 Mount.stl b/Hardware/Common Assets/Bike Mount/IC4 Mount.stl
diff --git a/Hardware/Common Assets/Bike Mount/IC4 Mount.stp b/Hardware/Common Assets/Bike Mount/IC4 Mount.stp
diff --git a/Hardware/Common Assets/Bike Mount/Peloton.step b/Hardware/Common Assets/Bike Mount/Peloton.step
diff --git a/Hardware/Common Assets/Bike Mount/Peloton.stl b/Hardware/Common Assets/Bike Mount/Peloton.stl
diff --git a/Hardware/Common Assets/Gears/CAD/Spur gear 1M 40T Hex.SLDPRT b/Hardware/Common Assets/Gears/CAD/Spur gear 1M 40T Hex.SLDPRT
diff --git a/Hardware/Common Assets/Gears/SS2K 40T Mod1 Spur Gear.STEP b/Hardware/Common Assets/Gears/SS2K 40T Mod1 Spur Gear.STEP
diff --git a/Hardware/Common Assets/Inserts/Peloton_62.5mm.stl b/Hardware/Common Assets/Inserts/Peloton_62.5mm.stl
diff --git a/Hardware/Common Assets/Inserts/Peloton_7_flat.STEP b/Hardware/Common Assets/Inserts/Peloton_7_flat.STEP
diff --git a/Hardware/Common Assets/Inserts/Solidworks_Designs/Peloton_60mm.SLDPRT b/Hardware/Common Assets/Inserts/Solidworks_Designs/Peloton_60mm.SLDPRT
diff --git a/Hardware/Common Assets/Inserts/Solidworks_Designs/Peloton_7_flat.SLDPRT b/Hardware/Common Assets/Inserts/Solidworks_Designs/Peloton_7_flat.SLDPRT
diff --git a/Hardware/Common Assets/KnobCups/CAD/Knob_Cup_Large_HEX.SLDPRT b/Hardware/Common Assets/KnobCups/CAD/Knob_Cup_Large_HEX.SLDPRT
diff --git a/Hardware/Common Assets/KnobCups/CAD/Knob_Cup_Large_HEX.STEP b/Hardware/Common Assets/KnobCups/CAD/Knob_Cup_Large_HEX.STEP
diff --git a/Hardware/Common Assets/KnobCups/Knob_Cup_Large_HEX.STEP b/Hardware/Common Assets/KnobCups/Knob_Cup_Large_HEX.STEP
diff --git a/Hardware/Common Assets/KnobCups/Knob_Cup_Large_HEX.STL b/Hardware/Common Assets/KnobCups/Knob_Cup_Large_HEX.STL
diff --git a/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Left.STEP b/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Left.STEP
diff --git a/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Left_no_Logo.STEP b/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Left_no_Logo.STEP
diff --git a/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Right.STEP b/Hardware/V3 - Integrated PCB/Case/Body_Drawing_Right.STEP