Skip to content

Commit

Permalink
Merge branch 'nightly' into stable
Browse files Browse the repository at this point in the history
Features added:
- Now includes HID Macro support;
- Keyboard Macro Action added;
- Enable - disable the macro capabilities;
- Added push rot event to EN16 encoders;

Bugfixes:
- Template parameter fixes (MIDI Static channel suggestions, etc);
  • Loading branch information
kkerti committed Dec 11, 2020
2 parents 4dd9a9b + f1bf29f commit 755f21b
Show file tree
Hide file tree
Showing 30 changed files with 1,297 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2016]
os: [windows-2016, ubuntu-latest]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion doc-editor.drawio
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile modified="2020-10-27T15:00:59.642Z" host="" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/11.1.4 Chrome/76.0.3809.88 Electron/6.0.0 Safari/537.36" etag="MJkQF0g74T47AAmBhob5" version="11.1.4" type="device"><diagram id="zs7uOZXnXQ7ZXEF25uTQ" name="Page-1">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</diagram></mxfile>
<mxfile modified="2020-11-30T15:19:14.372Z" host="" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/11.1.4 Chrome/76.0.3809.88 Electron/6.0.0 Safari/537.36" etag="5LW3kJGqW3JmNTVdrdqj" version="11.1.4" type="device"><diagram id="zs7uOZXnXQ7ZXEF25uTQ" name="Page-1">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</diagram><diagram id="1awMsa4UuiiffiIVRBLe" name="Page-2">vVZNc9owEP01PtKxLSDkmECaHPo1JTPp9MIIS7bVyFpHlgPk13dlyTaGZBI6TWY4yE/Sfr2nXQIyL7bXmpb5V2BcBnHItgFZBHEchXEc2F/Idg6Zhh7ItGAOCntgKZ54e9OjtWC88piDDIA0ohyCCSjFEzPAqNawGR5LQbIBUNKMHwHLhMpj9E4wkzt0Fp/1+A0XWd56jqbnbqeg7WGfSZVTBps9iFwFZK4BjFsV2zmXtnhtXZSp1+zhd/UzI6Yqv92kv87nI2fs8ylXuhQ0V+b/mvZcPlJZ+3oF8VSik8scvU4zu7pgDI8ovrGMJEaAsnRJWlXtWXTaH29BJh57iEQ2gboJyOTc2rM1lzuvm1GpwUACdj/VUFhYmLxe77kYGHzGh4PW+hB5w1Vii/AFUDVLboxQGaYWjnCfFiUe8KdC2lTCp44ydhKlu+/pkksUL11LftFUqHo5nH2EEDThbtzh8yu5foNfRQveue/4gKIEZfURhxLgvi4/qHJj61xzavhL4aSgO9YPZfOekU26ynnFNQoesKdAF9RqDuWX8KpC5t1Ds3FDGth3Pn2ooTHOE2yOq/Vu1SbhN+wbszlfo45/eBl/+vNRWU67LJ/Jrw/SaKoqZKJYOY5WTkX/mEPTDs2u7bGGb5uWYQqJQITLymi453OQyD1ZKJQCgqmQ8gCqSprYopPFpP+6BRT/YoThk8tNLgxfIm5dbfCNIAaPXKeyacW5YIwrxDTUinHb6sIuQjyGkR2MgVd6aNQ1dpyIHAputO1R3ko8Gzs7fhhGZOa+N/1oIdHUYfneWInPPUj9OMs6233LxoXv2id0cHLUwW8tG69TpHklnmzH8jUrQSjTRDe5DCYLRGhtoHID3V6gUmRY6oXkqTVlqyuwY1542FjWDigcvyMX0YwMuDiLj6mIj5mIxicTgZ/9lG/29v4rkau/</diagram></mxfile>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grid_editor",
"version": "0.0.914",
"version": "0.0.920",
"main": "./src/electron.js",
"repository": {
"type": "git",
Expand Down
7 changes: 5 additions & 2 deletions src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { fade } from 'svelte/transition';
const fs = require('fs');
/*
* tailwindcss
*/
Expand Down Expand Up @@ -38,6 +39,7 @@
import FirmwareCheck from './app/shared/firmware-check/FirmwareCheck.svelte';
import DragModule from './app/layout/components/DragModule.svelte';
import RemoveModule from './app/layout/components/RemoveModule.svelte';
import KeyStatus from './app/shared/menu/KeyStatus.svelte';
import MODULE from './app/core/grid-modules/MODULE.svelte';
Expand All @@ -62,7 +64,7 @@
import { dragndrop } from './app/layout/actions/dnd.action.js';
import Titlebar from './app/shared/menu/Titlebar.svelte';
import PanInfo from './app/shared/menu/PanInfo.svelte';
import WebsiteNav from './app/shared/menu/WebsiteNav.svelte';
import WebsiteNav from './app/shared/menu/WebsiteNav.svelte';
/*
Expand Down Expand Up @@ -168,6 +170,7 @@ import WebsiteNav from './app/shared/menu/WebsiteNav.svelte';
}
}
/>
<KeyStatus/>
</Titlebar>
{/if}

Expand All @@ -178,7 +181,7 @@ import WebsiteNav from './app/shared/menu/WebsiteNav.svelte';
{#if $appSettings.isElectron}
<FirmwareCheck />

<Form />
<!--<Form />-->
{/if}


Expand Down
9 changes: 7 additions & 2 deletions src/app/core/classes/GridController.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ const TPEA = {
code: 'DR'
},
value_change: {
desc: 'value change',
desc: 'rotation',
value: '1',
code: 'AVC7'
},
push_rot: {
desc: 'push rot',
value: '13',
code: 'ENCPUSHROT'
},
init: {
desc: 'bank init',
value: '0',
Expand All @@ -29,7 +34,7 @@ export var GRID_CONTROLLER = {
potentiometer: [ TPEA.init, TPEA.value_change ],
fader: [ TPEA.init, TPEA.value_change ],
blank: [],
encoder: [ TPEA.init, TPEA.down, TPEA.up, TPEA.value_change ]
encoder: [ TPEA.init, TPEA.down, TPEA.up, TPEA.value_change, TPEA.push_rot ]
},

moduleElements: {
Expand Down
11 changes: 11 additions & 0 deletions src/app/core/classes/GridProtocol.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ export const GRID_PROTOCOL = {
if(obj.class == "LEDCOLOR"){
DATA.LEDCOLOR = this.decode_by_code(array, obj.class)
}
if(obj.class == "HIDKEYBOARD"){
DATA.HIDKEYBOARD = this.decode_by_code(array, obj.class)
}

// HID state
if(obj.class == "HIDKEYSTATUS"){
DATA.HIDKEYSTATUS = this.decode_by_code(array, obj.class);
}

// global settings
if(obj.class == "BANKENABLED"){
Expand Down Expand Up @@ -422,6 +430,9 @@ export const GRID_PROTOCOL = {
if(actionValue == "LEDPHASE"){
name = "LED Phase";
}
if(actionValue == "HIDKEYBOARD"){
name = "Keyboard";
}
return name;
},

Expand Down
10 changes: 7 additions & 3 deletions src/app/core/grid-modules/MODULE.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
import ControlNameOverlay from './overlays/ControlNameOverlay.svelte';
import ProfileLoadOverlay from './overlays/ProfileLoadOverlay.svelte';
import { appSettings } from '../../stores/app-settings.store.js';
import { bankActiveStore, bankColorStore } from '../../stores/control-surface-input.store.js';
import { bankActiveStore, derivedLocalInputStore, bankColorStore } from '../../stores/control-surface-input.store.js';
import { runtime } from '../../stores/runtime.store.js';
Expand All @@ -31,6 +30,7 @@
let color;
let bankColors;
let bankActive;
let selectedElement;
$: moduleWidth = $appSettings.size * 106.6 + 2;
Expand All @@ -51,13 +51,17 @@
bankColors = store[0].global.bankColors;
}
})
derivedLocalInputStore.subscribe(store => {
selectedElement = store;
})
})
</script>

{#if selected}
<svelte:component this={selected.component} {moduleWidth} {id} {rotation} {color}>
<svelte:component this={selected.component} {moduleWidth} {id} {rotation} {color} {selectedElement}>

{#if $appSettings.overlays.controlName}
<ControlNameOverlay {id} {moduleWidth} {bankActive} {rotation}/>
Expand Down
9 changes: 1 addition & 8 deletions src/app/core/grid-modules/modules/BU16.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
import Led from '../elements/Led.svelte';
export let moduleWidth;
export let selectedElement = {};
export let id = 'BU16';
export let rotation = 0;
export let color;
let selectedElement = {};
let valueChange = [];
let dx, dy
Expand All @@ -38,16 +37,10 @@
}
onMount(()=>{
localInputStore.subscribe((values)=>{
selectedElement = values;
});
if(id !== undefined && (id.length > 4)){
dx = +id.split(';')[0].split(':').pop();
dy = +id.split(';')[1].split(':').pop();
}
});
</script>
Expand Down
6 changes: 1 addition & 5 deletions src/app/core/grid-modules/modules/EN16.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
import Led from '../elements/Led.svelte';
export let moduleWidth;
export let selectedElement = {};
export let id = 'EN16';
export let rotation = 0;
export let color;
let selectedElement = {};
let dx, dy;
const control_block = (number) => {
Expand All @@ -37,9 +36,6 @@
onMount(()=>{
localInputStore.subscribe((values)=>{
selectedElement = values;
})
if(id !== undefined && (id.length > 4)){
console.log(id);
Expand Down
6 changes: 1 addition & 5 deletions src/app/core/grid-modules/modules/PBF4.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
import Button from '../elements/Button.svelte';
export let id = 'PBF4';
export let selectedElement = {};
export let rotation = 0;
export let moduleWidth;
export let color;
let dx, dy;
let selectedElement = {};
let valueChange = [];
function handleEventParamChange(static_elementNumber, input_elementNumber){
Expand All @@ -32,9 +31,6 @@
}
onMount(()=>{
localInputStore.subscribe((values)=>{
selectedElement = values;
});
if(id !== undefined && (id.length > 4)){
dx = +id.split(';')[0].split(':').pop();
Expand Down
6 changes: 1 addition & 5 deletions src/app/core/grid-modules/modules/PO16.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import Led from '../elements/Led.svelte';
export let id = 'PO16';
export let selectedElement = {};
export let rotation = 0;
export let moduleWidth;
export let color;
Expand All @@ -19,8 +20,6 @@
let dx, dy;
let selectedElement = {};
const control_block = (number) => {
let array = [];
for (let i = 0; i < number; i++) {
Expand All @@ -38,9 +37,6 @@
}
onMount(()=>{
localInputStore.subscribe((values)=>{
selectedElement = values;
});
if(id !== undefined && (id.length > 4)){
dx = +id.split(';')[0].split(':').pop();
Expand Down
Loading

0 comments on commit 755f21b

Please sign in to comment.