Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Merge remote-tracking branch 'pr/195' into r1311

Duarte Santosc8164a9da16b
diff --cc frontend/src/lib/onerm.js
index 4504eaf57,c09b5e67a..5a590e155
--- a/frontend/src/lib/onerm.js
+++ b/frontend/src/lib/onerm.js
@@@ -1,7 -1,7 +1,7 @@@
import { isAssisted } from './exercises.js'
import { isSideSet } from './workout-model.js'
-import { entriesForExercise, metricRowsForEntry } from './history.js'
+import { entriesForExercise, metricRowsForEntry, workoutAt } from './history.js'
- // Estimated one-rep max (issue #18).
+ // Estimated one-rep max (issue #18, extended issue #155).
//
// Deliberately knows nothing about the exercise database: an estimate needs a weight AND a
// rep count, and only reps-mode sets carry both. Cardio sets ({min, speed}) and timed sets
diff --cc frontend/src/lib/recovery.js
index 3fa557f7f,a177e9fb4..c28297c99
--- a/frontend/src/lib/recovery.js
+++ b/frontend/src/lib/recovery.js
@@@ -1,7 -1,7 +1,8 @@@
import { EXIDX } from './exercises.js'
+import { workoutAt } from './history.js'
import { MUSCLES, musclesOf } from './muscles.js'
import { isWarmupRow, dropsOf } from './workout-model.js'
+ import { weightedEstimate, WEIGHTED_REP_CAP } from './onerm.js'
// A "normal" hard session for one muscle, in primary-set equivalents. The saturation curve
// 1 - exp(-stimulus / REF) maps any session size onto [0,1) so volume raises the starting