Skip to content

Commit

Permalink
Merge pull request doudar#606 from doudar/Dmasun
Browse files Browse the repository at this point in the history
Added Dmasun
  • Loading branch information
doudar authored Jan 12, 2025
2 parents c85fb30 + 89f9792 commit e7b3094
Show file tree
Hide file tree
Showing 18 changed files with 15,386 additions and 6,157 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Hardware


## [25.1.12]

### Added

### Changed

### Hardware


## [25.1.10]

### Added
Expand All @@ -31,6 +40,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

### Hardware
- Added Dmasun bike
- Added Equinox Soul Cycle
- Added Sole SB700
- added bike mount for Joroto X2 and any other bike with hex shape front tube
- replaced old inserts for Joroto X2 with new 60.5

Expand Down
3 changes: 3 additions & 0 deletions Hardware/Common Assets/Arm/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Bowflex|C7|Any|45
Bowflex|C6|Any|85
Bowflex|IC Bike SE|Any|100
Bowflex|Velocore|150
Dmasun|Any|Any|55
Echelon|Connect Sport|Any| 105
HMC|HMC|Any|60mm
JLL|IC400|Any|35-45
Expand All @@ -20,6 +21,8 @@ Peloton|Bike|Any|75 (90 for slammed bars)
PooBoo|?|Any|60-80
Schwinn|IC4|Any|85
Spinning|L7|Any|20-40 (mount needs to go above SS2k)
SOLE|SB700|ANY|20-40ra
Soulcycle|Equinox|Any|155-165
Stryde|Any|Any|110-120
Sunny|B1805|Any|35
Vortec|Vortec|Any|20
Expand Down
Binary file modified Hardware/Common Assets/Gears/CAD/SS2K 40T Mod1 Spur Gear.SLDPRT
Binary file not shown.
Binary file modified Hardware/Common Assets/Gears/CAD/Spur gear 1M 40T Hex.SLDPRT
Binary file not shown.
12,314 changes: 6,157 additions & 6,157 deletions Hardware/Common Assets/Gears/SS2K 40T Mod1 Spur Gear.STEP

Large diffs are not rendered by default.

1,894 changes: 1,894 additions & 0 deletions Hardware/Common Assets/Gears/Spur gear 1M 11T.STEP

Large diffs are not rendered by default.

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.
Binary file not shown.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,693 changes: 2,693 additions & 0 deletions Hardware/Common Assets/Inserts/Dmasun.STEP

Large diffs are not rendered by default.

2,123 changes: 2,123 additions & 0 deletions Hardware/Common Assets/Inserts/Equinox_Soul_Cycle.STEP

Large diffs are not rendered by default.

2,504 changes: 2,504 additions & 0 deletions Hardware/Common Assets/Inserts/Sole SB700.STEP

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit e7b3094

Please sign in to comment.