Skip to content

Apple2 plus#177

Draft
andreasbaumann wants to merge 54 commits intodavidgiven:masterfrom
andreasbaumann:apple2_plus
Draft

Apple2 plus#177
andreasbaumann wants to merge 54 commits intodavidgiven:masterfrom
andreasbaumann:apple2_plus

Conversation

@andreasbaumann
Copy link

@andreasbaumann andreasbaumann commented Sep 17, 2024 •
edited
Loading

Features:

  • 40/80 column mode switch (with -DAPPLE2E and -DAPPLE2PLUS in src/arch/apple2e/build.py and src/arch/apple2e/utilsbuild.py, ugly)
  • added a tetris (https://codeberg.org/eu/tetris.git, not mine, just adapted)
  • small fixes in filesystem.c (missing disk)
  • screen_getchar: trying to handle timeouts

Current list of bugs:

  • scrntest, qe don't switch off motor after a write (does the code assume the keyboard input switches off the code en-passant?)
  • more apps have this issue
  • screen driver ticker timeout doesn't work (or has a wrong order in parameter passing?)
  • tetris: left bar doesn't work in position 1
  • dump: use full width on 80-chars

The branch might be a little bit too soon to merge, I didn't test it yet after the merge, to be frank. :-)

@andreasbaumann
added switch for 40/80 columns for Apple ][
0f4f1ef
@andreasbaumann
added a preliminary screen driver for Apple ][
5586f59
@andreasbaumann
Merge branch 'master' into apple2_plus
5bd3280
@andreasbaumann
moved Apple ][ screen driver to external SCRNDRV.COM, using a common …
70a00c2 
…library for shared code (not working)
@andreasbaumann
combined a tty/screen driver into scrndrv, works, but has some copy p…
23b10ce 
…aste code and issues

around stopping the disk drive motor
@andreasbaumann
ported a tetris in C to test the screen driver (has issues with scree…
0eec4ae 
…n_getchar and missing timeout and randomness)
@andreasbaumann
screen_getchar is handling timeouts now, also added a (most likely wr…
d2ef79c 
…ong) wrapper

for using it in tetris.c (screen.S)
handling the carry bit for detecting timeouts in scrntest.asm
@andreasbaumann
Merge branch 'master' into apple2_plus
76f7e87
@andreasbaumann
Merge branch 'master' into apple2_plus
3f9dc4f
@andreasbaumann
removed local srand/rand from tetris.c, llvm-mos has a RNG now
afbc6b9
@andreasbaumann
replaced echo with printf in zip.py, zipnote complained about 'Invali…
1e328e0 
…d commenct format (unknown entry name) with echo
@andreasbaumann
Merge branch 'master' into apple2_plus
0e18138
@andreasbaumann
Merge branch 'master' into apple2_plus
21c6cc6
@andreasbaumann
Merge branch 'master' into apple2_plus
f3c7f90
@andreasbaumann
added warning message if active disk is missing
30a62ff
@andreasbaumann
added CCP_MONITOR for optional monitor in CCP (hits 2K boundary if en…
a49e123 
…abled)
@andreasbaumann
split apple disks in two
c40b79c
@andreasbaumann
Merge branch 'master' into apple2_plus
1ae504c
@andreasbaumann
merged with master
d956c02
This was referenced Sep 17, 2024
Open
Closed
@andreasbaumann andreasbaumann marked this pull request as draft September 19, 2024 06:59
@andreasbaumann
apple2a: handling 40-column in screen_cleartoeol
dd365be
@andreasbaumann
moved tetris from apps to third_party
5b73e3c
@andreasbaumann
tetris: removed unixtocpm import
fa68c6a
@andreasbaumann
tetris: added upstream info
bbd1c56
@andreasbaumann
apple2e: fixed inverse mode on 40-columns (was flashing)
893d235
@andreasbaumann
scrntest: set initial state of screen_cursor visibility to on
3fec73b
@andreasbaumann
apple2e: implemented screen_showcursor
412502e
@andreasbaumann
tetris: sorted out flickering and some portability issues
3e45209
@andreasbaumann
scrntest: added "B" command to toggle blocking and non-blocking scree…
463a7ee 
…n_getchar
@andreasbaumann
tetris: played with some timeouts for screen_getchar and ACCEL
9f142e8
@andreasbaumann
scrntest: some testing of getchar timeouts
6609bca
@andreasbaumann
apple2e: implemented some timeout handling screen_getchar (untuned)
7460f0d
@andreasbaumann
added a second tetris (because we need more tetris)
db211e8
@andreasbaumann
tetris2: code cleanup and fixed some portability issues
9878aef
@andreasbaumann
tetris: adapted some timers
92e38ba
@andreasbaumann
apple2e: added a third floppy dedicated to pascal, made every floppy …
5c0a6e6 
…bootable
@andreasbaumann
tetris2: fixed several bugs
34517f2
@andreasbaumann
Merge branch 'master' into apple2_plus
19109a2
@andreasbaumann
tetris2: added pause mode, fixed line elimination, showing next char,…
3f16ab7 
… printing letter instead of # for pieces
@andreasbaumann
tetris2: using inverse mode for pieces, use also screen cursor keys
6adbf10
Kroc
Kroc reviewed Jan 6, 2025
View reviewed changes
apps/scrntest.asm
stx cur_y

timeout:
\ Show spinnig bar to test non-blocking keyboard read
Copy link

@Kroc Kroc Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo "spinnig"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Kroc Kroc Kroc left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andreasbaumann @Kroc

Comments