Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't reset watt when starting #404

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −14
Draft

Don't reset watt when starting #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86207e7
remove unused syncResistanceIfActive
morteako Oct 12, 2024
f44c1af
skip resetting resistance when starting without workout
morteako Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions apps/frontend/src/context/ActiveWorkoutContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export const ActiveWorkoutContext = React.createContext<{
setActiveFtp: (ftp: number) => void;
changeActivePart: (partNumber: number, addLap: () => void) => void;
syncResistance: () => void;
syncResistanceIfActive: () => void;
} | null>(null);

interface IncreasePartElapsedTimeAction {
Expand Down Expand Up @@ -170,7 +169,9 @@ export const ActiveWorkoutContextProvider = ({
const status = activeWorkout.status;
const workout = activeWorkout.workout;

if (status !== 'active' || !workout) {
if (status === 'active' && !workout) {
return;
} else if (status !== 'active' || !workout) {
setResistance(0);
} else {
const activeWorkoutPart = workout.parts[activeWorkout.activePart];
Expand Down Expand Up @@ -205,17 +206,6 @@ export const ActiveWorkoutContextProvider = ({
dispatchActiveWorkoutAction({ type: 'PAUSE', setResistance, activeFtp });
};

const syncResistanceIfActive = () => {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unused

if (!isConnected) return;

const { status, workout } = activeWorkout;
if (status !== 'active' || !workout) {
setResistance(0);
} else {
syncResistance();
}
};

const syncResistance = () => {
const { workout } = activeWorkout;
if (!isConnected || !workout) return;
Expand Down Expand Up @@ -266,7 +256,6 @@ export const ActiveWorkoutContextProvider = ({
setActiveFtp,
changeActivePart,
syncResistance,
syncResistanceIfActive,
}}
>
{children}
Expand Down