fix(step-generation): specify intermediate temperature for heater sha…

…kers (#12245) closes RAUT-330
Opentrons · Mar 7, 2023 · 5db2f1d · 5db2f1d
1 parent 0e145ed
commit 5db2f1d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/step-generation/src/__tests__/heaterShaker.test.ts b/step-generation/src/__tests__/heaterShaker.test.ts
@@ -96,13 +96,6 @@ describe('heaterShaker compound command creator', () => {
           moduleId: 'heaterShakerId',
         },
       },
-      {
-        commandType: 'heaterShaker/waitForTemperature',
-        key: expect.any(String),
-        params: {
-          moduleId: 'heaterShakerId',
-        },
-      },
       {
         commandType: 'heaterShaker/setAndWaitForShakeSpeed',
         key: expect.any(String),
@@ -160,13 +153,6 @@ describe('heaterShaker compound command creator', () => {
           moduleId: 'heaterShakerId',
         },
       },
-      {
-        commandType: 'heaterShaker/waitForTemperature',
-        key: expect.any(String),
-        params: {
-          moduleId: 'heaterShakerId',
-        },
-      },
       {
         commandType: 'heaterShaker/setAndWaitForShakeSpeed',
         key: expect.any(String),

diff --git a/step-generation/src/commandCreators/atomic/waitForTemperature.ts b/step-generation/src/commandCreators/atomic/waitForTemperature.ts
@@ -77,6 +77,7 @@ export const waitForTemperature: CommandCreator<WaitForTemperatureArgs> = (
             key: uuid(),
             params: {
               moduleId: module,
+              celsius: temperature,
             },
           },
         ],

diff --git a/step-generation/src/commandCreators/compound/heaterShaker.ts b/step-generation/src/commandCreators/compound/heaterShaker.ts
@@ -11,7 +11,6 @@ import { heaterShakerOpenLatch } from '../atomic/heaterShakerOpenLatch'
 import { heaterShakerCloseLatch } from '../atomic/heaterShakerCloseLatch'
 import { heaterShakerDeactivateHeater } from '../atomic/heaterShakerDeactivateHeater'
 import { setTemperature } from '../atomic/setTemperature'
-import { waitForTemperature } from '../atomic'
 import { heaterShakerStopShake } from '../atomic/heaterShakerStopShake'
 import { heaterShakerSetTargetShakeSpeed } from '../atomic/heaterShakerSetTargetShakeSpeed'
 
@@ -63,14 +62,6 @@ export const heaterShaker: CommandCreator<HeaterShakerArgs> = (
         commandCreatorFnName: 'setTemperature',
       })
     )
-
-    commandCreators.push(
-      curryCommandCreator(waitForTemperature, {
-        module: args.module,
-        temperature: args.targetTemperature,
-        commandCreatorFnName: 'waitForTemperature',
-      })
-    )
   }
 
   if (args.rpm === null) {