commit 6b1519c38b5c8a48e138ba02defaaa4b8528e46e
parent 0411826792c4e7c3021ad74c2b8e1f83fd39217c
Author: Adam M <aemalone@gmail.com>
Date: Mon, 22 Jul 2019 20:01:22 -0500
Debug defaults to internal clock, poly in. Soly pequencer panel
Diffstat:
3 files changed, 200 insertions(+), 37 deletions(-)
diff --git a/res/ComputerscareSolyPequencerPanel.svg b/res/ComputerscareSolyPequencerPanel.svg
@@ -26,9 +26,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6568542"
- inkscape:cx="31.605912"
- inkscape:cy="11.585765"
+ inkscape:zoom="7.9999999"
+ inkscape:cx="50.536891"
+ inkscape:cy="133.17232"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -142,7 +142,7 @@
<path
inkscape:connector-curvature="0"
id="path1647"
- d="m 8.8786219,205.72349 -7.3856972,-7.67753 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 -0.0109,-89.15307 z"
+ d="m 8.8786219,205.72349 -7.3856972,-7.67753 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 0.01249,-88.38133 z"
style="opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26300001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
sodipodi:nodetypes="cccccccccc" />
<g
@@ -276,13 +276,13 @@
</g>
<path
style="fill:#232224;fill-opacity:1;stroke:none;stroke-width:0.45396167;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.875695,207.83696 -2.140959,-2.63132 0.05706,5.65713 1.081142,1.37551 1.021259,0.21155 z"
+ d="m 15.875695,208.46838 -2.140959,-1.27492 0.05706,3.66931 -0.03904,5.83331 2.157977,1.62419 z"
id="path890"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
style="fill:#626262;fill-opacity:1;stroke:none;stroke-width:0.53296405;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 2.2225712,212.93295 -2.23118397,-2.11202 13.83580977,0.0312 2.067982,1.59753 c -4.541363,0.0382 -9.1311339,0.46226 -13.6726078,0.48329 z"
+ d="m 2.1729618,218.74555 -2.18157457,-2.10375 13.79446877,0.0312 2.125859,1.65541 c -4.541363,0.0382 -9.1972793,0.39611 -13.7387532,0.41714 z"
id="path892"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -299,8 +299,8 @@
d="m 12.21722,200.01556 -1.378965,-2.08751 2.256069,12.63711 0.90751,-1.44959 -1.20706,-1.83862 z"
style="fill:#232224;fill-opacity:1;stroke:none;stroke-width:0.45396167;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- style="fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.35857278;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 13.793636,210.85176 H 0.00223215 v -14.39343 l 10.87037685,1.5241 1.226368,6.92469 1.647887,0.30098 z"
+ style="fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.40790954;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 13.7771,216.68913 -13.74179493,-0.0661 -0.03307292,-20.16465 10.87037685,1.97236 1.879558,8.49006 1.011234,0.29029 z"
id="rect888"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
@@ -326,18 +326,20 @@
id="path1633"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.28265628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 0.77497724,206.17393 c -0.21079704,1.31704 0.31832126,2.57987 0.36898096,3.87465 l -0.042097,0.11458 -0.083381,0.0608"
+ style="fill:none;stroke:#000000;stroke-width:0.35499159px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 0.71211567,206.18569 c -0.19802439,2.21138 0.39257783,4.70592 0.44016793,6.87993 l -0.039546,0.19239 -0.078329,0.10208"
id="path1635"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.28265628px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 0.72627707,205.74819 c 0.99512053,-0.4537 1.60593333,1.02281 0.59836493,1.48704 -0.1244108,0.0663 -0.2793367,0.0703 -0.40354445,5e-5"
+ style="fill:none;stroke:#000000;stroke-width:0.35499159px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 0.3155751,205.65794 c 0.934824,-0.76178 1.9529619,1.90445 1.0064443,2.68391 -0.1168725,0.11132 -0.2624111,0.11804 -0.37909283,9e-5"
id="path1637"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.33277225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 2.1895779,208.43752 c 1.155794,0.6895 0.702551,-2.24024 -0.02302,-1.21371 -0.200691,0.64205 0.41255,2.89089 0.99322,2.45778"
+ style="fill:none;stroke:#000000;stroke-width:0.29588765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 2.6300384,209.08037 c 1.5418737,0.49796 1.3904683,-0.82278 -0.3484038,-0.82977 0.037873,0.46368 0.4186778,2.18135 1.465247,1.58792"
id="path1639"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
@@ -353,8 +355,8 @@
id="path1643"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.28133062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 6.7256583,207.41227 c 1.4939649,0.001 -0.2027078,-4.34876 -0.1209045,-0.79246 -7.63e-5,1.41379 0.1632224,3.56506 0.7756224,3.04645"
+ style="fill:none;stroke:#000000;stroke-width:0.23246273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 6.7109315,206.6077 c 1.5829777,6.4e-4 -0.2147854,-2.80223 -0.1281081,-0.51064 -8.09e-5,0.91101 0.1729474,2.29723 0.8218351,1.96305"
id="path1645"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
@@ -370,13 +372,172 @@
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:0.39676842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 11.252094,206.83762 c 0.576519,0.91086 1.176054,-1.33663 0.355682,-1.49446 -0.683905,0.56373 -0.251284,3.80213 0.475209,3.06977"
+ d="m 11.252094,207.89596 c 0.576519,0.91086 1.176054,-1.33663 0.355682,-1.49446 -0.683905,0.56373 -0.251284,3.80213 0.475209,3.06977"
id="path1654"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 12.495165,206.62702 c 0.08155,1.77706 0.217194,5.94542 0.27671,1.85978 -0.03845,-1.23262 0.665576,-2.46324 0.644736,-0.70153"
+ style="fill:none;stroke:#000000;stroke-width:0.27500001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 12.495165,207.68536 c 0.08155,1.77706 0.217194,5.94542 0.27671,1.85978 -0.03845,-1.23262 0.665576,-2.46324 0.644736,-0.70153"
id="path1656"
inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.28861994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 3.0836878,220.27173 c -0.0814,0.52459 -0.060991,1.04971 -0.059031,1.57513 0.1564184,0.0683 0.3039006,0.32754 0.6521662,0.22316"
+ id="path878"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.66578078px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 3.4287563,219.92988 c -0.071878,-0.0983 -0.1437514,-0.1965 -0.2156277,-0.29475"
+ id="path880"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.33870441px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 5.0082081,219.94329 c -0.036028,0.65341 0.044072,1.3072 0.1782408,1.95529 0.00522,0.0728 -0.010421,0.35039 -0.026556,0.14689 -0.072506,-0.25278 -0.1735132,-0.50353 -0.1962996,-0.76093 -0.04263,-0.2971 -0.021933,-0.59585 0.01802,-0.89217 0.00443,-0.23047 -0.1117492,-0.47801 0.054518,-0.69597 0.1694239,-0.13388 0.4803815,-0.0664 0.6921305,-0.0146 0.4013802,0.10402 0.5003542,0.39355 0.5487257,0.62911 0.032613,0.22884 0.099401,0.45521 0.088449,0.6855 0.00617,0.37747 0.096748,0.75125 0.1723549,1.12492 0.00774,0.0339 -0.00406,0.0678 -0.00558,0.10174"
+ id="path882"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.33870441px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.382739,223.21153 c 0.047823,-0.61032 -0.4166338,-1.18137 -0.4437309,-1.78962 -0.1562586,-0.61478 -0.4313906,-1.26478 -0.2973855,-1.87031 0.7290356,0.27312 1.5385827,0.582 1.9306415,1.08123 0.6108979,0.37408 -0.1134002,0.81899 -0.8180991,0.60632 -0.2668374,0.0146 -0.5439416,0.0869 -0.8068549,0.0181"
+ id="path884"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.3623476px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.573535,219.65318 c 0.0024,0.45072 -0.0046,0.90145 0.003,1.35216 0.18021,0.23021 0.403964,0.44675 0.558954,0.68217 0.112119,0.18963 0.425715,0.12429 0.368139,-0.0656 0.195838,-0.23747 0.131491,-0.51343 0.142698,-0.7718 0.0037,-0.34219 0.09668,-0.68261 0.04718,-1.02713 -0.04899,-0.26698 -0.07205,0.15913 0.04682,0.24756 0.07978,0.53184 0.15333,1.06577 0.287924,1.59446 0.07478,0.16006 0.188929,0.31588 0.205143,0.48386"
+ id="path886"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30707172px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 13.384908,219.20166 c 0.203265,1.01892 1.074412,1.97363 0.948718,3.01822 l -0.07075,0.11513"
+ id="path888"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30707172px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 12.67147,219.81284 c 0.823667,0.0157 1.674547,-0.0614 2.469754,0.10794"
+ id="path891"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 2.621624,252.55505 c -0.065409,0.47474 -0.022356,1.33557 0.6400775,1.47216 0.162629,-0.20355 0.1130047,-0.90165 0.5104206,-0.40316 0.1702045,0.28356 0.9320486,0.63113 0.7615895,0.0439 -0.063023,-0.46165 -0.4395936,-0.85648 -0.5454651,-1.3101"
+ id="path933"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 5.3989459,252.06034 c 0.152493,0.49868 -0.2688132,1.16754 0.1615141,1.56479 0.25561,-0.16213 0.4569186,-0.21879 0.3927241,0.0999 0.022162,0.24743 -0.010504,0.49585 0.01886,0.74306"
+ id="path935"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 7.4268317,253.44551 c -0.6857631,-0.36163 -0.9347316,0.62862 -0.3223544,0.77766 0.3479304,-0.0347 0.1983259,-0.94541 0.5891504,-0.45478 0.081982,0.1476 0.1544488,0.30645 0.1299677,0.46874"
+ id="path937"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.925704,251.99439 c 0.011876,0.75986 -0.082318,1.51742 -0.1322538,2.27566"
+ id="path939"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.1321834,252.85187 c 0.5736132,-0.0234 1.1460005,0.03 1.7192965,0.033"
+ id="path941"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.36812016px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 11.529772,252.43643 c -0.451331,-0.4463 -1.126724,0.12446 -1.045907,0.82423 0.101079,0.42342 0.681047,0.90512 0.0192,0.98372 -0.07664,0.0266 -0.154174,0.0484 -0.231771,0.0697"
+ id="path943"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 12.276124,252.58803 c 0,0.56066 0,1.12133 0,1.68199"
+ id="path945"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 11.570772,253.34658 c 0.48493,0 0.969859,0 1.454789,0"
+ id="path947"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.36740503px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 13.483745,253.50664 c 0.734015,0.31023 0.315102,-1.48666 -0.0508,-0.67167 -0.02035,0.52544 0.137977,1.43168 0.709033,1.28722"
+ id="path949"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.36429957px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 14.79555,254.45133 c -0.504086,-0.577 -0.309243,-1.92546 0.302655,-2.21867 0.368049,0.31408 0.0293,1.07258 -0.384569,1.00441"
+ id="path951"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 5.2666927,255.49029 c -6e-5,0.41771 9.08e-5,0.83541 0,1.25311"
+ id="path953"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 4.9734244,255.13919 c 0.1585893,0.0781 0.2775687,-0.16985 0.4255221,-0.14362"
+ id="path957"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 6.3688046,254.7977 c 0.2229155,0.54551 -0.3395449,1.16102 0.135265,1.6646 0.1039566,0.088 0.246037,0.146 0.3937594,0.1821"
+ id="path959"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 5.9279598,255.55625 c 0.4555396,0 0.9110791,0 1.3666187,0"
+ id="path961"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.30504221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.7052817,255.65519 c -0.7959951,-0.25723 -0.7158936,0.5229 -0.5494473,0.85345 -0.1138271,0.16086 -0.4090092,0.09 -0.5967554,0.07"
+ id="path963"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.44280794px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.757822,255.24076 c -1.1291446,-0.33089 -0.534985,1.70389 0.128701,0.93518 0.07346,-0.31357 0.0115,-0.64403 -0.128701,-0.93518 z"
+ id="path965"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.42866045px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 11.845576,255.02273 c -0.217659,0.28593 -0.212537,2.38973 0.361024,0.54333 0.636876,-0.50558 0.840328,1.00834 0.292072,1.24519"
+ id="path967"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.45176771px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 2.8905938,257.7988 c 0,0.60557 0,1.21115 0,1.81672"
+ id="path969"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.27024093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 4.1246763,258.09747 c 0.3897109,-10e-6 0.7794214,-10e-6 1.169132,0"
+ id="path971"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.252;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="m 7.5447786,257.87132 c -0.9654836,-0.17879 -1.2100077,0.47158 -0.5515295,0.73354 0.4462201,0.16845 1.0804473,0.82094 0.00939,0.63895 -0.946081,-0.31247 0.09619,-0.7317 0.6546603,-0.93264 0.2439913,-0.13505 0.2083943,-0.34833 -0.1125159,-0.43985 z"
+ id="path973"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.29085138px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.381016,257.46129 c -0.30176,-0.85354 -1.2367587,1.982 0.234546,0.57278 -0.6846658,-1.41323 0.535507,0.39935 0.473859,0.55274 0.155046,0.3485 -0.24995,0.66457 -0.763448,0.50445"
+ id="path977"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.24730319px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 11.94493,258.19202 c 0.285628,0 0.571257,0 0.856884,0"
+ id="path979"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.34039551px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 13.418529,256.40315 c -0.05385,0.58148 0.110282,1.94477 -0.08702,2.51206"
+ id="path981"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.34039551px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 15.071771,257.20914 c -0.65677,-0.19168 -1.043095,0.57137 -0.936417,1.10001 -0.18685,0.73063 1.035432,1.0452 1.012765,0.25482 -0.203001,-0.28931 -0.587313,-0.44638 -0.946448,-0.39759"
+ id="path983"
+ inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/src/ComputerscareDebug.cpp b/src/ComputerscareDebug.cpp
@@ -46,8 +46,8 @@ struct ComputerscareDebug : Module {
int clockChannel = 0;
int inputChannel = 0;
- int clockMode = 0;
- int inputMode = 0;
+ int clockMode = 1;
+ int inputMode = 2;
int stepCounter = 0;
dsp::SchmittTrigger clockTriggers[NUM_LINES];
@@ -65,8 +65,8 @@ struct ComputerscareDebug : Module {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
configParam(MANUAL_TRIGGER, 0.0f, 1.0f, 0.0f, "Manual Trigger");
configParam(MANUAL_CLEAR_TRIGGER, 0.0f, 1.0f, 0.0f, "Clear");
- configParam(SWITCH_VIEW, 0.0f, 2.0f, 0.0f, "Input Mode");
- configParam(WHICH_CLOCK, 0.0f, 2.0f, 0.0f, "Clock Mode");
+ configParam(SWITCH_VIEW, 0.0f, 2.0f, 2.0f, "Input Mode");
+ configParam(WHICH_CLOCK, 0.0f, 2.0f, 1.0f, "Clock Mode");
configParam(CLOCK_CHANNEL_FOCUS, 0.f, 15.f, 0.f, "Clock Channel Selector");
configParam(INPUT_CHANNEL_FOCUS, 0.f, 15.f, 0.f, "Input Channel Selector");
diff --git a/src/ComputerscareSolyPequencer.cpp b/src/ComputerscareSolyPequencer.cpp
@@ -136,32 +136,34 @@ struct ComputerscareSolyPequencerWidget : ModuleWidget {
}
- addLabeledKnob("Steps", 10, 124, module, 0, 0, 0);
- stepNumberGrid(-1,70,13,15,module);
+ addOutput(createOutput<PointingUpPentagonPort>(Vec(14, 48), module, ComputerscareSolyPequencer::POLY_OUTPUT));
+
+ addLabeledKnob("Steps", 10, 124, module, 0, 0, 0);
+ stepNumberGrid(1,230,30,15,module);
- addInput(createInput<InPort>(Vec(14, 44), module, ComputerscareSolyPequencer::POLY_INPUT));
+ addInput(createInput<InPort>(Vec(19, 102), module, ComputerscareSolyPequencer::POLY_INPUT));
- addParam(createParam<ComputerscareClockButton>(Vec(14, 150), module, ComputerscareSolyPequencer::MANUAL_CLOCK_BUTTON));
- addInput(createInput<InPort>(Vec(14, 164), module, ComputerscareSolyPequencer::CLOCK_INPUT));
- addParam(createParam<ComputerscareResetButton>(Vec(14, 210), module, ComputerscareSolyPequencer::MANUAL_RESET_BUTTON));
- addInput(createInput<InPort>(Vec(14, 224), module, ComputerscareSolyPequencer::RESET_INPUT));
+ addParam(createParam<ComputerscareClockButton>(Vec(10, 130), module, ComputerscareSolyPequencer::MANUAL_CLOCK_BUTTON));
+ addInput(createInput<InPort>(Vec(10, 144), module, ComputerscareSolyPequencer::CLOCK_INPUT));
+ addParam(createParam<ComputerscareResetButton>(Vec(30, 168), module, ComputerscareSolyPequencer::MANUAL_RESET_BUTTON));
+ addInput(createInput<InPort>(Vec(30, 182), module, ComputerscareSolyPequencer::RESET_INPUT));
- addOutput(createOutput<PointingUpPentagonPort>(Vec(21, 304), module, ComputerscareSolyPequencer::POLY_OUTPUT));
+
}
void stepNumberGrid(int x, int y, int xspacing, int yspacing, ComputerscareSolyPequencer *module) {
- for(int i = 0; i < 4; i++) {
- for(int j = 0; j < 4; j++) {
- psd = new PequencerSmallDisplay(i+j*4);
+ for(int i = 0; i < 2; i++) {
+ for(int j = 0; j < 8; j++) {
+ psd = new PequencerSmallDisplay(i*8+j);
psd->box.size = Vec(10, 10);
psd->box.pos = Vec(x +i*xspacing , y + j*yspacing);
- psd->fontSize = 16;
+ psd->fontSize = 18;
psd->textAlign = 18;
psd->textColor =nvgRGB(0x24, 0x44, 0x31);
psd->breakRowWidth = 20;
