commit f7a140c2dc39daa8db07941ed22c9abc67c443ec
parent e6aed00ee02f28fbfb440394067053e109f67858
Author: Adam M <[email protected]>
Date: Mon, 12 Nov 2018 23:51:32 -0600
fixed some things, broke others
Diffstat:
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/res/ComputerscareILoveCookiesPanel.svg b/res/ComputerscareILoveCookiesPanel.svg
@@ -34,11 +34,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4142136"
- inkscape:cx="121.43564"
- inkscape:cy="192.36446"
+ inkscape:zoom="5.6568544"
+ inkscape:cx="258.00418"
+ inkscape:cy="357.21727"
inkscape:document-units="mm"
- inkscape:current-layer="g1669"
+ inkscape:current-layer="text1651"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
@@ -61,7 +61,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -206,7 +206,7 @@
style="stroke-width:0.07000434" /></text>
<g
aria-label="out"
- transform="matrix(0.961494,-0.26224736,0.34559745,0.86694168,-28.446637,78.572455)"
+ transform="matrix(1.0743225,-0.26898724,0.37322674,0.87295797,-37.671603,34.123373)"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07000434"
id="text888">
<path
@@ -227,7 +227,7 @@
</g>
<g
aria-label="one"
- transform="matrix(0.96137546,-0.34508222,-0.14753322,1.1131988,64.324907,27.967859)"
+ transform="matrix(0.96175882,-0.34207491,-0.14893339,1.102215,59.092309,-13.079623)"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.07000434"
id="text892">
<path
@@ -275,41 +275,41 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccscccsccccccc" />
<path
- d="m -22.945679,200.82302 v 0.61693 q -0.325406,-0.27515 -0.695476,-0.41129 -0.366879,-0.13612 -0.781611,-0.13612 -0.816705,0 -1.250579,0.45473 -0.433875,0.45184 -0.433875,1.30918 0,0.85445 0.433875,1.30918 0.433874,0.45185 1.250579,0.45185 0.414732,0 0.781611,-0.13614 0.37007,-0.13612 0.695476,-0.4113 v 0.61115 q -0.338168,0.20855 -0.717807,0.31282 -0.37645,0.10427 -0.797563,0.10427 -1.081496,0 -1.703594,-0.59957 -0.6221,-0.60246 -0.6221,-1.64227 0,-1.04271 0.6221,-1.64228 0.622098,-0.60245 1.703594,-0.60245 0.427494,0 0.803944,0.10427 0.379639,0.10143 0.711426,0.30703 z"
- style="stroke-width:0.04117904"
+ d="m -22.945679,200.64122 v 0.4474 q -0.325406,-0.20099 -0.695476,-0.30136 -0.366879,-0.10035 -0.781611,-0.1022 -0.816705,-0.004 -1.250579,0.32421 -0.433875,0.32575 -0.433875,0.9475 0,0.61966 0.433875,0.95137 0.433874,0.32962 1.250579,0.33325 0.414732,0.002 0.781611,-0.0952 0.37007,-0.0971 0.695476,-0.29519 v 0.44322 q -0.338168,0.14974 -0.717807,0.22366 -0.37645,0.0739 -0.797563,0.0721 -1.081496,-0.005 -1.703594,-0.44239 -0.6221,-0.43968 -0.6221,-1.19377 0,-0.75618 0.6221,-1.18823 0.622098,-0.43414 1.703594,-0.42932 0.427494,0.002 0.803944,0.0792 0.379639,0.0753 0.711426,0.22583 z"
+ style="stroke-width:0.03506782"
id="path914"
inkscape:connector-curvature="0" />
<path
- d="m -21.466727,202.53026 q -0.357169,0 -0.48726,0.27994 -0.130756,0.27753 0.0035,0.7626 0.134213,0.48508 0.416798,0.76502 0.284331,0.27753 0.643914,0.27753 0.354756,0 0.484846,-0.27994 0.130087,-0.27995 -0.0035,-0.76261 -0.132874,-0.48024 -0.417875,-0.76019 -0.285665,-0.28235 -0.640421,-0.28235 z m -0.104166,-0.37648 q 0.579193,0 1.013982,0.37648 0.434785,0.37647 0.619075,1.04254 0.183622,0.66366 -0.04217,1.04255 -0.226457,0.37648 -0.80565,0.37648 -0.581607,0 -1.016396,-0.37648 -0.433041,-0.37889 -0.616663,-1.04255 -0.18429,-0.66607 0.03976,-1.04254 0.226457,-0.37648 0.808064,-0.37648 z"
- style="stroke-width:0.03269225"
+ d="m -21.466727,201.88591 q -0.357169,-0.002 -0.48726,0.20085 -0.130756,0.20068 0.0035,0.55306 0.134213,0.35238 0.416798,0.55666 0.284331,0.20253 0.643914,0.20413 0.354756,0.002 0.484846,-0.20086 0.130087,-0.20244 -0.0035,-0.55307 -0.132874,-0.34886 -0.417875,-0.55316 -0.285665,-0.20603 -0.640421,-0.20761 z m -0.104166,-0.27349 q 0.579193,0.003 1.013982,0.27754 0.434785,0.27496 0.619075,0.75882 0.183622,0.48211 -0.04217,0.75588 -0.226457,0.27202 -0.80565,0.26944 -0.581607,-0.003 -1.016396,-0.27755 -0.433041,-0.2767 -0.616663,-0.75881 -0.18429,-0.48387 0.03976,-0.75589 0.226457,-0.27202 0.808064,-0.26943 z"
+ style="stroke-width:0.02784052"
id="path916"
inkscape:connector-curvature="0" />
<path
- d="m -18.929377,200.90397 q -0.464482,0 -0.633659,0.34453 -0.170042,0.34157 0.0046,0.93855 0.174538,0.597 0.542027,0.94153 0.36976,0.34157 0.83738,0.34157 0.461344,0 0.630522,-0.34453 0.169172,-0.34454 -0.0046,-0.93857 -0.172796,-0.59104 -0.543427,-0.93558 -0.371496,-0.3475 -0.83284,-0.3475 z m -0.135463,-0.46334 q 0.753216,0 1.318639,0.46334 0.565417,0.46333 0.805078,1.28308 0.238792,0.81679 -0.05484,1.2831 -0.294497,0.46334 -1.047713,0.46334 -0.756353,0 -1.321776,-0.46334 -0.563152,-0.46631 -0.801944,-1.2831 -0.239661,-0.81975 0.05171,-1.28308 0.294497,-0.46334 1.05085,-0.46334 z"
- style="stroke-width:0.04135929"
+ d="m -18.929377,200.7178 q -0.464482,-0.002 -0.633659,0.24704 -0.170042,0.24695 0.0046,0.68066 0.174538,0.43373 0.542027,0.68522 0.36976,0.24936 0.83738,0.25144 0.461344,0.002 0.630522,-0.24705 0.169172,-0.24911 -0.0046,-0.68068 -0.172796,-0.4294 -0.543427,-0.68091 -0.371496,-0.25367 -0.83284,-0.25572 z m -0.135463,-0.33662 q 0.753216,0.003 1.318639,0.34188 0.565417,0.33853 0.805078,0.93409 0.238792,0.59341 -0.05484,0.93028 -0.294497,0.33471 -1.047713,0.33135 -0.756353,-0.003 -1.321776,-0.3419 -0.563152,-0.34068 -0.801944,-0.93409 -0.239661,-0.59556 0.05171,-0.93027 0.294497,-0.33471 1.05085,-0.33134 z"
+ style="stroke-width:0.03522132"
id="path918"
inkscape:connector-curvature="0" />
<path
- d="m -16.865342,201.16674 h 0.446462 l 0.613634,2.21783 1.002396,-1.16563 0.368688,0.19844 -0.885181,1.06613 1.891796,1.43833 h -0.579193 l -1.738414,-1.32008 0.365243,1.32008 h -0.446462 z"
- style="stroke-width:0.03269225"
+ d="m -16.865342,200.91755 0.446462,0.002 0.613634,1.61113 1.002396,-0.84087 0.368688,0.14556 -0.885181,0.76923 1.891796,1.05151 -0.579193,-0.003 -1.738414,-0.96507 0.365243,0.95896 -0.446462,-0.002 z"
+ style="stroke-width:0.02784052"
id="path920"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccc" />
<path
- d="m -13.4376,201.37704 h 0.582962 v 2.7029 H -13.4376 Z m 0,-1.0522 h 0.582962 l 0.132292,0.59537 -0.715254,-0.0331 z"
- style="stroke-width:0.03745848"
+ d="m -13.4376,201.08531 0.582962,0.003 v 1.96017 l -0.582962,-0.003 z m 0,-0.76306 0.582962,0.003 0.132292,0.43236 -0.715254,-0.0272 z"
+ style="stroke-width:0.03189941"
id="path922"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
- d="m -8.6028135,202.61748 v 0.2172 h -2.6803615 c 0.02535,0.30568 0.145741,0.53896 0.361184,0.69985 0.217554,0.15928 0.519596,0.23892 0.906126,0.23892 0.223892,0 0.440391,-0.0209 0.649497,-0.0627 0.2112179,-0.0418 0.4203237,-0.10455 0.6273175,-0.18824 v 0.41991 c -0.2091057,0.0676 -0.4234922,0.11906 -0.6431595,0.15445 -0.2196665,0.0354 -0.4425018,0.0531 -0.668506,0.0531 -0.566065,0 -1.014904,-0.12549 -1.346517,-0.37648 -0.329501,-0.25098 -0.494251,-0.59045 -0.494251,-1.01841 0,-0.44244 0.156302,-0.79318 0.468906,-1.05221 0.314715,-0.26063 0.738207,-0.39095 1.270477,-0.39095 0.4773537,0 0.8543785,0.11745 1.1310746,0.35234 0.2788086,0.23329 0.4182129,0.55104 0.4182129,0.95326 z m -0.8310103,-0.24608 c -0.0042,-0.24294 0.1540791,-0.32105 -0.021256,-0.46585 -0.1731991,-0.14479 -0.403427,-0.21719 -0.6906832,-0.21719 -0.325276,0 -0.586131,0.07 -0.782564,0.20995 -0.194321,0.13997 0.0079,0.2213 -0.02164,0.4755 z"
- style="stroke-width:0.03745848"
+ d="m -8.6028135,202.00641 v 0.15752 l -2.6803615,-0.0119 c 0.02535,0.2218 0.145741,0.39151 0.361184,0.50915 0.217554,0.11648 0.519596,0.17558 0.906126,0.1773 0.223892,9.9e-4 0.440391,-0.0132 0.649497,-0.0426 0.2112179,-0.0294 0.4203237,-0.0739 0.6273175,-0.13373 v 0.30453 c -0.2091057,0.0481 -0.4234922,0.0845 -0.6431595,0.10915 -0.2196665,0.0247 -0.4425018,0.0365 -0.668506,0.0355 -0.566065,-0.003 -1.014904,-0.0955 -1.346517,-0.27902 -0.329501,-0.18348 -0.494251,-0.4304 -0.494251,-0.74076 0,-0.32087 0.156302,-0.57453 0.468906,-0.76099 0.314715,-0.18761 0.738207,-0.28024 1.270477,-0.27787 0.4773537,0.002 0.8543785,0.089 1.1310746,0.26055 0.2788086,0.17043 0.4182129,0.40149 0.4182129,0.69318 z m -0.8310103,-0.18216 c -0.0042,-0.1762 0.1540791,-0.23214 -0.021256,-0.33793 -0.1731991,-0.10578 -0.403427,-0.1593 -0.6906832,-0.16058 -0.325276,-0.001 -0.586131,0.0481 -0.782564,0.14877 -0.194321,0.10065 0.0079,0.16053 -0.02164,0.34474 z"
+ style="stroke-width:0.03189941"
id="path924"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccsccccscscscccccsccc" />
<path
- d="m -5.1228851,200.82694 v 0.53064 c -0.1817981,-0.0927 -0.3705884,-0.16546 -0.5663711,-0.21839 -0.1957826,-0.0529 -0.3985574,-0.0859 -0.6083245,-0.099 -0.3193121,-0.0199 -0.5593788,0.008 -0.7202002,0.0831 -0.1584907,0.0755 -0.1219808,0.19862 -0.1219808,0.36939 0,0.13013 -0.058652,0.23637 0.055554,0.31873 0.1142066,0.0804 0.343785,0.16484 0.6887353,0.25348 l 0.2202553,0.0565 c 0.4568261,0.11395 0.7807998,0.25518 0.9719209,0.42368 0.1934518,0.16661 0.2901777,0.38918 0.2901777,0.66771 0,0.31717 -0.1445062,0.55922 -0.4335186,0.72617 -0.2866815,0.16709 -0.6817428,0.28451 -1.1851839,0.25304 -0.2097671,-0.0131 -0.1146644,0.0546 -0.4919054,-0.0132 -0.4245198,-0.0652 -0.6138119,-6.7e-4 -0.8820689,-0.33567 l 0.3141927,-0.46368 c 0.2377361,0.12261 0.1577833,0.10281 0.388527,0.17214 0.2307438,0.0672 0.4591568,0.1079 0.6852391,0.12203 0.3029969,0.0189 0.5360714,-0.0112 0.6992236,-0.0905 0.1631521,-0.0813 0.2447282,-0.20428 0.2447282,-0.36895 0,-0.15249 -0.059434,-0.27311 -0.178302,-0.36186 -0.1165373,-0.0886 -0.3740847,-0.18296 -0.772642,-0.28313 l -0.2237516,-0.0597 c -0.3985574,-0.0981 -0.6864044,-0.22794 -0.863541,-0.38945 -0.1771366,-0.16355 -0.2657049,-0.37748 -0.2657049,-0.64179 0,-0.32123 0.1305217,-0.56111 0.3915651,-0.71964 0.2610434,-0.15852 0.6316318,-0.22277 1.1117653,-0.19275 0.2377361,0.0149 0.4614877,0.0441 0.6712548,0.0877 0.2097671,0.0436 0.4032189,0.10144 0.5803555,0.17352 z"
- style="stroke-width:0.04423349"
+ d="m -5.1228851,200.72338 v 0.38482 c -0.1817981,-0.068 -0.3705884,-0.12164 -0.5663711,-0.1609 -0.1957826,-0.0392 -0.3985574,-0.0641 -0.6083245,-0.0745 -0.3193121,-0.0159 -0.5593788,0.003 -0.7202002,0.0571 -0.1584907,0.0541 -0.1219808,0.1435 -0.1219808,0.26734 0,0.0944 -0.058652,0.17116 0.055554,0.2314 0.1142066,0.0588 0.343785,0.12107 0.6887353,0.18689 l 0.2202553,0.042 c 0.4568261,0.0847 0.7807998,0.18853 0.9719209,0.31158 0.1934518,0.12169 0.2901777,0.28353 0.2901777,0.48552 0,0.23002 -0.1445062,0.40491 -0.4335186,0.5247 -0.2866815,0.1199 -0.6817428,0.2033 -1.1851839,0.17823 -0.2097671,-0.0104 -0.1146644,0.0391 -0.4919054,-0.0118 -0.4245198,-0.0492 -0.6138119,-0.003 -0.8820689,-0.24736 l 0.3141927,-0.33486 c 0.2377361,0.09 0.1577833,0.0753 0.388527,0.12656 0.2307438,0.0498 0.4591568,0.0803 0.6852391,0.0916 0.3029969,0.0151 0.5360714,-0.006 0.6992236,-0.0625 0.1631521,-0.0582 0.2447282,-0.14706 0.2447282,-0.26648 0,-0.11059 -0.059434,-0.19833 -0.178302,-0.26322 -0.1165373,-0.0648 -0.3740847,-0.13435 -0.772642,-0.20876 l -0.2237516,-0.0443 c -0.3985574,-0.0729 -0.6864044,-0.16836 -0.863541,-0.28627 -0.1771366,-0.1194 -0.2657049,-0.27494 -0.2657049,-0.46662 0,-0.23296 0.1305217,-0.40634 0.3915651,-0.52015 0.2610434,-0.1138 0.6316318,-0.15874 1.1117653,-0.13484 0.2377361,0.0119 0.4614877,0.034 0.6712548,0.0666 0.2097671,0.0326 0.4032189,0.0754 0.5803555,0.12842 z"
+ style="stroke-width:0.03766897"
id="path926"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccsccccsccccccccsccccsccscc" />
diff --git a/src/ComputerscareILoveCookies.cpp b/src/ComputerscareILoveCookies.cpp
@@ -10,7 +10,7 @@
struct ComputerscareILoveCookies;
-const int numFields = 3;
+const int numFields = 6;
const int numKnobRows = 13;
const int numKnobColumns = 2;
const int numInputRows = 13;
@@ -86,7 +86,7 @@ struct ComputerscareILoveCookies : Module {
CLOCK_INPUT,
RESET_INPUT = CLOCK_INPUT + numFields,
SIGNAL_INPUT = RESET_INPUT + numFields ,
- NUM_INPUTS = RESET_INPUT+ numInputs
+ NUM_INPUTS = SIGNAL_INPUT + numInputs
};
enum OutputIds {
TRG_OUTPUT,
@@ -309,7 +309,7 @@ void ComputerscareILoveCookies::step() {
knobRawValue = params[SIGNAL_INPUT + activeKnobIndex[i]].value;
}
else {
- knobRawValue = inputs[SIGNAL_INPUT + activeKnobIndex[i] - 25].value;
+ knobRawValue = inputs[SIGNAL_INPUT + activeKnobIndex[i] - 26].value;
}
outputs[TRG_OUTPUT + i].value = mapKnobValue(knobRawValue,i);
@@ -405,7 +405,7 @@ void MyTextFieldCookie::onTextChange() {
struct ComputerscareILoveCookiesWidget : ModuleWidget {
double verticalSpacing = 18.4;
- int verticalStart = 80;
+ int verticalStart = 24;
double xStart = 41;
int index=0;
int inputindex=0;
