Skip to content

Commit ea4e7e0

Browse files
moggieukpedrolamas
andauthored
fix(HappyHare): Fixes sync-feedback buffer state output in visualization and supports analog sensors (#1787)
Signed-off-by: Paul Morgan <moggieuk@hotmail.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com>
1 parent 756be25 commit ea4e7e0

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/components/widgets/mmu/MmuFilamentStatus.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
<g v-if="syncFeedbackActive">
433433
<transition name="fade">
434434
<g
435-
v-if="isSensorTriggered('filament_tension') && isSensorTriggered('filament_compression')"
435+
v-if="syncFeedbackState === SYNC_FEEDBACK_NEUTRAL"
436436
key="neutral"
437437
>
438438
<text
@@ -447,7 +447,7 @@
447447
/>
448448
</g>
449449
<g
450-
v-else-if="isSensorTriggered('filament_tension')"
450+
v-else-if="syncFeedbackState === SYNC_FEEDBACK_TENSION"
451451
key="tension"
452452
>
453453
<text
@@ -466,7 +466,7 @@
466466
/>
467467
</g>
468468
<g
469-
v-else-if="isSensorTriggered('filament_compression')"
469+
v-else-if="syncFeedbackState === SYNC_FEEDBACK_COMPRESSED"
470470
key="compression"
471471
>
472472
<text

src/mixins/mmu.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,14 @@ export default class MmuMixin extends Vue {
370370
return this.mmuState?.sync_drive ?? false
371371
}
372372

373-
// return this.mmuState?.sync_feedback_state
373+
get syncFeedbackState (): string {
374+
return this.mmuState?.sync_feedback_state ?? this.SYNC_FEEDBACK_NONE
375+
}
376+
377+
readonly SYNC_FEEDBACK_COMPRESSED = 'compressed'
378+
readonly SYNC_FEEDBACK_TENSION = 'tension'
379+
readonly SYNC_FEEDBACK_NEUTRAL = 'neutral'
380+
readonly SYNC_FEEDBACK_NONE = ''
374381

375382
get syncFeedbackEnabled (): boolean {
376383
return this.mmuState?.sync_feedback_enabled ?? false

0 commit comments

Comments
 (0)