Skip to content

Commit

Permalink
Merge pull request #7 from phillipivan/main
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
phillipivan authored Aug 27, 2024
2 parents 1492848 + 921fc7f commit 0b5cada
Show file tree
Hide file tree
Showing 7 changed files with 376 additions and 813 deletions.
59 changes: 57 additions & 2 deletions companion/HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,136 +5,177 @@ This module will control the Tascam DA-6400.
- [Tascam DA 6400 Page](https://tascam.com/us/product/da-6400/)

## Configuration

Enter the IP address, port and password of the recorder.

## Actions

- **Stop**

This stops the controlled device.

- **Play**

This starts controlled device playback.

- **Record**

This puts the controlled device into recording or recording standby status.

- **Pause**

This pauses playback of the controlled device.

- **Search**

This starts search playback on the controlled device.

- **Skip**

This skips on the controlled device.

- **Repeat Mode**

This sets the repeat mode of the controlled device.

- **Remote/Local Select**

Set whether operations using the controlled device itself are enabled or disabled.

- **Play Mode Select**

This sets the play mode of the controlled device.

- **Current Track Time**

This requests that time information about the current take (or take being recorded) be returned. (Hour, minute, second, frame)

- **Mark - Delete**

Delete a mark on the controlled device.

- **Mark - Set**

This sets a mark on the controlled device.

- **Mark - Direct Skip Preset**

Specify a mark number to skip to it.

- **Project Delete**

This deletes a project.

- **Project Select**

Specify the project number to change the current project.

- **Project Skip**

This changes the project.

- **Rebuild Project**

This rebuilds the current project/session.

- **Chase Select**

This turns the chase mode of the controlled device on/off.

- **TC Restart**

This restarts the controlled device TC GENERATOR from the START TIME.

- **TC Generator Mode**

This sets the TC GENERATOR mode of the controlled device.

- **TC Frame Type**

This sets the TC FRAME TYPE of the controlled device.

- **TC Output Mode**

This sets the TC mode output by the TC output connector of the controlled device.

- **Clock Master Select**

Set the master clock of the controlled device.

- **Word Thru Select**

This sets the WORD/VIDEO SETUP of the controlled device.

- **Bit Length Select**

This sets the bit length used by the controlled device.

- **Pause Mode**

This sets the PAUSE mode of the controlled device.

- **Audio Over Marker**

This sets the AUDIO OVER MARKER of the controlled device.

- **Time Interval Marker**

This sets the TIME INTERVAL MARKER of the controlled device.

- **Time Interval Marker Time**

This sets the TIME INTERVAL MARKER TIME of the controlled device

- **Sync Unlock Marker**

This sets the SYNC UNLOCK MARKER of the controlled device.

- **REC FS Select**

This sets the REC FS used by the controlled device.

- **File Name Select**

This sets the FILE NAME used by the controlled device.

- **Media Format**

This formats the specified media of the controlled device.

- **Aux Assign Key**

This sets the AUX KEY ASSIGN of the controlled device.

- **Aux Assign Key Tally**

This sets the AUX TALLY ASSIGN of the controlled device.

- **Meter Peak Hold Time**

This sets the METER PEAK HOLD TIME used by the controlled device.

- **Meter Peak Clear**

Clear meter peak holds on the controlled device.

- **Digital Reference Level**

This sets the DIGITAL REFERENCE LEVEL used by the controlled device.

- **Take Erase**

Erase a specified take in the current project on the controlled unit.

- **Direct Track Search Preset**

Specify a take number to search for it directly.

- **Record Function**

This turns the record function of the controlled device on/off.


## Variables

- **Caution Status**
- **Error Status**
- **Track Number**
Expand All @@ -145,10 +186,11 @@ This turns the record function of the controlled device on/off.
- **Track Time: Frames**

## Feedbacks

- **Caution**
- **Error**
- **Mecha Status**
- **PSU Error** Undocumented. Presumed only relevant for the DA-6400dp. Unknown how to query state - module assumes device is OK on connect.
- **PSU Error** Undocumented. Presumed only relevant for the DA-6400dp. Unknown how to query state - module assumes device is OK on connect.
- **Repeat Mode**
- **Remote/Local Mode**
- **Keyboard Type**
Expand All @@ -171,35 +213,48 @@ This turns the record function of the controlled device on/off.

## Version History

### Version 1.2.4

- Update dependencies
- Minor fixes

### Version 1.2.3

- Fix password regex

### Version 1.2.2

- Better status updates
- Transport preset layout
- Update companion module base to 1.8.0

### Version 1.2.1

- Add record preset

### Version 1.2.0

- Add transport & status presets
- Update companion-module-tools to 1.5.0

### Version 1.1.3

- Bug fixes & timer safety

### Version 1.1.1

- Bug fixes
- Update help
- Update companion module base to 1.7.0

### Version 1.1.0

- Seperate track time variables for Hours, Minutes, Seconds & Frames
- Update companion module base to 1.6.0, update companion module tools to 1.4.2
- Add feedbacks
- Add learn function to many actions
- Code refactor

### Version 1.0.2

- Initial release
4 changes: 2 additions & 2 deletions companion/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "tascam-da-6400",
"shortname": "DA-6400",
"description": "Bitfocus Companion module for the Tascam DA-6400 Multichannel Audio Recorder",
"version": "1.1.3",
"version": "0.0.0",
"license": "MIT",
"repository": "git+https://github.com/bitfocus/companion-module-tascam-da-6400.git",
"bugs": "https://github.com/bitfocus/companion-module-tascam-da-6400/issues",
Expand All @@ -22,5 +22,5 @@
"legacyIds": [],
"manufacturer": "Tascam",
"products": ["DA-6400", "DA-6400dp"],
"keywords": ["Hardware", "Audio", "Recorder", "Dante"]
"keywords": ["Hardware", "Audio", "Recorder", "Dante", "MADI"]
}
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "tascam-da-6400",
"version": "1.2.3",
"version": "1.2.4",
"main": "src/main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"format": "prettier --write",
"format": "prettier --w .",
"lint:raw": "eslint --ext .ts --ext .js --ignore-pattern dist --ignore-pattern pkg",
"lint": "yarn lint:raw ."
},
Expand All @@ -14,10 +14,11 @@
"url": "git+https://github.com/bitfocus/companion-module-tascam-da-6400.git"
},
"dependencies": {
"@companion-module/base": "~1.8.0"
"@companion-module/base": "~1.10.0"
},
"devDependencies": {
"@companion-module/tools": "^1.5.0"
"@companion-module/tools": "^2.0.0",
"prettier": "^3.3.3"
},
"prettier": "@companion-module/tools/.prettierrc.json"
}
18 changes: 15 additions & 3 deletions src/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ module.exports = function (self) {
return undefined
}
self.addCmdtoQueue(
SOM + cmd.timeIntervalMarkerTimePreset + interval[2] + interval[3] + interval[0] + interval[1]
SOM + cmd.timeIntervalMarkerTimePreset + interval[2] + interval[3] + interval[0] + interval[1],
)
},
//learn: async () => {},
Expand Down Expand Up @@ -904,7 +904,13 @@ module.exports = function (self) {
}
project = (padding + project).substr(-4)
self.addCmdtoQueue(
SOM + cmd.projectSelect + respParam.projectSelect.preamble + project[2] + project[3] + project[0] + project[1]
SOM +
cmd.projectSelect +
respParam.projectSelect.preamble +
project[2] +
project[3] +
project[0] +
project[1],
)
},
//learn: async () => {},
Expand Down Expand Up @@ -932,7 +938,13 @@ module.exports = function (self) {
}
project = (padding + project).substr(-4)
self.addCmdtoQueue(
SOM + cmd.projectDelete + respParam.projectDelete.preamble + project[2] + project[3] + project[0] + project[1]
SOM +
cmd.projectDelete +
respParam.projectDelete.preamble +
project[2] +
project[3] +
project[0] +
project[1],
)
},
//learn: async () => {},
Expand Down
2 changes: 1 addition & 1 deletion src/processcmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
this.startKeepAlive()
return true
case resp.loginFail:
this.updateStatus(InstanceStatus.BadConfig, 'Login Fail')
this.updateStatus(InstanceStatus.AuthenticationFailure, 'Incorrect Password')
this.log('error', 'Password is incorrect')
this.stopCmdQueue()
this.stopKeepAlive()
Expand Down
2 changes: 1 addition & 1 deletion src/tcp.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {

processCmdQueue() {
if (this.cmdQueue.length > 0) {
this.sendCommand(this.cmdQueue.splice(0, 1))
this.sendCommand(this.cmdQueue.shift())
}
this.cmdTimer = setTimeout(() => {
this.processCmdQueue()
Expand Down
Loading

0 comments on commit 0b5cada

Please sign in to comment.