Merge pull request #445 from udo-munk/dev

merge dev
udo-munk · Aug 5, 2024 · cc3a4e1 · cc3a4e1
2 parents 4c393fd + 2131e67
commit cc3a4e1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -13,8 +13,8 @@ BIOSES = cpmsim/srccpm2 cpmsim/srccpm3 cpmsim/srcmpm cpmsim/srcucsd-iv \
 	intelmdssim/srccpm2 imsaisim/srcucsd-iv picosim/srccpm2 \
 	picosim/srccpm3 picosim/srcucsd-iv
 MISC = z80sim cpmtools
-#MACHINES = altairsim cpmsim cromemcosim imsaisim mosteksim z80sim
-MACHINES = altairsim cpmsim cromemcosim imsaisim mosteksim # FIXME: z80sim build is broken
+MACHINES = altairsim cpmsim cromemcosim imsaisim mosteksim z80sim
+#MACHINES = altairsim cpmsim cromemcosim imsaisim mosteksim # FIXME: z80sim build is broken
 
 Z80ASMDIR = z80asm
 Z80ASM = $(Z80ASMDIR)/z80asm

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # z80pack
 
-z80pack is a mature emulator of multiple platforms with the Z80 CPU.
+z80pack is a mature emulator of multiple platforms with 8080 and Z80 CPU.
 
 
 Full documentation is at https://www.icl1900.co.uk/unix4fun/z80pack

diff --git a/picosim/CMakeLists.txt b/picosim/CMakeLists.txt
@@ -98,7 +98,7 @@ target_link_options(${PROJECT_NAME} PRIVATE -Xlinker --print-memory-usage)
 
 pico_set_program_name(${PROJECT_NAME} "z80pack picosim")
 pico_set_program_description(${PROJECT_NAME} "z80pack on Raspberry Pi Pico")
-pico_set_program_version(${PROJECT_NAME} "1.2")
+pico_set_program_version(${PROJECT_NAME} "1.3")
 pico_set_program_url(${PROJECT_NAME} "https://github.com/udo-munk/z80pack")
 
 # disable UART in/out, enable USB in/out

diff --git a/picosim/sim.h b/picosim/sim.h
@@ -30,7 +30,7 @@
 #endif
 
 #define USR_COM "Raspberry Pi Pico Z80/8080 emulator"
-#define USR_REL "1.2"
+#define USR_REL "1.3"
 #define USR_CPR "Copyright (C) 2024 by Udo Munk & Thomas Eberhardt"
 
 #ifndef PRIu64