ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
stella/src/emucore/CompuMate.cxx

201 lines
9.2 KiB
C++
Raw Normal View History

Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
//============================================================================
//
Fix CompuMate TV mode detect * Make sure that compumate runs with the proper controllers attached * Make sure that CompuMate::myKeyTable is always valid * Whitespace fix
2016-12-14 20:02:52 +00:00
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
The annual copyright year update.
2019-01-01 15:05:51 +00:00
// Copyright (c) 1995-2019 by Bradford W. Mott, Stephen Anthony
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
Re-arranged the CompuMate controller code so that it can access both controllers at once. Stella wasn't initially designed to do this, and the CompuMate is unique in this regard. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2412 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 01:19:23 +00:00
#include "Control.hxx"
The CompuMate emulation now correctly processes normal and shifted keys from the keyboard. Most control-keys are supported too, but still TODO is allow the Control key to pass to the CompuMate controller and not pre-process it by the EventHandler (so pressing Ctrl-q) shouldn't quit emulation in that case). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2414 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-15 15:22:57 +00:00
#include "StellaKeys.hxx"
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
#include "CompuMate.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Restore const for Event class by using 'mutable' mutex.
2018-09-21 00:21:10 +00:00
CompuMate::CompuMate(const Console& console, const Event& event,
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
const System& system)
A slight restructuring of the Controller classes, to fix CompuMate support broken in rev 3034. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3038 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-11-04 00:34:56 +00:00
: myConsole(console),
Some bugs indicated by running Stella through Coverity. Note that many of these aren't actually bugs per-se, but are to follow good programming practices. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3234 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2015-12-05 01:30:17 +00:00
myColumn(0),
Guard Event.hxx against races.
2018-09-19 20:05:59 +00:00
myKeyTable(event.getKeys())
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
{
A slight restructuring of the Controller classes, to fix CompuMate support broken in rev 3034. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3038 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-11-04 00:34:56 +00:00
// These controller pointers will be retrieved by the Console, which will
// also take ownership of them
Move to C++14, now that all the minimum required compilers support it. Clang 3.8, gcc 5, Visual Studio 2017 and Xcode 8 are now the minimum supported compilers, and they all support C++14, so we may as well use it. - Change all make_ptr to make_unique - Change iterator begin(), end(), etc to const versions where appropriate - Remove UniquePtr, since C++14 supports it natively
2017-07-21 23:40:13 +00:00
myLeftController = make_unique<CMControl>(*this, Controller::Left, event, system);
myRightController = make_unique<CMControl>(*this, Controller::Right, event, system);
The CompuMate emulation now correctly processes normal and shifted keys from the keyboard. Most control-keys are supported too, but still TODO is allow the Control key to pass to the CompuMate controller and not pre-process it by the EventHandler (so pressing Ctrl-q) shouldn't quit emulation in that case). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2414 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-15 15:22:57 +00:00
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
myLeftController->updateAnalogPin(Controller::Nine, Controller::MAX_RESISTANCE);
myLeftController->updateAnalogPin(Controller::Five, Controller::MIN_RESISTANCE);
myRightController->updateAnalogPin(Controller::Nine, Controller::MIN_RESISTANCE);
myRightController->updateAnalogPin(Controller::Five, Controller::MAX_RESISTANCE);
Fix CompuMate TV mode detect * Make sure that compumate runs with the proper controllers attached * Make sure that CompuMate::myKeyTable is always valid * Whitespace fix
2016-12-14 20:02:52 +00:00
enableKeyHandling(false);
Some infrastructure work for CompuMate handling. The CM handler now disables normal keyboard input when in the debugger. This fixes issues where commands/shortcut keys typed in the debugger would be interpreted as actual CompuMate input. For now, in-debugger key processing is completely disabled in such a case. Eventually, we should probably add a virtual keyboard to the CM RIOT area, and have it send its data directly to the CM handler. Bumped version # slightly. I hope to get the next release ready to go in a few weeks. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2705 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2013-04-23 15:57:33 +00:00
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CompuMate::enableKeyHandling(bool enable)
{
Guard Event.hxx against races.
2018-09-19 20:05:59 +00:00
myKeyTable.enable(enable);
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Re-arranged the CompuMate controller code so that it can access both controllers at once. Stella wasn't initially designed to do this, and the CompuMate is unique in this regard. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2412 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 01:19:23 +00:00
void CompuMate::update()
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
{
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
// Handle SWCHA changes - the following comes almost directly from z26
A slight restructuring of the Controller classes, to fix CompuMate support broken in rev 3034. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3038 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-11-04 00:34:56 +00:00
Controller& lp = myConsole.leftController();
Controller& rp = myConsole.rightController();
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
lp.myAnalogPinValue[Controller::Nine] = Controller::MAX_RESISTANCE;
lp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
lp.myDigitalPinState[Controller::Six] = true;
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Nine] = Controller::MIN_RESISTANCE;
rp.myAnalogPinValue[Controller::Five] = Controller::MAX_RESISTANCE;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
rp.myDigitalPinState[Controller::Six] = true;
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT])
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_LCTRL] || myKeyTable[KBDK_RCTRL])
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
lp.myAnalogPinValue[Controller::Nine] = Controller::MIN_RESISTANCE;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
Using the Control key in CompuMate mode will no longer interfere with normal control functions (ie, pressing Ctrl-q will not quit, but send this combo directly to CompuMate). Mapped Func-Space to the Backspace key for CompuMate keyboard. Func-space (which is actually Ctrl-space is still supported). Updated documentation for CompuMate changes and system requirements. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2418 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-16 17:57:23 +00:00
rp.myDigitalPinState[Controller::Three] = true;
rp.myDigitalPinState[Controller::Four] = true;
A slight restructuring of the Controller classes, to fix CompuMate support broken in rev 3034. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3038 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-11-04 00:34:56 +00:00
Minor refactoring in CompuMate class. While having friends in real life is good, we should minimize them in classes :)
2017-07-20 13:26:17 +00:00
switch(myColumn) // This is updated inside CartCM class
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
{
case 0:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_7]) lp.myDigitalPinState[Controller::Six] = false;
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_U]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_J]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_M]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 1:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_6]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '?' character (Shift-6) with the actual question key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_SLASH] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_Y]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_H]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_N]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 2:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_8]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '[' character (Shift-8) with the actual key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_LEFTBRACKET] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_I]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_K]) rp.myDigitalPinState[Controller::Six] = false;
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_COMMA]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 3:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_2]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '-' character (Shift-2) with the actual minus key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_MINUS] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_W]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_S]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_X]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 4:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_3]) lp.myDigitalPinState[Controller::Six] = false;
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_E]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_D]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_C]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 5:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_0]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the quote character (Shift-0) with the actual quote key
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_APOSTROPHE] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_P]) rp.myDigitalPinState[Controller::Three] = false;
TIA position counters (POSP0, POSM0, etc) in the debugger now show values in decimal, not hex. All DataGridWidgets (ie, most of the inputs in the debugger) have more strict input filtering, allowing to use $,#,\ specifiers for different bases, as well as restricting input based on the specifier used (ie, if you've entered a '\', only '0' and '1' are allowed, etc). Updated libpng to latest version. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2767 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2013-07-19 13:43:42 +00:00
if (myKeyTable[KBDK_RETURN] || myKeyTable[KBDK_KP_ENTER])
rp.myDigitalPinState[Controller::Six] = false;
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_SPACE]) rp.myDigitalPinState[Controller::Four] = false;
Using the Control key in CompuMate mode will no longer interfere with normal control functions (ie, pressing Ctrl-q will not quit, but send this combo directly to CompuMate). Mapped Func-Space to the Backspace key for CompuMate keyboard. Func-space (which is actually Ctrl-space is still supported). Updated documentation for CompuMate changes and system requirements. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2418 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-16 17:57:23 +00:00
// Emulate Ctrl-space (aka backspace) with the actual Backspace key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_BACKSPACE])
Using the Control key in CompuMate mode will no longer interfere with normal control functions (ie, pressing Ctrl-q will not quit, but send this combo directly to CompuMate). Mapped Func-Space to the Backspace key for CompuMate keyboard. Func-space (which is actually Ctrl-space is still supported). Updated documentation for CompuMate changes and system requirements. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2418 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-16 17:57:23 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
lp.myAnalogPinValue[Controller::Nine] = Controller::MIN_RESISTANCE;
Using the Control key in CompuMate mode will no longer interfere with normal control functions (ie, pressing Ctrl-q will not quit, but send this combo directly to CompuMate). Mapped Func-Space to the Backspace key for CompuMate keyboard. Func-space (which is actually Ctrl-space is still supported). Updated documentation for CompuMate changes and system requirements. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2418 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-16 17:57:23 +00:00
rp.myDigitalPinState[Controller::Four] = false;
}
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 6:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_9]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the ']' character (Shift-9) with the actual key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_RIGHTBRACKET] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_O]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_L]) rp.myDigitalPinState[Controller::Six] = false;
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_PERIOD]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 7:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_5]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '=' character (Shift-5) with the actual equals key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_EQUALS] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_T]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_G]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_B]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 8:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_1]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '+' character (Shift-1) with the actual plus key (Shift-=)
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_EQUALS] && (myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_Q]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_A]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_Z]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
case 9:
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_4]) lp.myDigitalPinState[Controller::Six] = false;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
// Emulate the '/' character (Shift-4) with the actual slash key
Some slight performance modifications to CompuMate handling; we don't need to get the keyboard pointer 60 times per second. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2446 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-04-19 15:25:09 +00:00
if (myKeyTable[KBDK_SLASH] && !(myKeyTable[KBDK_LSHIFT] || myKeyTable[KBDK_RSHIFT]))
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
{
Controller/Genesis/Booster cleanup. - Made BoosterGrip set defaults for analog pins, just like Genesis - Removed superfluous call to update an unchangeable pin in Genesis - Renamed Controller resistance constants to indicate that they are actually constants
2018-06-12 21:37:31 +00:00
rp.myAnalogPinValue[Controller::Five] = Controller::MIN_RESISTANCE;
Updated CompuMate keyboard handler to be more friendly, and use keys on a real keyboard more effectively. Bumped version number, so we start all over again. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2426 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-18 01:40:27 +00:00
lp.myDigitalPinState[Controller::Six] = false;
}
The keyboard now works in TIA emulation mode. Still TODO is get ASCII characters working, so the UI can be used. SDL Window events are now sent to the EventHandler core. For now, only the window expose event is handled (redraws window if it's been hidden). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2872 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2014-03-09 19:22:04 +00:00
if (myKeyTable[KBDK_R]) rp.myDigitalPinState[Controller::Three] = false;
if (myKeyTable[KBDK_F]) rp.myDigitalPinState[Controller::Six] = false;
if (myKeyTable[KBDK_V]) rp.myDigitalPinState[Controller::Four] = false;
More work on the CompuMate scheme. The logic for the Controllers is now complete; I just need to define how to pass actual keyboard keys through the Event system. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2413 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-03-14 22:24:54 +00:00
break;
default:
break;
}
Analog input refactoring and improvements * Lazily update readout circuit simulation as soon as the pin changes * Always assume that "max resistance" means "connected to ground" * Minor accuracy improvements
2017-07-21 22:35:55 +00:00
if (lp.myOnAnalogPinUpdateCallback) {
lp.myOnAnalogPinUpdateCallback(Controller::Five);
lp.myOnAnalogPinUpdateCallback(Controller::Nine);
}
if (rp.myOnAnalogPinUpdateCallback) {
rp.myOnAnalogPinUpdateCallback(Controller::Five);
rp.myOnAnalogPinUpdateCallback(Controller::Nine);
}
Added classes for MindLink and CompuMate controllers. Note that these aren't fully activated yet, but they're the next thing I plan to work on. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2322 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2012-01-02 16:37:17 +00:00
}