Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat/auto-reset-level: Threshold of which Sisyfos will reset faderlev… #79

Merged
merged 1 commit into from
Oct 10, 2019
Merged

feat/auto-reset-level: Threshold of which Sisyfos will reset faderlev… #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,12 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
%
</label>
<br/>

<label className="settings-input-field">
AUTORESET LEVEL :
<input name="autoResetLevel" type="text" value={this.state.settings.autoResetLevel} onChange={this.handleChange} />
%
</label>
<br/>
<label className="settings-input-field">
PROTOCOL LATENCY :
<input name="protocolLatency" type="text" value={this.state.settings.protocolLatency} onChange={this.handleChange} />
Expand Down
10 changes: 6 additions & 4 deletions src/reducers/settingsReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface ISettings {
localOscPort: number,
deviceIp: string,
devicePort: number,
protocolLatency: number,
protocolLatency: number, // If a protocol has latency and feedback, the amount of time before enabling receiving data from channel again
enableRemoteFader: boolean,
mixerMidiInputPort: string,
mixerMidiOutputPort: string,
Expand All @@ -20,9 +20,10 @@ export interface ISettings {
numberOfChannelsInType: Array<number>,
numberOfFaders: number,
numberOfSnaps: number,
fadeTime: number,
voLevel: number,
automationMode: boolean,
fadeTime: number, // Default fade time for PGM ON - OFF
voLevel: number, // Relative level of PGM in %
autoResetLevel: number, // Autoreset before pgm on, if level is lower than in %
automationMode: boolean,
showPfl: boolean
}

Expand All @@ -48,6 +49,7 @@ const defaultSettingsReducerState: Array<ISettings> = [
numberOfFaders: 8,
numberOfSnaps: DEFAULTS.NUMBER_OF_SNAPS,
voLevel: 20,
autoResetLevel: 10,
automationMode: true,
fadeTime: 60, //Time in ms
showPfl: false
Expand Down
13 changes: 13 additions & 0 deletions src/utils/MixerConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,19 @@ export class MixerGenericConnection {
fadeUp(channelIndex: number, fadeTime: number, faderIndex: number) {
let outputLevel = parseFloat(this.store.channels[0].channel[channelIndex].outputLevel);
let targetVal = parseFloat(this.store.faders[0].fader[faderIndex].faderLevel);

// Reset targetVal if it´s lower than AutoReset threshold:
if (targetVal < (this.store.settings[0].autoResetLevel/100)
&& this.store.channels[0].channel[channelIndex].outputLevel === this.mixerProtocol.fader.min
) {
targetVal = this.mixerProtocol.fader.zero
window.storeRedux.dispatch({
type:'SET_FADER_LEVEL',
channel: faderIndex,
level: targetVal
});
}

if (this.store.faders[0].fader[faderIndex].voOn) {
targetVal = targetVal * (100-parseFloat(this.store.settings[0].voLevel))/100
}
Expand Down