diff --git a/output/pcbs/board.kicad_pcb b/output/pcbs/board.kicad_pcb index 6d01d83..187b461 100644 --- a/output/pcbs/board.kicad_pcb +++ b/output/pcbs/board.kicad_pcb @@ -2061,6 +2061,32 @@ + (module lib:bat (layer F.Cu) (tstamp 5BF2CC94) + (at 106.06786 -0.39742239999999995 0) + + + (fp_text reference "PAD1" (at 0 0) (layer F.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15)))) + (fp_text value "" (at 0 0) (layer F.SilkS) hide (effects (font (size 1.27 1.27) (thickness 0.15)))) + + + + (fp_text user "B+" (at -3.24 1.8 0) (layer F.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) )) + (fp_text user "B+" (at -3.24 1.8 0) (layer B.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))) + (pad 1 thru_hole circle (at -3.24 0 0) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask) (net 25 "Braw")) + + + (fp_text user "B-" (at 0 1.8 0) (layer F.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) )) + (fp_text user "B-" (at 0 1.8 0) (layer B.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))) + (pad 1 thru_hole circle (at 0 0 0) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask) (net 24 "Bminus")) + + + (fp_text user "B+" (at 3.24 1.8 0) (layer F.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) )) + (fp_text user "B+" (at 3.24 1.8 0) (layer B.SilkS) (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))) + (pad 1 thru_hole circle (at 3.24 0 0) (size 1.7526 1.7526) (drill 1.0922) (layers *.Cu *.SilkS *.Mask) (net 25 "Braw")) + + ) + + (module kbd:ResetSW (layer F.Cu) (tedit 5B9559E6) (tstamp 61905781) (descr "Two pin through hole Tactile Switch, the same as on the Corne") diff --git a/package-lock.json b/package-lock.json index 157c3da..6e94778 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,39 +1,11 @@ { - "name": "samoklava", + "name": "rae-dux", "lockfileVersion": 2, "requires": true, "packages": { "": { "dependencies": { - "ergogen": "github:soundmonster/ergogen#samoklava" - } - }, - "../../ergogen": { - "version": "3.0.0", - "extraneous": true, - "license": "MIT", - "dependencies": { - "@jscad/openjscad": "github:mrzealot/oldjscad", - "fs-extra": "^9.0.1", - "js-yaml": "^3.14.0", - "kle-serial": "github:mrzealot/kle-serial", - "makerjs": "github:mrzealot/maker.js-dist", - "mathjs": "^8.1.1", - "yargs": "^15.4.1" - }, - "bin": { - "ergogen": "src/cli.js" - }, - "devDependencies": { - "@rollup/plugin-commonjs": "^13.0.2", - "@rollup/plugin-replace": "^2.3.3", - "chai": "^4.2.0", - "chai-as-promised": "^7.1.1", - "dir-compare": "^3.3.0", - "glob": "^7.1.6", - "mocha": "^8.1.3", - "nyc": "^15.1.0", - "rollup": "^2.22.1" + "ergogen": "github:andrewjrae/ergogen#rae-dux" } }, "node_modules/@babel/runtime": { @@ -351,7 +323,7 @@ }, "node_modules/ergogen": { "version": "3.1.0", - "resolved": "git+ssh://git@github.com/soundmonster/ergogen.git#8670eee8977de5fa2a2763733b7c1cc4bb140678", + "resolved": "git+ssh://git@github.com/andrewjrae/ergogen.git#e048e9081e4c664268213eb6f2a4aa9a505124de", "license": "MIT", "dependencies": { "@jscad/openjscad": "github:ergogen/oldjscad", @@ -448,9 +420,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "node_modules/graham_scan": { "version": "1.0.4", @@ -566,9 +538,9 @@ } }, "node_modules/mathjs": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.0.2.tgz", - "integrity": "sha512-QCbsqJ2iBCJP/yTj9Dg45SWecwVf5fxe8sZo4SyerthHVydpxRL33hU0MynwAHqz1XglSGkSKk7QzTD8U8wPFg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.1.0.tgz", + "integrity": "sha512-TrpZAR3H9jR0Cv6cnzT+TZhE40Xs2SCaLf/qm2WcWm2tui69Gas/bC/ct5ZLZNWnWvNvJ7H2uHvuRDDl151PHA==", "dependencies": { "@babel/runtime": "^7.16.5", "complex.js": "^2.0.15", @@ -1061,8 +1033,8 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "ergogen": { - "version": "git+ssh://git@github.com/soundmonster/ergogen.git#8670eee8977de5fa2a2763733b7c1cc4bb140678", - "from": "ergogen@github:soundmonster/ergogen#samoklava", + "version": "git+ssh://git@github.com/andrewjrae/ergogen.git#e048e9081e4c664268213eb6f2a4aa9a505124de", + "from": "ergogen@github:andrewjrae/ergogen#rae-dux", "requires": { "@jscad/openjscad": "github:ergogen/oldjscad", "fs-extra": "^10.0.0", @@ -1123,9 +1095,9 @@ } }, "graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "graham_scan": { "version": "1.0.4", @@ -1216,9 +1188,9 @@ } }, "mathjs": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.0.2.tgz", - "integrity": "sha512-QCbsqJ2iBCJP/yTj9Dg45SWecwVf5fxe8sZo4SyerthHVydpxRL33hU0MynwAHqz1XglSGkSKk7QzTD8U8wPFg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.1.0.tgz", + "integrity": "sha512-TrpZAR3H9jR0Cv6cnzT+TZhE40Xs2SCaLf/qm2WcWm2tui69Gas/bC/ct5ZLZNWnWvNvJ7H2uHvuRDDl151PHA==", "requires": { "@babel/runtime": "^7.16.5", "complex.js": "^2.0.15", diff --git a/package.json b/package.json index 58a8a7a..fa725dc 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,6 @@ "gen": "ergogen rae-dux.yaml" }, "dependencies": { - "ergogen": "github:soundmonster/ergogen#samoklava" + "ergogen": "github:andrewjrae/ergogen#rae-dux" } } diff --git a/rae-dux.yaml b/rae-dux.yaml index 714aed1..31f5789 100644 --- a/rae-dux.yaml +++ b/rae-dux.yaml @@ -214,6 +214,17 @@ pcbs: nets: from: Braw to: Bplus + jst_bat: + type: bat + anchor: + ref: + - matrix_inner_bottom + shift: [20, -17.5] + params: + reverse: true + nets: + neg: Bminus + pos: Braw reset: type: button anchor: