Merge pull request #249 from wwarthen/dev

Dev

Binary/Makefile

@@ -5,4 +5,4 @@ SUBDIRS = Apps CPM3 ZPM3
 include $(TOOLS)/Makefile.inc
 
 clobber::
-	@rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat
+	@rm -f *.bin *.com *.img *.rom *.upd *.hex *.pdf *.log *.eeprom *.dat

Doc/ChangeLog.txt

@@ -54,7 +54,10 @@ Version 3.1.1
 - WBW: Add interrupt receive support to UART driver
 - PMS: Add XModem transfer within Debug Monitor
 - PMS & AJL: Add DMAMON test application
+- PMS: Add ZMP adaptation
 - LWN: Substantial BPBIOS cleanup
+- AJL: Add ZMD adaptation
+- D?T: Substantial update to TastyBasic incuding a .COM executable
 
 Version 3.1
 -----------

Source/Images/d_bp.txt

@@ -21,7 +21,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
-../../Binary/Apps/tbasic.com 0:
+../../Binary/Apps/tbasic.com 15:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:

Source/Images/d_zpm3.txt

@@ -32,7 +32,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
-../../Binary/Apps/tbasic.com 0:
+../../Binary/Apps/tbasic.com 15:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:

Source/TastyBasic/src/Build.cmd

@@ -7,7 +7,10 @@ set PATH=%TOOLS%\tasm32;%PATH%
 
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -80 -g3 -fFF -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst
-tasm -80 -g3 -fFF -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst
+# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) 
+set VER=v0.3.0
+
+tasm -80 -g3 -fFF -dROMWBW -d"VERSION \"%VER%\"" tastybasic.asm tastybasic.bin tastybasic.bin.lst
+tasm -80 -g3 -fFF -dCPM -d"VERSION \"%VER%\"" tastybasic.asm tastybasic.com tastybasic.com.lst
 
 copy /b /v tastybasic.com ..\..\..\Binary\Apps\tbasic.com

Source/TastyBasic/src/Makefile

@@ -2,15 +2,17 @@ OBJECTS = tastybasic.bin tbasic.com
 TOOLS = ../../../Tools
 OTHERS = *.com
 APPDIR=../../../Binary/Apps
-
+
 include $(TOOLS)/Makefile.inc
 
+# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) 
+VER=\"v0.3.0\" 
 USETASM=1
 
-tastybasic.bin: TASMFLAGS=-dROMWBW
+tastybasic.bin: TASMFLAGS=-dROMWBW -d"VERSION $(VER)"
 
-tastybasic.com: TASMFLAGS=-dCPM
+tastybasic.com: TASMFLAGS=-dCPM -d"VERSION $(VER)"
 
 tbasic.com : tastybasic.com
 	cp $< $@
-	cp $$($(CASEFN) $@) $(APPDIR)
+	cp $$($(CASEFN) $@) $(APPDIR)

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.135"
+#DEFINE BIOSVER	"3.1.1-pre.136"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.135"
+	db	"3.1.1-pre.136"
 	endm