Skip to content

Commit

Permalink
Merge pull request #546 from doudar/wire_shelf
Browse files Browse the repository at this point in the history
Moved wire guard up 1mm
Fixed a bug in ERG Mode
  • Loading branch information
doudar committed Apr 28, 2024
2 parents b2d7a88 + e0d98ce commit 26e08dc
Show file tree
Hide file tree
Showing 10 changed files with 77,231 additions and 77,209 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Increased the default incline multiplier to 5.
- Added more robust activity monitoring and reboot every 30 minutes if there is no activity.
- Updated all references of SmartSkin2K to SmartSpin2k for consistency.
- Fixed bug where BT scanner "Loading" wouldn't disappear if "NONE" and "NONE" were selected.
- Fixed bug where BT scanner "Loading" wouldn't disappear if "NONE" and "NONE" were selected.
- Fixed Bug where ERG setpoint state wasn't going to the positive control loop correctly.

### Hardware
- added Yesoul S3.
Expand All @@ -47,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed some free play in the IC4 insert.
- Added Bowflex Velocore bike.
- Added another Y cable picture for Peloton.
- Moved wire guard up 1 mm.


## [23.6.28]
Expand Down
Binary file modified Hardware/V3 - Integrated PCB/Case/Case/Body_Left.STL
Binary file not shown.
Binary file modified Hardware/V3 - Integrated PCB/Case/Case/Body_Right.STL
Binary file not shown.
Binary file modified Hardware/V3 - Integrated PCB/Case/Case/CAD/Assem1_hex.SLDASM
Binary file not shown.
Binary file modified Hardware/V3 - Integrated PCB/Case/Case/CAD/Body_Drawing.SLDPRT
Binary file not shown.
Binary file not shown.
75,784 changes: 37,902 additions & 37,882 deletions Hardware/V3 - Integrated PCB/Case/Case/CAD/Body_Drawing_Left.STEP

Large diffs are not rendered by default.

Binary file not shown.
78,650 changes: 39,325 additions & 39,325 deletions Hardware/V3 - Integrated PCB/Case/Case/CAD/Body_Drawing_Right.STEP

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ERG_Mode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ void ErgMode::computeErg() {
}

// SetPoint changed
if (abs(this->setPoint - newWatts.getTarget() > 20)) {
if (abs(this->setPoint - newWatts.getTarget()) > 20) {
_setPointChangeState(newCadence, newWatts);
return;
}
Expand Down

0 comments on commit 26e08dc

Please sign in to comment.