From 8a3504623787bd26f9be04c43549d3450686ed5e Mon Sep 17 00:00:00 2001 From: "[poww10s]" <[theironminer@gmail.com]> Date: Mon, 30 Nov 2020 14:43:52 -0500 Subject: [PATCH] change menu and start saving process convert file to state wip finish file to state conversion load in file to state (needs to be fixed in order to properly load some things in) formatting Add microkorg sysex decoding Correctly parse bit array sections Add sysex encoding and header creation remove log Finish format file v1 Fix a definitions Move stuff around add file to store functions Finish prepare_timbre begin to Setup menu Gut a lot of stuff, and implement the menu Begin overhaul of fileupload process Finish hooking up the menu clean up start saving functions add unused state, mostly finish saveStore add self reminder complete store saving process 1 store to simplified store is complete --- package-lock.json | 11 +- package.json | 3 +- patches/binary-parser-encoder+1.5.3.patch | 13 + public/index.html | 5 + public/logo192.png | Bin 4153 -> 0 bytes public/logo512.png | Bin 12066 -> 0 bytes src/1f3b9.svg | 1 - src/App.css | 49 +- src/App.js | 18 +- src/features/counter/Counter.js | 60 -- src/features/counter/Counter.module.css | 74 -- src/features/counter/counterSlice.js | 42 - src/features/helpers/Helpers.js | 80 +- src/features/io/IO.css | 16 - src/features/io/IO.js | 94 -- src/features/io/convert/loadStore.js | 793 +++++++++++++++++ src/features/io/convert/parse.js | 213 +++++ src/features/io/convert/saveStore.js | 732 +++++++++++++++ src/features/io/convert/serialise.js | 5 + src/features/io/index.js | 18 + src/features/io/ioParser.js | 257 ------ src/features/io/utils/functions.js | 32 + src/features/io/utils/sysex.js | 126 +++ src/features/menu/Menu.css | 247 ----- src/features/menu/Menu.js | 146 --- src/features/menu/index.js | 148 +++ src/features/menu/menu.css | 54 ++ src/features/modal/index.js | 35 + src/features/timbre/Timbre.js | 260 +++--- src/features/timbre/Timbre.module.css | 160 ++-- src/features/timbre/parameters/LFO.js | 144 +-- .../timbre/parameters/Parameters.module.css | 123 +-- .../timbre/parameters/parameterSlice.js | 841 ++++++++++-------- src/features/timbre/timbreSwitcher.js | 69 +- src/fonts.css | 2 - src/index.css | 5 +- src/logo.svg | 1 - 37 files changed, 3113 insertions(+), 1764 deletions(-) create mode 100644 patches/binary-parser-encoder+1.5.3.patch delete mode 100644 public/logo192.png delete mode 100644 public/logo512.png delete mode 100644 src/1f3b9.svg delete mode 100644 src/features/counter/Counter.js delete mode 100644 src/features/counter/Counter.module.css delete mode 100644 src/features/counter/counterSlice.js delete mode 100644 src/features/io/IO.css delete mode 100644 src/features/io/IO.js create mode 100644 src/features/io/convert/loadStore.js create mode 100644 src/features/io/convert/parse.js create mode 100644 src/features/io/convert/saveStore.js create mode 100644 src/features/io/convert/serialise.js create mode 100644 src/features/io/index.js delete mode 100644 src/features/io/ioParser.js create mode 100644 src/features/io/utils/functions.js create mode 100644 src/features/io/utils/sysex.js delete mode 100644 src/features/menu/Menu.css delete mode 100644 src/features/menu/Menu.js create mode 100644 src/features/menu/index.js create mode 100644 src/features/menu/menu.css create mode 100644 src/features/modal/index.js delete mode 100644 src/fonts.css delete mode 100644 src/logo.svg diff --git a/package-lock.json b/package-lock.json index b9fa743..17a5920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3765,13 +3765,18 @@ "optional": true }, "binary-parser-encoder": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/binary-parser-encoder/-/binary-parser-encoder-1.5.2.tgz", - "integrity": "sha512-bZKR5Qo+pujq+Pvye/ZR94aRbYJx+7WijKAD7RcFi6qgtNJ4kHqAbDaH588VM2N4HylWp08Pm2l0buXqh2t5kw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/binary-parser-encoder/-/binary-parser-encoder-1.5.3.tgz", + "integrity": "sha512-yu3tdLBYqPIwGRaXyswLoLrhaffkuZkNuXveq/jYoyBHQbFMjamHCWPFOmI2Qz+Go0Rh6wE9f6tt0EAvsgDD0g==", "requires": { "smart-buffer": "^4.1.0" } }, + "bitset": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bitset/-/bitset-5.1.1.tgz", + "integrity": "sha512-oKaRp6mzXedJ1Npo86PKhWfDelI6HxxJo+it9nAcBB0HLVvYVp+5i6yj6DT5hfFgo+TS5T57MRWtw8zhwdTs3g==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", diff --git a/package.json b/package.json index 08c756e..1ce9d4c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", - "binary-parser-encoder": "^1.5.2", + "binary-parser-encoder": "^1.5.3", + "bitset": "^5.1.1", "rc-slider": "^9.6.3", "react": "^17.0.1", "react-dom": "^17.0.1", diff --git a/patches/binary-parser-encoder+1.5.3.patch b/patches/binary-parser-encoder+1.5.3.patch new file mode 100644 index 0000000..7c7c548 --- /dev/null +++ b/patches/binary-parser-encoder+1.5.3.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/binary-parser-encoder/dist/binary_parser.js b/node_modules/binary-parser-encoder/dist/binary_parser.js +index ee49a70..ef0ac58 100644 +--- a/node_modules/binary-parser-encoder/dist/binary_parser.js ++++ b/node_modules/binary-parser-encoder/dist/binary_parser.js +@@ -551,7 +551,7 @@ var Parser = /** @class */ (function () { + Parser.prototype.compile = function () { + var importPath = 'imports'; + var ctx = this.getContext(importPath); +- this.compiled = new Function(importPath, 'TextDecoder', "return function (buffer, constructorFn) { " + ctx.code + " };")(ctx.imports, typeof TextDecoder === 'undefined' ++ this.compiled = new Function(importPath, 'TextDecoder', "return function (buffer, constructorFn) { ' + ctx.code + ' };")(ctx.imports, typeof TextDecoder === 'undefined' + ? require('util').TextDecoder + : TextDecoder); + }; diff --git a/public/index.html b/public/index.html index 1dbdca6..51f0ffa 100644 --- a/public/index.html +++ b/public/index.html @@ -10,6 +10,11 @@ content="Web site created using create-react-app" /> + +