From 605a9107468cbb9013840b7c35c042f94b402b4f Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 6 Apr 2021 13:48:38 -0500 Subject: [PATCH] Fix failing download and run The firmware was changed to send status updates at a regular interval which caused the hub state to change back to idle prematurely during download and run. This caused any program more than one or two lines long to fail. Issue: https://github.com/pybricks/support/issues/290 --- src/hub/reducers.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/hub/reducers.ts b/src/hub/reducers.ts index 392114a6..ea66cbc4 100644 --- a/src/hub/reducers.ts +++ b/src/hub/reducers.ts @@ -62,9 +62,16 @@ const runtime: Reducer = ( return state; } case BlePybricksServiceEventActionType.StatusReport: - return action.statusFlags & statusToFlag(Status.UserProgramRunning) - ? HubRuntimeState.Running - : HubRuntimeState.Idle; + if (action.statusFlags & statusToFlag(Status.UserProgramRunning)) { + return HubRuntimeState.Running; + } + // TODO: Status report flags should probably separated from hub runtime state. + // For now, we have this hack to ensure status updates don't interfere with + // download and run + if (state !== HubRuntimeState.Loading && state !== HubRuntimeState.Loaded) { + return HubRuntimeState.Idle; + } + return state; default: return state; }