From d43d00eea94f8e0ed05045c9ab1a5d3341c971dd Mon Sep 17 00:00:00 2001 From: Max McDaniel Date: Thu, 3 Apr 2025 13:40:56 -0600 Subject: [PATCH 1/3] Add `macros.fire()` to an Eos Console --- src/modules/macros.ts | 4 ++++ src/requests/macro-request.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/modules/macros.ts b/src/modules/macros.ts index e639e2e..2d67d80 100644 --- a/src/modules/macros.ts +++ b/src/modules/macros.ts @@ -22,4 +22,8 @@ export class MacrosModule extends RecordTargetModule<'macro'> { async get(targetNumber: TargetNumber): Promise { return this.getEos().request(MacroRequest.get(targetNumber)); } + + async fire(targetNumber: TargetNumber): Promise { + return this.getEos().request(MacroRequest.fire(targetNumber)); + } } diff --git a/src/requests/macro-request.ts b/src/requests/macro-request.ts index 6b6d8af..46f9b92 100644 --- a/src/requests/macro-request.ts +++ b/src/requests/macro-request.ts @@ -15,6 +15,10 @@ export class MacroRequest extends RecordTargetRequest { return new MacroRequest(`/eos/get/macro/${targetNumber}`, 2); } + static fire(targetNumber: TargetNumber) { + return new MacroRequest(`/eos/macro/${targetNumber}/fire`); + } + protected override unpack(messages: OscMessage[]): Macro { return { targetType: 'macro', From 5b913096f5c9f28446a0d8ff0a091479c816bae6 Mon Sep 17 00:00:00 2001 From: Max McDaniel Date: Thu, 3 Apr 2025 13:57:05 -0600 Subject: [PATCH 2/3] Add the ability to fire macros on an EosConsole --- src/modules/macros.ts | 4 ++-- src/requests/macro-request.ts | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/macros.ts b/src/modules/macros.ts index 2d67d80..9fa000f 100644 --- a/src/modules/macros.ts +++ b/src/modules/macros.ts @@ -23,7 +23,7 @@ export class MacrosModule extends RecordTargetModule<'macro'> { return this.getEos().request(MacroRequest.get(targetNumber)); } - async fire(targetNumber: TargetNumber): Promise { - return this.getEos().request(MacroRequest.fire(targetNumber)); + async fire(targetNumber: TargetNumber): Promise { + await this.getEos().sendMessage(`/eos/macros/${targetNumber}/fire`); } } diff --git a/src/requests/macro-request.ts b/src/requests/macro-request.ts index 46f9b92..6b6d8af 100644 --- a/src/requests/macro-request.ts +++ b/src/requests/macro-request.ts @@ -15,10 +15,6 @@ export class MacroRequest extends RecordTargetRequest { return new MacroRequest(`/eos/get/macro/${targetNumber}`, 2); } - static fire(targetNumber: TargetNumber) { - return new MacroRequest(`/eos/macro/${targetNumber}/fire`); - } - protected override unpack(messages: OscMessage[]): Macro { return { targetType: 'macro', From efef29f7116ae451699c7ce6b98dcb3338cb05bf Mon Sep 17 00:00:00 2001 From: Max McDaniel Date: Thu, 3 Apr 2025 14:00:25 -0600 Subject: [PATCH 3/3] Fix typo in OSC message --- src/modules/macros.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/macros.ts b/src/modules/macros.ts index 9fa000f..b7ad1f3 100644 --- a/src/modules/macros.ts +++ b/src/modules/macros.ts @@ -24,6 +24,6 @@ export class MacrosModule extends RecordTargetModule<'macro'> { } async fire(targetNumber: TargetNumber): Promise { - await this.getEos().sendMessage(`/eos/macros/${targetNumber}/fire`); + await this.getEos().sendMessage(`/eos/macro/${targetNumber}/fire`); } }