Backport various fixes from expert

Author: Barry Silverman

index.html

@@ -43,7 +43,7 @@
 <br />
 Hit '>' to zoom in, '<' to zoom out
 <br />
-Right-click to scroll around
+Left-click and drag to scroll around
 <br />
 Enter your own program into the array of RAM
 <br />
@@ -70,19 +70,15 @@
 <p class="status" id="status">x: 0<br>y: 0</p>
 <table class="memtable" id="memtable"></table>
 </div>
-<div id="updateShow"> Show:
-  <input type="checkbox" name="0" id="updateShow0" onchange="updateShow(this.name,this.checked)" />(metal)
-  <input type="checkbox" name="1" id="updateShow1" onchange="updateShow(this.name,this.checked)" />(switched diffusion)
-  <input type="checkbox" name="3" id="updateShow3" onchange="updateShow(this.name,this.checked)" />(grounded diffusion)
-  <input type="checkbox" name="4" id="updateShow4" onchange="updateShow(this.name,this.checked)" />(powered diffusion)
-  <input type="checkbox" name="5" id="updateShow5" onchange="updateShow(this.name,this.checked)" />(polysilicon)
-  <input type="checkbox" name="2" id="updateShow2" onchange="updateShow(this.name,this.checked)" />(diode)
+<div id="updateShow">
 </div>
 <br />
 <br />
-Source code is available on GitHub: <a href="http://github.com/trebonian/visual6502">http://github.com/trebonian/visual6502</a>
+Source code is available on <a href="http://github.com/trebonian/visual6502">github visual6502</a>.
+Use the online <a href="http://www.6502asm.com/">emulator and assembler</a> from 6502asm.com
+and <a href="http://www.e-tradition.net/bytes/6502/disassembler.html">disassembler</a> from e-tradition.net
 <br />
-In addition to this JavaScript project, see our <a href="../python6502.html">Python-based simulator</a> which may be easier to customize, verify, and apply to the study of long programs.<br />
+For in-depth 6502 investigation and some more advanced features, try our <a href="/stage/JSSim/index.html">Experimenter's (Beta) version</a>.
 <br />
 <br />
 

macros.js

@@ -274,13 +274,36 @@ function chipStatus(){
                 ' fetch:'   + readBit('fetch') +
                 ' clearIR:' + readBit('clearIR') +
                 ' D1x1:'    + readBit('D1x1');
-        setStatus(machine1 + "<br>" + machine2);
+        setStatus(machine1 + "<br>" + machine2 + "<br>Hz: " + estimatedHz().toFixed(1));
 	if (loglevel>2 && ctrace) {
 		console.log(machine1 + " " + machine2 + " " + machine3 + " " + machine4 + " " + machine5);
 	}
 	selectCell(ab);
 }
 
+var prevHzTimeStamp=0;
+var prevHzCycleCount=0;
+var prevHzEstimate1=1;
+var prevHzEstimate2=1;
+var HzSamplingRate=10;
+function estimatedHz(){
+       if(cycle%HzSamplingRate!=3)
+               return prevHzEstimate1;
+       var HzTimeStamp = now();
+       var HzEstimate = (cycle-prevHzCycleCount+.01)/(HzTimeStamp-prevHzTimeStamp+.01);
+       HzEstimate=HzEstimate*1000/2; // convert from phases per millisecond to Hz
+       if(HzEstimate<5)
+               HzSamplingRate=5;  // quicker
+       if(HzEstimate>10)
+               HzSamplingRate=10; // smoother
+       prevHzEstimate2=prevHzEstimate1;
+       prevHzEstimate1=(HzEstimate+prevHzEstimate1+prevHzEstimate2)/3; // wrong way to average speeds
+       prevHzTimeStamp=HzTimeStamp;
+       prevHzCycleCount=cycle;
+       return prevHzEstimate1
+}
+
+
 function getMem(){
 	var res = Array();
 	for(var i=0;i<0x200;i++) res.push(mRead(i));

memtable.js

@@ -84,6 +84,6 @@ function unselectCell(){
 function cellEl(n){
 	var r = n>>4;
 	var c = n%16;
-	var e = table.children[r].children[c+1];
+	var e = table.childNodes[r].childNodes[c+1];
 	return e;
 }