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.

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

Dev - Hardware JSON definition rework #77

Open
wants to merge 111 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
681b1b8
Formatted and updated json
CorvusPrudens Nov 15, 2021
0bc2b24
Corrected patch_init json name
CorvusPrudens Nov 20, 2021
9d4f641
Integrated som field into generation
CorvusPrudens Nov 20, 2021
875d58b
Updated max patchs / mappings for som
CorvusPrudens Nov 20, 2021
3e9845b
Permitted negative inputs with input_max, input_min
CorvusPrudens Nov 22, 2021
74fdfbd
Updated patch init template
CorvusPrudens Nov 22, 2021
6ac1ba4
Begin updating new json process
CorvusPrudens Nov 24, 2021
b2223ef
Updated seed references to som
CorvusPrudens Nov 29, 2021
400d199
Made som work for old and new JSON
CorvusPrudens Nov 29, 2021
68c833a
Started implementing json2daisy.js
CorvusPrudens Nov 29, 2021
a81711b
Fleshed out json2daisy.js
CorvusPrudens Dec 1, 2021
9793fc9
Added proper return object
CorvusPrudens Dec 1, 2021
cd6a785
Corrected object vs array operations
CorvusPrudens Dec 1, 2021
a424cf1
Added component definition json from json2daisy
CorvusPrudens Dec 1, 2021
9bf5dd2
Added patch_init new-style json
CorvusPrudens Dec 1, 2021
f792db0
Translated glue from hvcc
CorvusPrudens Dec 2, 2021
e850a40
Corrected helper function errors
CorvusPrudens Dec 2, 2021
603d8be
Added parse_parameters to exports
CorvusPrudens Dec 2, 2021
9e8283f
Permitted basic build
CorvusPrudens Dec 3, 2021
c13ed33
Corrected format function
CorvusPrudens Dec 3, 2021
658dc2d
Change `input_min/max` to range
CorvusPrudens Nov 24, 2021
3d12124
Dropped in json2daisy board json
CorvusPrudens Dec 3, 2021
0ea48d5
Swapped default switch behavior
CorvusPrudens Dec 8, 2021
ee7235d
Updated hardcode for field
CorvusPrudens Dec 8, 2021
63dea68
Improved formatting
CorvusPrudens Dec 8, 2021
6865883
Fixed small issues + cleanup
CorvusPrudens Dec 8, 2021
dfba59f
Added aliases and datahandler workaround
CorvusPrudens Dec 8, 2021
e4e3ce7
Added sensors to json generation
CorvusPrudens Jan 12, 2022
b787827
Fixed small patch_sm / patch_init issues
CorvusPrudens Jan 12, 2022
9418fbc
Fixed small issues for field
CorvusPrudens Jan 12, 2022
793e392
Updated pod and patch json / patchers
CorvusPrudens Jan 12, 2022
a5b6474
Added newest components
CorvusPrudens Jan 17, 2022
3eeeb68
Added additional sensors
CorvusPrudens Jan 18, 2022
b2a1a9b
Merge branch 'som_update' into sensors_update
CorvusPrudens Jan 18, 2022
dcff94f
Updated libdaisy commit
CorvusPrudens Jan 18, 2022
cdf843f
Added permit_scale field
CorvusPrudens Jan 18, 2022
9533699
Removed "hook" location from motor components
CorvusPrudens Jan 18, 2022
bf7ad36
Removed dependence on file name for som
CorvusPrudens Mar 28, 2022
65a108e
Simplified template names
CorvusPrudens Mar 28, 2022
e662a02
Merge branch 'main' into sensors_update
CorvusPrudens Mar 29, 2022
4126737
Removed old json files
CorvusPrudens Mar 31, 2022
95dc866
Updated pod example to thoroughly test hardware
CorvusPrudens Apr 4, 2022
0bd4430
Removed extraneous pod description
CorvusPrudens Apr 4, 2022
aed2301
Updated switch definition
CorvusPrudens Apr 4, 2022
4457717
Added todo
CorvusPrudens Apr 4, 2022
d53d879
Updated field json
CorvusPrudens Apr 4, 2022
513d13d
Fixed audio channel bug
CorvusPrudens Apr 4, 2022
e0291b6
Updated multi-codec initialization routine
CorvusPrudens Apr 4, 2022
e613884
Added LED alias
CorvusPrudens Apr 4, 2022
1db7a80
Improved patch init template
CorvusPrudens Apr 4, 2022
7ffc45e
Added adc aliases
CorvusPrudens Apr 4, 2022
79f02b1
Corrected i2c address on petal
CorvusPrudens Apr 4, 2022
8884902
Fixed index bug
CorvusPrudens Apr 4, 2022
37feefc
Added additional petal LED aliases
CorvusPrudens Apr 4, 2022
339f852
Moved pod items around
CorvusPrudens Apr 5, 2022
e9fc74c
Added petal sm defs
CorvusPrudens Apr 6, 2022
eb709bd
Updated json2daisy to include petal sm
CorvusPrudens Apr 6, 2022
cc82c5f
Added petal sm json
CorvusPrudens Apr 6, 2022
ab550a9
Added temporary petal sm BSP files
CorvusPrudens Apr 6, 2022
9a46644
Updated libdaisy commit
CorvusPrudens Apr 6, 2022
dbd618d
Corrected field LED and button errors
CorvusPrudens Apr 7, 2022
160b335
Updated libdaisy commit
CorvusPrudens Apr 7, 2022
407c8df
Added petal sm options to oopsy object
CorvusPrudens Apr 18, 2022
edfa641
Added footswitch components
CorvusPrudens Apr 18, 2022
4e307c2
Added petal sm max patcher
CorvusPrudens Apr 18, 2022
46f4ef7
Fixed bipolar issue with patch init
CorvusPrudens Apr 18, 2022
ae21491
Restored previous logic flow
CorvusPrudens Apr 18, 2022
cda0201
Completed petal JSON
CorvusPrudens Apr 21, 2022
ef07de8
Updated generation code for petal sm
CorvusPrudens Apr 21, 2022
aadd2de
Added callback rate updates for petal components
CorvusPrudens Apr 21, 2022
ccc82da
Added petal option to oopsy object
CorvusPrudens Apr 21, 2022
b20e50e
Merge pull request #71 from CorvusPrudens/sensors_update
CorvusPrudens Apr 26, 2022
cb497ba
Updated libdaisy commit
CorvusPrudens May 2, 2022
f03f402
Added gate polarity to JSON
CorvusPrudens May 2, 2022
b9eac29
Fixed seed bipolar bug
CorvusPrudens May 2, 2022
82cf61f
Added build_path output for Build button
CorvusPrudens May 4, 2022
cb6714b
Added build path catcher
CorvusPrudens May 4, 2022
db12fe5
Updated templates for larger oopsy object
CorvusPrudens May 4, 2022
50cb6f5
Added app type option
CorvusPrudens May 4, 2022
7edd3bb
Corrected syntax error in Patch SM defs
CorvusPrudens Jul 6, 2022
32c234b
Merge pull request #75 from electro-smith/patch_sm_ledfix
stephenhensley Jul 6, 2022
ea522b4
Created basic insert framework
CorvusPrudens Aug 15, 2022
170c900
Added check to prevent adc initialization with zero channels
CorvusPrudens Aug 15, 2022
0bedb9d
Fixed compile bugs
CorvusPrudens Aug 15, 2022
fe6ec96
Added nicer syntax for CodeClass process calls
CorvusPrudens Aug 15, 2022
693d1d1
Fixed potential ProcessAllControls bug
CorvusPrudens Aug 15, 2022
b47f0bd
Improved header file usability
CorvusPrudens Aug 16, 2022
f4e637d
Provided default getters and setters
CorvusPrudens Aug 22, 2022
ba9f973
Merge pull request #78 from CorvusPrudens/bootloader_additions
CorvusPrudens Oct 7, 2022
2503de8
Corrected bootloader app allocation
CorvusPrudens Oct 8, 2022
f46a9fa
Updated libDaisy commit
CorvusPrudens Oct 26, 2022
f1842e9
Reintroduced oopsy defines
CorvusPrudens Feb 6, 2023
8f21481
Merge branch 'dev' into petal_125b_sm
CorvusPrudens Feb 6, 2023
be37a47
Merge remote-tracking branch 'upstream/bootloader-additions' into pet…
CorvusPrudens Feb 6, 2023
497ae45
Merge pull request #72 from CorvusPrudens/petal_125b_sm
CorvusPrudens Feb 6, 2023
8b5df2e
Create release.yaml
CorvusPrudens Feb 27, 2023
25b6d2f
Added specific branch to push trigger
CorvusPrudens Feb 27, 2023
3a16f33
Added submodule checkout
CorvusPrudens Feb 27, 2023
99e317a
Merge pull request #82 from CorvusPrudens/bootloader-additions
CorvusPrudens Feb 27, 2023
d457eec
Corrected SRAM allocation size
CorvusPrudens Mar 7, 2023
ffcca07
Removed spurious linker variable
CorvusPrudens Mar 7, 2023
d8a1ce2
Updated libdaisy to latest master
CorvusPrudens Apr 3, 2023
212d9d8
Updated libDaisy to existing commit
CorvusPrudens Apr 6, 2023
1d3e659
Added temporary Petal LED fix
CorvusPrudens Jun 5, 2023
40c6d12
Update libdaisy
CorvusPrudens Jun 7, 2023
da557cb
Revert "Update libdaisy"
CorvusPrudens Jun 9, 2023
e40f70a
Updated to valid libDaisy commit
CorvusPrudens Jun 9, 2023
7af02e7
Resolved Versio issues
CorvusPrudens Jun 9, 2023
ebd3496
Added code components to all SOMs
CorvusPrudens Jan 30, 2024
c0b256e
Merge pull request #84 from electro-smith/pre-merge
CorvusPrudens Jan 31, 2024
0349173
Merge pull request #81 from electro-smith/bootloader-additions
CorvusPrudens Jan 31, 2024
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
43 changes: 43 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Release

