Skip to content

Commit

Permalink
Fixed "RUN/STOP" propagation bug
Browse files Browse the repository at this point in the history
In V5 we introduced a new feature: You can go one menu-level up (from a sub-menu to the main-menu) by pressing Run/Stop. Subsequently you can also close then the main menu via Run/Stop (additionally to via Help). But if you do so, the Run/Stop keypress that happens to close the OSM is propagated to the C64. Fixes: #80
  • Loading branch information
sy2002 committed Oct 29, 2023
1 parent 766279f commit f53356a
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
4 changes: 2 additions & 2 deletions M2M/rom/options.asm
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,12 @@ _HLP_RESETPOS MOVE OPTM_START, R0

; when the menu was exited via "Close" + Return, make sure
; that the Return key press is not registered by the core
RSUB WAIT333MS, 1
_HLP_RET RSUB WAIT333MS, 1

; Unpause (in case the core was at pause state due to
; OPTM_PAUSE in config.vhd) and reactivate keyboard and
; joysticks in case they were inactive
_HLP_RET MOVE M2M$CSR, R0
MOVE M2M$CSR, R0
AND M2M$CSR_UN_PAUSE, @R0
OR M2M$CSR_KBD_JOY, @R0

Expand Down
37 changes: 37 additions & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
Version 5.1 - MONTH, DAY, YEAR
==============================

The main purpose of this release is to support the new <@TODO"2024 batches" or "post November 2023"? Release date?> of the
MEGA65 (aka "R5") which sports enhanced hardware. Additionally the core now
also supports the very early R2 prototype boards and the
never-released-to-the-public R4 boards.

## New Features: R4/R5 boards only

* Better analog audio output via the 3.1mm audio jack thanks by utilizing
MEGA65's new audio DAC.

WIP The hardware of the MEGA65's Expansion Port (aka cartridge port) is now 100%
compatible to the C64's hardware as it has bi-directional signals for RESET,
IRQ and NMI. This allowed us to make the core compatible with even more
cartridges. One example stands out is, that you do not need the "reset
workaround" for the Kung Fu Flash (KFF) any more.
@TODO: Needs update of the cartridge documentation that for example the reset
workaround is not needed for the KungFu Flash any more

## New Features: All boards

WIP You can now close the "About & Help" screens also by pressing Run/Stop.

## Bugfixes

WIP The long-reset" feature was broken in V5. (Fixed GitHub issue #79)

WIP Fixed a crash in the file browser. (Fixed GitHub issue #95)

* In V5 we introduced a new feature: You can go one menu-level up (from a sub-
menu to the main-menu) by pressing Run/Stop. Subsequently you can also close
then the main menu via Run/Stop (additionally to via Help). But if you did
so, the Run/Stop keypress that happens to close the OSM was propagated to
the C64. (Fixed GitHub issue #80)

Version 5 - June 23, 2023
=========================

Expand Down

0 comments on commit f53356a

Please sign in to comment.