Merge branch 'master' of github.com:sehugg/8bitworkshop

css/ui.css

@@ -237,3 +237,10 @@ canvas.pixelated {
     font-family: TinyFont;
     src: url(04B_03__.TTF);
 }
+#booksMenuButton {
+  border-width:3px;
+  border-color:#99ff99;
+  background-color:#006600;
+  border-style:solid;
+  font-family: "Andale Mono", "Menlo", "Lucida Console", monospace;  
+}

index.html

@@ -27,6 +27,7 @@ body {
 <script>
 window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
 ga('create', 'UA-54497476-9', 'auto');
+ga('set', 'anonymizeIp', true);
 ga('send', 'pageview');
 </script>
 <script async src='https://www.google-analytics.com/analytics.js'></script>
@@ -51,12 +52,14 @@ ga('send', 'pageview');
           <li><a class="dropdown-item" href="#" id="item_debug_expr">Break Expression...</a></li>
         </ul>
       </li>
+      <!--
       <li class="dropdown dropdown-submenu">
         <a tabindex="-1" href="#">Options</a>
         <ul class="dropdown-menu">
           <li><i id="item_low_power_check" style="display:hidden" class="fa fa-check"></i><a class="dropdown-item" href="#" id="item_low_power">Low Power Mode</a></li>
         </ul>
       </li>
+      -->
       <hr>
       <li class="dropdown dropdown-submenu">
          <a tabindex="-1" href="#">Platform</a>
@@ -103,8 +106,8 @@ ga('send', 'pageview');
     <button id="dbg_bitmap" type="submit" title="Edit Bitmap"><span class="glyphicon glyphicon-camera" aria-hidden="true"></span></button>
   </span>
   <span class="dropdown" style="float:right">
-    <a class="btn btn-secondary dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <i>Want a book?</i> <span class="caret"></span>
+    <a class="btn btn-secondary dropdown-toggle" id="booksMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      GET BOOKS <span class="caret"></span>
     </a>
     <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenuButton">
       <li>
@@ -146,7 +149,8 @@ ga('send', 'pageview');
   </div>
 </div>
 <div class="twitbtn">
-  <a href="https://twitter.com/8bitworkshop" class="twitter-follow-button" data-show-count="false">Follow @8bitworkshop</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+  <a href="https://twitter.com/8bitworkshop" class="twitter-follow-button" data-show-count="false">Follow @8bitworkshop</a>
+  <!--<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>-->
 </div>
 <div id="pixeditback" class="pixeditback" style="display:none">
   <iframe id="pixeditframe" src="pixels.html">

presets/verilog/femto16.json

@@ -1,5 +1,5 @@
 {
-  "name":"femto8",
+  "name":"femto16",
   "width":16,
   "vars":{
     "reg":{"bits":3, "toks":["ax", "bx", "cx", "dx", "ex", "fx", "sp", "ip"]},
@@ -27,7 +27,7 @@
     {"fmt":"rts",                "bits":["01001","111","00001","110"]},
     {"fmt":"mov ~reg,[~reg+~imm5]", "bits":["01001",0,2,1]},
     {"fmt":"jsr ~reg",           "bits":["01110","111","00",0,"110"]},
-    {"fmt":"jsr ~imm16",         "bits":["0001110001011000",0,"0111011100100110"]},
+    {"fmt":"jsrex ~imm16",       "bits":["0001110001011000",0,"0111011100100110"]},
     {"fmt":"jmp ~imm16",         "bits":["0001111101011000",0]},
 
     {"fmt":"bcc ~rel8",          "bits":["10000001",0]},

redir.html

@@ -1,4 +1,4 @@
 <script>
-var VERSION = '2.1.0';
+var VERSION = '2.1.1';
 document.location.href = 'v' + VERSION + '/' + document.location.search;
 </script>

src/platform/verilog.js

@@ -697,7 +697,7 @@ var VerilogPlatform = function(mainElement, options) {
         val = gen[name];
       }
     }
-    if (val !== undefined) {
+    if (typeof(val) === 'number') {
       inspect_obj = gen;
       inspect_sym = name;
     } else {