updated nightwatch tests

nightwatch.json

@@ -3,7 +3,7 @@
   
   test_settings: {
     default: {
-      launch_url: 'https://8bitworkshop.com',
+      launch_url: 'https://sehugg.github.io/8bitworkshop/'
     },
 
     safari: {

presets/c64/sidmacros.h

@@ -40,11 +40,11 @@
 
 // play a quick square wave pulse
 #define SID_PULSE_DECAY(voice, freq) \
-  SID_STOP(voice) \
+  SID_STOP(voice,0) \
   SID_FREQ(voice,freq); \
   SID_PULSEWIDTH(voice,0x200); \
-  SID_ADSR(voice,8,8,0,4); \
-  SID_WAVE(voice,SID_SQUARE|SID_GATE); \
+  SID_ADSR(voice,3,8,0,4); \
+  SID_START(voice,SID_SQUARE); \
 
 // play a tone if one is not already playing
 #define SID_PLAY_TONE(freq) \

presets/pce/skeleton.cc65

@@ -0,0 +1,14 @@
+
+#include <conio.h>
+#include <peekpoke.h>
+
+int tmp; // need at least 1 variable
+
+int main() {
+  clrscr();
+  bgcolor(COLOR_BLUE);
+  textcolor(COLOR_WHITE);
+  cputs("\r\n*** HELLO WORLD! ***");
+  while (1) ;
+  return 0;
+}

presets/williams/skeleton.cmoc

@@ -0,0 +1,23 @@
+
+#include "williams.h"
+//#link "williams.c"
+
+int main(void) {
+  byte i;
+  
+  // write to graphics ROM
+  rom_select = 1;
+  // set palette
+  for (i=0; i<16; i++)
+    palette[i] = (byte)(i*7);
+  // draw a rectangle
+  blit_solid(0, 0, 152, 255, 0x1f);
+  
+  // main loop
+  while (1) {
+    watchdog0x39 = 0x39;
+    // code here
+  }
+  
+  return 0;
+}

src/common/baseplatform.ts

@@ -642,7 +642,8 @@ export function getToolForFilename_6809(fn:string) : string {
   if (fn.endsWith(".c")) return "cmoc";
   if (fn.endsWith(".h")) return "cmoc";
   if (fn.endsWith(".xasm")) return "xasm6809";
-  return "lwasm";
+  if (fn.endsWith(".lwasm")) return "lwasm";
+  return "cmoc";
 }
 
 export abstract class Base6809Platform extends BaseZ80Platform {

test/web/testallpresets.js

@@ -91,7 +91,12 @@ function testPlatform(exports, platform_id, platform_name, numPresets) {
 var ex = module.exports;
 ex['@tags'] = []
 
-testPlatform(ex, 'vcs', 'Atari 2600', 35);
+//testPlatform(ex, 'williams', 'Williams', 4);
+//testPlatform(ex, 'pce', 'PC Engine', 2);
+testPlatform(ex, 'atari8-5200', 'Atari 5200', 3);
+testPlatform(ex, 'cpc.6128', 'Amstrad CPC6128', 8);
+
+testPlatform(ex, 'vcs', 'Atari 2600', 36);
 testPlatform(ex, 'nes', 'NES', 30);
 testPlatform(ex, 'vicdual', 'VIC Dual', 7);
 testPlatform(ex, 'mw8080bw', 'Midway 8080', 3);
@@ -102,7 +107,7 @@ testPlatform(ex, 'williams-z80', 'Williams (Z80)', 3);
 testPlatform(ex, 'coleco', 'ColecoVision', 12);
 //testPlatform(ex, 'sms-sg1000-libcv', 'Sega SG-1000', 3);
 testPlatform(ex, 'sms-sms-libcv', 'Sega Master System', 2);
-testPlatform(ex, 'atari7800', 'Atari 7800', 1);
+testPlatform(ex, 'atari7800', 'Atari 7800', 4);
 testPlatform(ex, 'astrocade', 'Bally Astrocade', 12);
 testPlatform(ex, 'verilog', 'Verilog', 33);
 testPlatform(ex, 'apple2', 'Apple ][+', 10);
@@ -110,5 +115,5 @@ testPlatform(ex, 'basic', 'BASIC', 10);
 testPlatform(ex, 'zmachine', 'Z-Machine', 19);
 testPlatform(ex, 'msx', 'MSX', 5);
 //testPlatform(ex, 'zx', 'ZX', 3);
-testPlatform(ex, 'c64', 'Commodore 64', 15);
+testPlatform(ex, 'c64', 'Commodore 64', 16);
 testPlatform(ex, 'atari8-800', 'Atari 800', 9);