From 49bc78158a5e17ba717381a3a2cbb4ab35c36dfe Mon Sep 17 00:00:00 2001 From: Brian Holman Date: Wed, 11 Nov 2026 15:35:49 -0700 Subject: [PATCH] Add secondary joystick hard drop and deliver build 05 --- .gitignore | 3 + AGENTS.md | 2 +- QUADPSL04.DSK => QUADPSL05.DSK | Bin 161280 -> 161280 bytes README.md | 15 +++- SPECIFICATION.md | 4 + assets/ui-text.tsv | 4 +- docs/BUILDS.md | 27 +++++- docs/IMPLEMENTATION_STATUS.md | 19 ++++- docs/MCP_SETUP.md | 11 +++ docs/MEMORY_LAYOUT.md | 6 ++ docs/SECONDARY_BUTTON.md | 80 ++++++++++++++++++ docs/VCC_PLUS_WORKFLOW.md | 5 +- .../build05-after-keyboard-resume.png | Bin 0 -> 3736 bytes docs/screenshots/build05-fire2-held.png | Bin 0 -> 3673 bytes docs/screenshots/build05-fire2-repress.png | Bin 0 -> 3723 bytes docs/screenshots/build05-title-b54.png | Bin 0 -> 4856 bytes main.c | 2 +- src/platform/keyboard.c | 3 +- src/platform/keyboard.h | 5 +- tests/include/coco.h | 1 + tests/keyboard_test.c | 78 ++++++++++++----- 21 files changed, 230 insertions(+), 35 deletions(-) rename QUADPSL04.DSK => QUADPSL05.DSK (89%) create mode 100644 docs/SECONDARY_BUTTON.md create mode 100644 docs/screenshots/build05-after-keyboard-resume.png create mode 100644 docs/screenshots/build05-fire2-held.png create mode 100644 docs/screenshots/build05-fire2-repress.png create mode 100644 docs/screenshots/build05-title-b54.png diff --git a/.gitignore b/.gitignore index d4b6d50..dc0595d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ HELLO.dsk # Retired build-02 personal disk; pristine historical delivery stays in Git history. /QUADPSL02.DSK + +# Superseded build04 local disk/backup retained; current pristine delivery is05. +/QUADPSL04.DSK diff --git a/AGENTS.md b/AGENTS.md index d89bd01..96b17e7 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -9,7 +9,7 @@ Brian take precedence. Read `SPECIFICATION.md` and `docs/VCC_PLUS_WORKFLOW.md`. by default for authorized solo work. Preserve unrelated edits and user disks. - The chat may be organized within the VCC Plus project. This does not authorize reading or editing other project repositories. -- Use official `/Applications/VCC Plus.app` **3.6.1 (53)** (approved by Brian November 11, 2026 for the joystick checks) and its supported MCP. +- Use official `/Applications/VCC Plus.app` **3.6.1 (54)** (Brian requested final testing after Core installed this version on November 11, 2026) and its supported MCP. No custom VCC Plus builds, emulator patches, private protocol calls, replacement MCP integration, or requests for VCC Plus feature changes. - Do not inspect VCC Plus implementation source, private developer guides or diff --git a/QUADPSL04.DSK b/QUADPSL05.DSK similarity index 89% rename from QUADPSL04.DSK rename to QUADPSL05.DSK index 88d07fa813493c94bb3b152803f8b2d7be81815a..ac06b44f4ecf90bb8fa100b1944d773e2b02da23 100644 GIT binary patch delta 7237 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 delta 7054 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 HmvjCfnqA;x diff --git a/README.md b/README.md index 62e55d0..886b958 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ Keyboard: arrows or A/D move, Down/S soft drop, Up/W preferred rotation, Q/E counterclockwise/clockwise, Space hard drop, H hold, P pause, Enter select, BREAK back/pause. The title also accepts Space. A short joystick fire press rotates on release; holding fire for 400 ms opens actions, including Hold and Settings. +Joystick Up or the secondary button hard-drops like Space. The secondary button +drops once on press; release it before another drop. Down remains soft drop. High scores are designed to reload from `QPSAVE0.DAT`/`QPSAVE1.DAT` on the game disk. The two-slot store covers all difficulty/normal-or-difficult categories and @@ -74,15 +76,15 @@ ROM, emulator implementation, or third-party sound payload is included. ## Run the current CoCo 3 disk -Mount a writable copy of [QUADPSL04.DSK](QUADPSL04.DSK) in drive 0 and type +Mount a writable copy of [QUADPSL05.DSK](QUADPSL05.DSK) in drive 0 and type `DOS`. Keep the downloaded original pristine. The current build targets the CoCo 3; CoCo 2 adaptation is deferred. Allow disk loading and explicit saves to finish before the next action. High scores/settings use QPSAVE0.DAT and QPSAVE1.DAT; QPTEXT.DAT contains read-only menu text. Each numbered build starts with empty high scores and default preferences. Existing personal score disks remain untouched; scores are not copied into the -new build. The current delivery is **build 04**; the next changed delivery will -be build 05. See [build records](docs/BUILDS.md). The official recipe still uses +new build. The current delivery is **build 05**; the next changed delivery will +be build 06. See [build records](docs/BUILDS.md). The official recipe still uses Quadrapassel.DSK as its clean staging artifact. The separately verified manual fallback on the 512 KB test machine is: @@ -121,3 +123,10 @@ physical controller/CoCo and left-port retests remain pending. CoCoMan was a read-only reference; its assembly and VCC-specific APIs were not imported. See [the target diagnosis](docs/CMOC_JOYSTICK_ARGUMENTS.md) and [joystick validation](docs/JOYSTICK_FIX.md). + +Build 05 adds Fire 2 hard drop once per press, retaining joystick Up and Fire 1. +Official VCC Plus 3.6.1 (54) Release and actual standard right-port joystick +snapshots pass press/hold/release/repress, steering, lasting rotation and steering +after keyboard pause/resume. Host adapter checks cover both ports. See +[secondary-button validation and acceptance steps](docs/SECONDARY_BUTTON.md). +Physical controller/CoCo, left-port guest and 128 KB qualification remain pending. diff --git a/SPECIFICATION.md b/SPECIFICATION.md index fef6740..360862c 100644 --- a/SPECIFICATION.md +++ b/SPECIFICATION.md @@ -221,6 +221,10 @@ Default mapping to implement and usability-test: - Left/right: movement with the same repeat timing as keyboard. - Down: soft drop while held. - Up: one hard drop, rearmed only after returning to neutral. +- Secondary button (optional two-button controller): hard drop on press, like + Space; once per press, with release required before another drop. Ignore it + in menus and when the joystick is Off. This addition was approved November 11, + 2026; the complete one-button control path remains available. - Short button press/release: rotate in the preferred direction, once on release. - Button held for 400 ms: pause and open the actions menu, without triggering a rotation on release. That menu provides Resume, Hold, Rotate Other Way, diff --git a/assets/ui-text.tsv b/assets/ui-text.tsv index 8812d43..e711c89 100644 --- a/assets/ui-text.tsv +++ b/assets/ui-text.tsv @@ -55,8 +55,8 @@ 4 7 SPACE HARD DROP H HOLD P PAUSE 4 8 JOYSTICK 4 9 LEFT RIGHT MOVE DOWN SOFT DROP -4 10 UP HARD DROP TAP FIRE ROTATE -4 11 HOLD FIRE FOR ACTIONS MENU +4 10 UP OR FIRE 2 HARD DROP +4 11 TAP FIRE 1 ROTATE HOLD ACTIONS 4 12 RIGHT XY 4 13 LEFT XY 4 14 BUTTONS diff --git a/docs/BUILDS.md b/docs/BUILDS.md index 0a61ac2..94a8919 100644 --- a/docs/BUILDS.md +++ b/docs/BUILDS.md @@ -2,7 +2,7 @@ Brian requested this delivery convention on November 11, 2026: `QUADPSLxx.DSK`, with a two-digit build number and fresh high scores for each -new delivered build. Begin at 01. The current delivery is 04; the next changed delivery is 05. This number +new delivered build. Begin at 01. The current delivery is 05; the next changed delivery is 06. This number identifies the game disk, independently of the VCC Plus application build. | Build | Date | Filename | Contents / validation | @@ -11,6 +11,7 @@ identifies the game disk, independently of the VCC Plus application build. | 02 | 2026-11-11 | QUADPSL02.DSK | Initial shared-row/axis fix; Brian reported actual joystick failure after DOS load | | 03 | 2026-11-11 | QUADPSL03.DSK | Internal candidate; native test exposed target calibration argument error; withdrawn | | 04 | 2026-11-11 | QUADPSL04.DSK | Correct target argument loads, stable fire, scene readiness; native emulated joystick checks pass | +| 05 | 2026-11-11 | QUADPSL05.DSK | Fire 2 hard drop once per press; actual standard right-port press/held/repress and input regression checks pass on official build54 | Build 01 is 161,280 bytes, SHA-256: `4ac171e87c51dfd99b302b9e035a91a59c030144e5ae0661a6d2dfc84ba3a63f`. @@ -58,7 +59,7 @@ $13FD; the 1024-byte stack reserve is unchanged. The writable build-02 file is preserved locally and backed up byte-identically under ignored personal media; it is retired from tracking rather than resetting its saved contents. -Build 04 is the current clean delivery, SHA-256: +Build 04 is the preceding clean delivery, SHA-256: `1cddb6bdf17857b915e96a6929e14181bad05cfae73278a4919add26fea0ba45`. QUAD.bin is 26,581 bytes, SHA-256: `f79dd5b4ba32ab592bd2b1cb21bea2847b58bd88a1343a9507e1e72e26fe6767`. @@ -71,3 +72,25 @@ Pristine QUADPSL04.DSK contains only QUAD.BIN, WORDS.DAT, QPTEXT.DAT and the DOS launcher; empty scores/default settings. The app mounted a separate working copy. Withdrawn pristine build03 and unmounted test scratch are removed during cleanup; personal build01/build02 images and backups are retained unchanged. + +Build 05 is the current clean delivery (161,280 bytes), SHA-256: +`d05ab25fd90171b048cce54f3af18ca6d0bd81335e138044ff05315e99cbf582`. +QUAD.bin is 26,623 bytes, SHA-256: +`ed5460993770f80bd1560001892ef34d4845ddf9eafe40fc732d1033a9c84290`. +Official build54 project 273E195B-8BFC-495F-A1F8-E1469759B910 revision0, +Release build CC51E81E-B5E2-4670-B8FA-15785BAFEB51, artifact +F137D778-646A-43AE-9CF1-92A658464FF3, zero diagnostics. Its outputs exactly +match the earlier native build53 C671F741 candidate; the compiler workaround +remains. Code/const end $7AFE, static end $13FD, original 1024-byte stack reserve. +The directory contains QUAD.BIN, WORDS.DAT and QPTEXT.DAT plus DOS launcher; +50 free granules, no QPSAVE files. The numbered copy was created exclusively +and its hash checked after the owned run stopped. + +Actual MC6809/512 KB standard right-port joystick tests passed Fire 2 held for +180 fields (one lock), neutral then press (second lock), both horizontal walls, +lasting primary release rotation, Up hard drop, keyboard pause/resume then +joystick LEFT. Input traces confirm actual analog/button states and neutral +release, not guest keyboard aliases. The owned run stopped with disk retained, +zero writes and unchanged pristine hash. Details and qualification limits: +SECONDARY_BUTTON.md. The old build04 file and byte-identical backup remain +locally, retired from tracking; personal build01/build02 and backups are untouched. diff --git a/docs/IMPLEMENTATION_STATUS.md b/docs/IMPLEMENTATION_STATUS.md index 3992637..7f497ab 100644 --- a/docs/IMPLEMENTATION_STATUS.md +++ b/docs/IMPLEMENTATION_STATUS.md @@ -4,7 +4,21 @@ The current disk contains a playable CoCo 3 game with standard CMOC sound, settings and disk-backed high scores. Actual 128 KB qualification remains pending; CoCo 2 adaptation is deferred at Brian's direction. -## Current joystick correction — build 04 +## Current secondary-button addition — build 05 + +QUADPSL05.DSK adds Fire 2 hard drop once per press; Up and Fire 1 remain. +Official installed VCC Plus 3.6.1 (54) Release and disposable MC6809/512 KB +standard right-port joystick tests pass held/released/repressed drops, +left/right, lasting rotation, Up drop and keyboard pause/resume then joystick +movement. Host adapter tests cover both ports; rules, persistence and video +checks pass. Code/const end $7AFE, static end $13FD, stack reserve1024. +Disk SHA-256: +`d05ab25fd90171b048cce54f3af18ca6d0bd81335e138044ff05315e99cbf582`. +Run stopped with its disk retained and zero writes; personal media unchanged. +Physical controller/CoCo, guest left port, this candidate's HD6309 and 128 KB +remain pending; normal-window buzz remains open. See SECONDARY_BUTTON.md. + +## Previous joystick correction — build 04 QUADPSL04.DSK works around a demonstrated bundled CMOC -O2 calibration-argument load error. Official native build53 Release and right-port emulated joystick @@ -123,7 +137,8 @@ Actual 128 KB and physical joystick qualification remain pending. - Modern/Classic 32-bit saturating scoring, level transitions and Relaxed mode. - Version-1 xorshift32 seeded stream, inverse-square balancing, prefill and Difficult Pieces metric/selection. Difficult search is currently synchronous. -- Keyboard controls and a one-button joystick input state machine, settings, +- Keyboard controls, a complete one-button joystick input state machine with + optional Fire 2 hard drop, settings, seed editor, pause/actions/confirmation screens, score browser and initials. - Code-drawn title and cached tiles; menu focus updates without full redraws. Scene text is a bounded, checksummed disk asset sharing the display cache. diff --git a/docs/MCP_SETUP.md b/docs/MCP_SETUP.md index 6640f63..d9dc57e 100644 --- a/docs/MCP_SETUP.md +++ b/docs/MCP_SETUP.md @@ -85,3 +85,14 @@ workflow after the grant ended. Native builds FC462D93 / A7A18927 succeeded. Launch Disk mounted a separate working copy; explicit cold restart plus DOS was required because the prior graphics game was still in RAM. A new mounted filename or C workspace's latest-build badge alone does not prove the guest reloaded it. + + +Build05 final checks use official build54's newly exported native connection, +project273E195B-8BFC-495F-A1F8-E1469759B910 revision0. Discovery returned29 tools, +playtest_joystick_input and input_diagnostics; actual standard port/axis/fire2 +steps and get_playtest_input were used successfully. The official local helper +required local-service execution permission; without that permission it returned +host_unavailable despite local tools/list succeeding. This was resolved without +replacing the grant or changing the emulator. All owned runs stopped; the native +workspace was released to Core for the next project's scoped connection. Private +grant files remain outside Git. See SECONDARY_BUTTON.md for exact evidence. diff --git a/docs/MEMORY_LAYOUT.md b/docs/MEMORY_LAYOUT.md index 7e02541..df6054e 100644 --- a/docs/MEMORY_LAYOUT.md +++ b/docs/MEMORY_LAYOUT.md @@ -65,3 +65,9 @@ Final build04's independent calibration/position pointers avoid the target compiler indexing defect. Code/const end $7AD4 (44 bytes free), static end $13FD (3 bytes free). The original MMU window, section limits and 1024-byte stack reserve are unchanged. Memory qualification remains actual-128-KB pending. + +Build05 maps Fire 2 into the existing hard-drop edge path: code/const end $7AFE +(2 bytes free), static end $13FD (3 bytes free), unchanged 1024-byte stack reserve. +Official build54 reproduces these exact bounds and passes MC6809/512 KB standard +right-port tests. Further code/data growth requires compaction first; 128 KB and +full stack qualification remain pending. diff --git a/docs/SECONDARY_BUTTON.md b/docs/SECONDARY_BUTTON.md new file mode 100644 index 0000000..077df2a --- /dev/null +++ b/docs/SECONDARY_BUTTON.md @@ -0,0 +1,80 @@ +# Secondary joystick hard drop — November 11, 2026 + +Brian requested Fire 2 hard drop, equivalent to Space. The game uses the selected +right/left joystick's named standard CMOC secondary mask (right 0x04, left 0x08) +from the same stable button snapshot used to filter keyboard rows. In gameplay, +it joins the existing Q_HARD held action before edge detection: one drop on press, +no repeat while held, and no rotation on release. Space and Fire 2 share the same +logical edge, preventing a second drop while either alias stays down. + +The secondary button is ignored in menus and with Joystick Off. A held button +across scene transitions must be released before input is rearmed. Joystick Up +hard drop, Down soft drop and primary short/long-press actions remain. Both port +mappings are covered by hardware-mock adapter tests with real q_input_step/q_drop; +held samples leave exactly four settled cells, and another released/repressed +button locks a second piece. Wrong port, Off, menu and transition cases pass. +All four shared keyboard rows continue to be filtered. The Controls page now +lists Up/Fire 2 hard drop and Fire 1 rotation/actions. + +Build05 was first built using official VCC Plus 3.6.1 (53), then rebuilt and +qualified with installed 3.6.1 (54), CMOC 0.1.100 Release. The two builds produce +identical binary/disk bytes. The game-side calibration-pointer compiler workaround +remains despite the general compiler fix now included in the installed app. Code/const +end $7AFE, static end $13FD, original 1024-byte stack reserve. No persistent state, +score formula or save schema changed. Native qualification follows; host simulation alone does not prove physical +joystick behavior. + + +## Final installed-app check + +Brian authorized the final installed VCC Plus check after Core installed build54. +The fresh native project grant identified project +273E195B-8BFC-495F-A1F8-E1469759B910 revision0 and advertised joystick injection +and diagnostics. Source hashes matched main.c, keyboard.c/h, menu asset and +Makefile. The official Release build CC51E81E-B5E2-4670-B8FA-15785BAFEB51 +succeeded without diagnostics; artifact F137D778-646A-43AE-9CF1-92A658464FF3. +See BUILDS.md for binary/disk hashes and exact memory bounds. + +Disposable run C3EAFAD1-3CB6-435F-9B40-03E55C6CB534 used MC6809 and 512 KB, +booted from that exact artifact. Score loading and initial drawing were allowed +to finish before controls were evaluated. Public playtest_input steps used +standard right-port X/Y snapshots (0..16383, center8191) and named fire1/fire2; +get_playtest_input and input_trace confirmed the actual states and release. +No emulator internals or guest memory/register writes were used. + +- Fire 2 on the title did not start a game. +- Empty-board baseline had no settled cells. Fire 2 was held 180 fields, then + released 60 fields: four green settled cells and the next purple piece still + falling. There was no repeat or release rotation. +- Fire 2 pressed again for 12 fields, then released 120: eight settled cells + (green + purple), with the yellow piece falling. Exactly one additional lock. +- Actual analog X=0 and X=16383 moved the yellow piece to the respective walls. +- Primary held 8 fields/released 90 rotated the yellow piece vertically and + left it rotated. Up (Y=0) still hard-dropped it. +- Keyboard P/Enter pause/resume followed by actual joystick LEFT moved the next + gray piece to the left wall. Keyboard confirmation did not disable the stick. +- A 120-field idle audio capture had PCM peak0 in both channels. This isolated + silence does not establish that Brian's normal-window buzzing is fixed. + +The run stopped normally at field5806, with zero disk writes. Its writable test +disk was retained with the same pristine hash. The normal paused session, +DualSense assignments, stopped tape and personal score media were preserved. + +Both secondary port masks pass host adapter/gameplay fixtures; this guest run +qualifies the right port only. Actual left port, physical controller/CoCo, +HD6309 on this candidate and 128 KB remain unqualified. No save schema or scoring +formula changed. Host input/store/keyboard, rules and video suites pass with +AddressSanitizer/UndefinedBehaviorSanitizer. + +![One settled piece after holding Fire 2](screenshots/build05-fire2-held.png) +![Two settled pieces after release and another press](screenshots/build05-fire2-repress.png) +![Joystick LEFT after keyboard resume](screenshots/build05-after-keyboard-resume.png) + +## Brian's acceptance test + +Use a writable copy of QUADPSL05.DSK, type DOS to load it, and select Right +joystick (the default). Confirm left/right movement; primary tap/release rotation +that stays rotated; secondary hard drop once per press even while held; another +drop after release/repress; and joystick movement after keyboard pause/resume. +Up remains another hard drop and Down soft drop. Old disks keep their scores; +build05 starts fresh. Note machine RAM and whether buzzing occurs at the title. diff --git a/docs/VCC_PLUS_WORKFLOW.md b/docs/VCC_PLUS_WORKFLOW.md index 3f7fb49..bb389c3 100644 --- a/docs/VCC_PLUS_WORKFLOW.md +++ b/docs/VCC_PLUS_WORKFLOW.md @@ -2,8 +2,9 @@ ## Required installed app -Use `/Applications/VCC Plus.app`, **version 3.6.1, build 53**, explicitly approved by Brian -on November 11, 2026 for the joystick investigation, reconnection and isolated build/playtest. The installed +Use `/Applications/VCC Plus.app`, **version 3.6.1, build 54**. Brian requested the final +Quadrapassel test after Core installed it on November 11, 2026. Earlier build53 +checks remain historical. The installed Info.plist was verified. Earlier build-48 evidence remains historical. Verify again at implementation start. If the app differs, report it and wait for Brian to approve a different version. diff --git a/docs/screenshots/build05-after-keyboard-resume.png b/docs/screenshots/build05-after-keyboard-resume.png new file mode 100644 index 0000000000000000000000000000000000000000..7bc87ec06366be4e552d7cb559ba5395fc2556e8 GIT binary patch literal 3736 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 literal 0 HcmV?d00001 diff --git a/docs/screenshots/build05-fire2-held.png b/docs/screenshots/build05-fire2-held.png new file mode 100644 index 0000000000000000000000000000000000000000..a460c9c51f949e0c62ec8a403e5838b916b1caf6 GIT binary patch literal 3673 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 literal 0 HcmV?d00001 diff --git a/docs/screenshots/build05-fire2-repress.png b/docs/screenshots/build05-fire2-repress.png new file mode 100644 index 0000000000000000000000000000000000000000..39860da30ccb2d303d6b128a5fd718bfcca4560e GIT binary patch literal 3723 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 PKTwWGv35@n`(FJw8jJke literal 0 HcmV?d00001 diff --git a/main.c b/main.c index c2eec60..420cf7c 100644 --- a/main.c +++ b/main.c @@ -64,7 +64,7 @@ static QActions sample(Q16 ms) disableInterrupts(); Player_disableSound(); axes=readJoystickPositions();for(i=0;i<4;++i)joystick_axes[i]=axes[i]; - keys=keyboard_read(&joystick_buttons,scene==PLAY?(Q8)(KEYBOARD_PLAY|(preferences.clockwise<<1)):scene==INITIALS?(Q8)KEYBOARD_INITIALS:(Q8)0); + keys=keyboard_read(&joystick_buttons,scene==PLAY?(Q8)(KEYBOARD_PLAY|(preferences.clockwise<<1)):scene==INITIALS?(Q8)KEYBOARD_INITIALS:(Q8)0,port); Player_disableSound(); enableInterrupts(); if(port<2)button=!(joystick_buttons&(port==1?JOYSTK_BUTTON_1_LEFT:JOYSTK_BUTTON_1_RIGHT)); diff --git a/src/platform/keyboard.c b/src/platform/keyboard.c index 63bb446..1b678ce 100644 --- a/src/platform/keyboard.c +++ b/src/platform/keyboard.c @@ -11,7 +11,7 @@ static const KeyBinding keys[]={ }; /* Pressed joystick buttons ground the same PIA rows used by isKeyPressed. * Suppress only those ambiguous rows, including buttons on the other port. */ -Q16 keyboard_read(Q8 *buttons,Q8 mode) +Q16 keyboard_read(Q8 *buttons,Q8 mode,Q8 port) { Q16 held;Q8 before,after,blocked; const KeyBinding *key,*end=keys+((mode&KEYBOARD_INITIALS)?6:sizeof(keys)/sizeof(keys[0])); @@ -25,6 +25,7 @@ Q16 keyboard_read(Q8 *buttons,Q8 mode) after=readJoystickButtons(); }while(before!=after); if(mode&KEYBOARD_PLAY){ + if(port<2&&!(after&(port==1?JOYSTK_BUTTON_2_LEFT:JOYSTK_BUTTON_2_RIGHT)))held|=Q_HARD; if(held&Q_UP)held=(held&~Q_UP)|((mode&KEYBOARD_CLOCKWISE)?Q_CW:Q_CCW); }else if(held&Q_HARD)held=(held&~Q_HARD)|Q_CONFIRM; *buttons=after; diff --git a/src/platform/keyboard.h b/src/platform/keyboard.h index c8895aa..a9aceb9 100644 --- a/src/platform/keyboard.h +++ b/src/platform/keyboard.h @@ -5,6 +5,7 @@ #define KEYBOARD_PLAY 1 #define KEYBOARD_CLOCKWISE 2 #define KEYBOARD_INITIALS 4 -/* Caller holds the foreground PIA transaction; returns a stable button sample. */ -Q16 keyboard_read(Q8 *buttons,Q8 mode); +/* Caller holds the foreground PIA transaction. Port: 0 right, 1 left, 2 off. + * Return filtered keys plus the selected secondary button (hard drop in play). */ +Q16 keyboard_read(Q8 *buttons,Q8 mode,Q8 port); #endif diff --git a/tests/include/coco.h b/tests/include/coco.h index fc4e7ee..fbc7023 100644 --- a/tests/include/coco.h +++ b/tests/include/coco.h @@ -37,4 +37,5 @@ enum { }; byte isKeyPressed(byte probe,byte bit); byte readJoystickButtons(void); +enum { JOYSTK_BUTTON_2_RIGHT=4,JOYSTK_BUTTON_2_LEFT=8 }; #endif diff --git a/tests/keyboard_test.c b/tests/keyboard_test.c index a3ef6e2..1fc086e 100644 --- a/tests/keyboard_test.c +++ b/tests/keyboard_test.c @@ -15,20 +15,33 @@ byte isKeyPressed(byte probe,byte bit) if((bit&15)&~raw_buttons)return 1; return probe==contact_probe&&(bit&contact_bit)!=0; } +/* Existing keyboard-only fixtures leave joystick mapping disabled. */ +static Q16 read_keys(Q8 mode){return keyboard_read(&raw_buttons,mode,2);} +static QActions port_poll(QInput *in,Q8 port,Q16 ms,Q8 playing) +{ + Q16 held=keyboard_read(&raw_buttons,playing?KEYBOARD_PLAY:0,port); + Q8 primary=port<2&&!(raw_buttons&(port==1?2:1)); + return q_input_step(in,held,primary,31,31,31,31,port<2,ms,playing,0); +} +static Q8 occupied(const QGame *g) +{ + Q8 x,y,n=0;for(y=0;y<20;++y)for(x=0;x<10;++x)if(g->board.cells[y][x])++n; + return n; +} static QActions poll(QInput *in,Q8 button,Q16 ms) { - return q_input_step(in,keyboard_read(&raw_buttons,KEYBOARD_PLAY),button,31,31,31,31,1,ms,1,0); + return q_input_step(in,read_keys(KEYBOARD_PLAY),button,31,31,31,31,1,ms,1,0); } int main(void) { QInput in;QActions a;QGame game;QOptions options={0,Q_MODERN,0,1};Q8 pressed; /* CoCo right fire grounds A/D/E. It must not masquerade as left/right/CW. */ - raw_buttons=14;assert(keyboard_read(&raw_buttons,KEYBOARD_PLAY)==0); + raw_buttons=14;assert(read_keys(KEYBOARD_PLAY)==0); for(pressed=0;pressed<4;++pressed){ raw_buttons=(Q8)(15&~(1<