From f21f2d271f426d35ae377efda7b6467a1f7d2a70 Mon Sep 17 00:00:00 2001 From: mike h Date: Sat, 10 Feb 2024 19:07:04 +1100 Subject: [PATCH 1/3] refactor to manage includes --- Pico_6502_v4_ehbasic/Pico_6502_v4_ehbasic.ino | 8 ++++---- Pico_6502_v4_ehbasic/ehbasic.cpp | 2 +- Pico_6502_v4_ehbasic/ehbasic.h | 3 +-- Pico_6502_v4_ehbasic/roms.h | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Pico_6502_v4_ehbasic/Pico_6502_v4_ehbasic.ino b/Pico_6502_v4_ehbasic/Pico_6502_v4_ehbasic.ino index 46b9adc..771d9e4 100644 --- a/Pico_6502_v4_ehbasic/Pico_6502_v4_ehbasic.ino +++ b/Pico_6502_v4_ehbasic/Pico_6502_v4_ehbasic.ino @@ -4,11 +4,11 @@ Inspired by work http://www.8bitforce.com/blog/2019/03/12/retroshield-6502-operation/ */ +#include +//#include -#include "pico/stdio.h" - -#include "pico/stdlib.h" -#include "pico/time.h" +//#include "pico/stdlib.h" +//#include "pico/time.h" #include "mos65C02.h" #include "memory.h" diff --git a/Pico_6502_v4_ehbasic/ehbasic.cpp b/Pico_6502_v4_ehbasic/ehbasic.cpp index a0e6929..959c237 100644 --- a/Pico_6502_v4_ehbasic/ehbasic.cpp +++ b/Pico_6502_v4_ehbasic/ehbasic.cpp @@ -12,5 +12,5 @@ const uint8_t vectors_bin[] = { //#include "C:\cygwin64\home\Rien\pico\ehbasic.neo6502\basic.mon" const uint8_t ehbasic_bin[] = { -#include "C:\cygwin64\home\Rien\pico\ehbasic.neo6502\basic.mon" +#include "/home/mikeh/Pico_6502_v4_ehbasic/ehbasic.neo6502/basic.mon" }; diff --git a/Pico_6502_v4_ehbasic/ehbasic.h b/Pico_6502_v4_ehbasic/ehbasic.h index 56f9053..46aa587 100644 --- a/Pico_6502_v4_ehbasic/ehbasic.h +++ b/Pico_6502_v4_ehbasic/ehbasic.h @@ -3,7 +3,7 @@ #ifndef _EHBASIC_h #define _EHBASIC_h -#include "arduino.h" +#include #define EHBASIC_START 0xA000 #define EHBASIC_SIZE 0x2D3C @@ -12,4 +12,3 @@ extern const uint8_t vectors_bin[]; extern const uint8_t ehbasic_bin[]; #endif - diff --git a/Pico_6502_v4_ehbasic/roms.h b/Pico_6502_v4_ehbasic/roms.h index 5c35a7e..07ec7e4 100644 --- a/Pico_6502_v4_ehbasic/roms.h +++ b/Pico_6502_v4_ehbasic/roms.h @@ -3,8 +3,7 @@ #ifndef _ROMS_h #define _ROMS_h -#include "arduino.h" +#include bool loadROMS(); #endif - From 74dad00681aaa377abfb907ce489332279bad811 Mon Sep 17 00:00:00 2001 From: matrixmike Date: Sun, 3 Mar 2024 22:38:04 +1100 Subject: [PATCH 2/3] confusing typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3fb4aa2..a08645a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Pico_6502_v4_ehbasic -this version is of the NEO6502 memulator supporting a 320x240 256 color display, dual buffered. -It will boot into Enhanced basic. You do not need to answer the Memory size question +This version is the NEO6502 memulator supporting a 320x240 256 color display, dual buffered. +It will boot into Enhanced basic. You do not need to answer the Memory size question. In order to have the board work correctly, connect UEXT.3 to 6502BUS.40 From 3ddbdd9c3f552a8aca0419b429d68485efe29a22 Mon Sep 17 00:00:00 2001 From: matrixmike Date: Sun, 3 Mar 2024 23:42:33 +1100 Subject: [PATCH 3/3] same case for Basic --- .../{Basic demo1.bas => basic demo1.bas} | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) rename ehbasic.neo6502/demos/{Basic demo1.bas => basic demo1.bas} (95%) diff --git a/ehbasic.neo6502/demos/Basic demo1.bas b/ehbasic.neo6502/demos/basic demo1.bas similarity index 95% rename from ehbasic.neo6502/demos/Basic demo1.bas rename to ehbasic.neo6502/demos/basic demo1.bas index 270cfbc..1ddabb4 100644 --- a/ehbasic.neo6502/demos/Basic demo1.bas +++ b/ehbasic.neo6502/demos/basic demo1.bas @@ -1,20 +1,20 @@ -1 REM DEMO -5 ? RND(100) -10 CLS -20 VDU %10000011 -25 X = 0 -30 PIXEL RND(0)*320,RND(0)*240 -35 MOVE RND(0)*280,RND(0)*220 -40 PRINT "Hello world" -50 COLOR RND(0)*7 -60 IF RND(0)*10>6 GOTO 90 -70 PIXEL RND(0)*320,RND(0)*240 -80 GOTO 100 -90 CIRCLE RND(0)*320,RND(0)*240,RND(0)*2+1,1 -100 MOVE 160,120 -110 DRAW RND(0)*320,RND(0)*240 -120 PIXEL RND(0)*320,RND(0)*240 -130 REFRESH -140 X=X+1 -150 IF X=50 GOTO 10 -160 GOTO 30 +1 REM DEMO +5 ? RND(100) +10 CLS +20 VDU %10000011 +25 X = 0 +30 PIXEL RND(0)*320,RND(0)*240 +35 MOVE RND(0)*280,RND(0)*220 +40 PRINT "Hello world" +50 COLOR RND(0)*7 +60 IF RND(0)*10>6 GOTO 90 +70 PIXEL RND(0)*320,RND(0)*240 +80 GOTO 100 +90 CIRCLE RND(0)*320,RND(0)*240,RND(0)*2+1,1 +100 MOVE 160,120 +110 DRAW RND(0)*320,RND(0)*240 +120 PIXEL RND(0)*320,RND(0)*240 +130 REFRESH +140 X=X+1 +150 IF X=50 GOTO 10 +160 GOTO 30