6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

signal names on top, remove clk/reset from video, wave numbers at high zoom

This commit is contained in:
Steven Hugg 2018-09-12 15:26:27 -04:00
parent ba55a35325
commit 8ad8d0e88c
6 changed files with 22239 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3247
lib/w2ui-1.5.rc1.css Normal file
View File

File diff suppressed because one or more lines are too long

18953
lib/w2ui-1.5.rc1.js Normal file
View File

File diff suppressed because it is too large Load Diff

2
lib/w2ui-1.5.rc1.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

14
lib/w2ui-1.5.rc1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
src/platform/verilog.ts
View File

@ -585,6 +585,10 @@ var VerilogPlatform = function(mainElement, options) {
this.poweron();
// query output
this.hasvideo = gen.vsync !== undefined && gen.hsync !== undefined && gen.rgb !== undefined;
if (this.hasvideo) {
const IGNORE_SIGNALS = ['clk','reset'];
trace_signals = trace_signals.filter((v) => { return IGNORE_SIGNALS.indexOf(v.name)<0; }); // remove clk, reset
}
}
}
// replace program ROM, if using the assembler
@ -607,7 +611,7 @@ var VerilogPlatform = function(mainElement, options) {
this.waveview = null;
}
}
restartAudio() {
// stop/start audio
var hasAudio = gen && gen.spkr !== undefined && frameRate > 1;

25
src/waveform.ts
View File

@ -156,7 +156,7 @@ export class WaveformView {
}
setZoom(zoom : number) {
this.zoom = Math.max(1, zoom);
this.zoom = Math.max(1, Math.min(64, zoom));
this.clocksPerPage = Math.ceil(this.pageWidth/this.zoom); // TODO: refactor into other one
this.refresh();
}
@ -181,19 +181,30 @@ export class WaveformView {
// clear to black
ctx.clearRect(0, 0, canvas.width, canvas.height);
// draw waveform
ctx.strokeStyle = "#66ff66";
var b = 4;
var h2 = h-16-b;
ctx.strokeStyle = ctx.fillStyle = "#66ff66";
var fh = 12;
var b1 = fh+4;
var b2 = 4;
var h2 = h-b1-b2;
var yrange = ((1<<meta.len)-1) || 0;
var data = this.wfp.getSignalData(row, this.t0, Math.ceil(w/this.zoom));
this.clockMax = Math.max(this.clockMax, this.t0 + data.length);
var printvals = meta.len > 1 && this.zoom >= 32;
var ycen = b1+h2-1;
// draw waveform
ctx.beginPath();
var x = 0;
var y = 0;
var lastval = -1;
for (var i=0; i<data.length; i++) {
var val = data[i];
if (printvals && val != lastval) {
ctx.fillText(val.toString(), x+this.zoom/4, ycen);
}
lastval = val;
if (i>0)
ctx.lineTo(x,y);
y = b + (1.0 - data[i]/yrange) * h2;
y = b1 + (1.0 - val/yrange) * h2;
if (!isclk) x += this.zoom*(1/8);
if (i==0)
ctx.moveTo(x,y);
@ -217,7 +228,7 @@ export class WaveformView {
var val = data[this.tsel - this.t0];
ctx.textAlign = 'right';
if (val !== undefined) {
ctx.fillText(val.toString(), w-b*2, h);
ctx.fillText(val.toString(), w-fh, ycen);
}
}
// draw labels
@ -225,7 +236,7 @@ export class WaveformView {
ctx.textAlign = "left";
var name = meta.name;
name = name.replace(/__DOT__/g, "."); // make nicer name
ctx.fillText(name, 5, h-b);
ctx.fillText(name, 5, fh);
}
}