on:
push:
branches:
- main
tags:
- "v*"
workflow_dispatch:

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
path: 'oopsy'
ref: 'main'
- name: Install ARM Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1
with:
release: '10-2020-q4'
- name: update submodules
working-directory: oopsy
run: |
git submodule update --init
- name: Build libDaisy
run: |
make -C oopsy/source/libdaisy -j$(nproc)
- name: Zip it up
run: |
rm -rf oopsy/.git
rm -rf oopsy/.github
zip -r oopsy.zip oopsy
- name: Make Release
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: ${{ github.token }}
draft: true
prerelease: false
files: |
oopsy.zip
LICENSE
18 changes: 10 additions & 8 deletions init/oopsy-objectmappings.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
max definesubstitution oopsy.patch bpatcher @name oopsy.maxpat @args patch;
max definesubstitution oopsy.patch bpatcher @name oopsy.maxpat @args patch @patching_rect 256 256 171 171;
max objectfile oopsy.patch oopsy.patch;
max definesubstitution oopsy.field bpatcher @name oopsy.maxpat @args field;
max definesubstitution oopsy.field bpatcher @name oopsy.maxpat @args field @patching_rect 256 256 171 171;
max objectfile oopsy.field oopsy.field;
max definesubstitution oopsy.petal bpatcher @name oopsy.maxpat @args petal;
max definesubstitution oopsy.petal bpatcher @name oopsy.maxpat @args petal @patching_rect 256 256 171 171;
max objectfile oopsy.petal oopsy.petal;
max definesubstitution oopsy.pod bpatcher @name oopsy.maxpat @args pod;
max definesubstitution oopsy.petal bpatcher @name oopsy.maxpat @args petal_125b_sm @patching_rect 256 256 171 171;
max objectfile oopsy.petal_125b_sm oopsy.petal_125b_sm;
max definesubstitution oopsy.pod bpatcher @name oopsy.maxpat @args pod @patching_rect 256 256 171 171;
max objectfile oopsy.pod oopsy.pod;
max definesubstitution oopsy.patch_sm bpatcher @name oopsy.maxpat @args patch_sm;
max objectfile oopsy.patch_sm oopsy.patch_sm;
max definesubstitution oopsy.bluemchen bpatcher @name oopsy.maxpat @args bluemchen;
max definesubstitution oopsy.patch_init bpatcher @name oopsy.maxpat @args patch_init @patching_rect 256 256 171 171;
max objectfile oopsy.patch_init oopsy.patch_init;
max definesubstitution oopsy.bluemchen bpatcher @name oopsy.maxpat @args bluemchen @patching_rect 256 256 171 171;
max objectfile oopsy.bluemchen oopsy.bluemchen;
max definesubstitution oopsy.nehcmeulb bpatcher @name oopsy.maxpat @args nehcmeulb;
max definesubstitution oopsy.nehcmeulb bpatcher @name oopsy.maxpat @args nehcmeulb @patching_rect 256 256 171 171;
max objectfile oopsy.nehcmeulb oopsy.nehcmeulb;
5 changes: 4 additions & 1 deletion javascript/oopsy.node4max.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ process.stdout.write = (function() {
if (match = str.match(/^oopsy (.*)/i)) {
//maxAPI.outlet(match[1]) // Node was timing out here, so we set up an interval reader instead
msgs.push(match[1])
}
}
if (match = str.match(/^build_path (.*)/i)) {
msgs.push(['build_path', match[1]])
}
}
})();

Expand Down
Loading