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

Added infrastructure to call methods on AVox/SaveKey controllers from InputDialog. 

Thomas, you will need to edit InputDialog::eraseEEPROM and finish the logic there.
This commit is contained in:
Stephen Anthony 2017-10-02 19:57:21 -02:30
parent e10ca8e694
commit bec1784d18
3 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/InputDialog.cxx
View File

@ -212,9 +212,10 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
int fwidth;
// Add EEPROM erase (part 1/2)
/*fwidth = font.getStringWidth("Erase EEPROM") + 20;
fwidth = font.getStringWidth("Erase EEPROM") + 20;
lwidth = font.getStringWidth("AVox/SaveKey");
new StaticTextWidget(myTab, font, _w - 10 - (fwidth + lwidth) / 2, ypos + 1+8, "AVox/SaveKey");*/
new StaticTextWidget(myTab, font, _w - 10 - (fwidth + lwidth) / 2, ypos + 8,
"AVox/SaveKey");
// Show joystick database
xpos += 20; ypos += lineHeight + 8;
@ -223,8 +224,8 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
wid.push_back(myJoyDlgButton);
// Add EEPROM erase (part 1/2)
/*myEraseEEPROMButton = new ButtonWidget(myTab, font, _w - 14 - fwidth, ypos,
"Erase EEPROM", kEEButtonPressed);*/
myEraseEEPROMButton = new ButtonWidget(myTab, font, _w - 14 - fwidth, ypos,
"Erase EEPROM", kEEButtonPressed);
// Add AtariVox serial port
xpos -= 20; ypos += lineHeight + 12;
@ -270,6 +271,12 @@ void InputDialog::loadConfig()
// AtariVox serial port
myAVoxPort->setText(instance().settings().getString("avoxport"));
// EEPROM erase (only enable in emulation mode)
if(instance().hasConsole())
myEraseEEPROMButton->setFlags(WIDGET_ENABLED);
else
myEraseEEPROMButton->clearFlags(WIDGET_ENABLED);
// Allow all 4 joystick directions
myAllowAll4->setState(instance().settings().getBool("joyallow4"));
@ -435,6 +442,26 @@ bool InputDialog::handleJoyHat(int stick, int hat, int value)
return Dialog::handleJoyHat(stick, hat, value);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void InputDialog::eraseEEPROM()
{
// This method will only be callable if a console exists, so we don't
// need to check again here
Controller& lport = instance().console().leftController();
Controller& rport = instance().console().rightController();
// FIXME thrust26 - cast to correct type and call whatever method you like ...
if(lport.type() == Controller::AtariVox)
cerr << "left avox needs to be erased\n";
else if(lport.type() == Controller::SaveKey)
cerr << "left savekey needs to be erased\n";
if(rport.type() == Controller::AtariVox)
cerr << "right avox needs to be erased\n";
else if(rport.type() == Controller::SaveKey)
cerr << "right savekey needs to be erased\n";
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void InputDialog::handleCommand(CommandSender* sender, int cmd,
int data, int id)
@ -478,9 +505,9 @@ void InputDialog::handleCommand(CommandSender* sender, int cmd,
myJoyDialog->show();
break;
/*case kEEButtonPressed:
// TODO
break;*/
case kEEButtonPressed:
eraseEEPROM();
break;
default:
Dialog::handleCommand(sender, cmd, data, 0);

6
src/gui/InputDialog.hxx
View File

@ -52,6 +52,8 @@ class InputDialog : public Dialog
void addDevicePortTab(const GUI::Font& font);
void eraseEEPROM();
private:
enum {
kDeadzoneChanged = 'DZch',
@ -59,7 +61,7 @@ class InputDialog : public Dialog
kMPSpeedChanged = 'PMch',
kTBSpeedChanged = 'TBch',
kDBButtonPressed = 'DBbp',
//kEEButtonPressed = 'EEbp'
kEEButtonPressed = 'EEbp'
};
TabWidget* myTab;
@ -86,7 +88,7 @@ class InputDialog : public Dialog
CheckboxWidget* myCtrlCombo;
ButtonWidget* myJoyDlgButton;
//ButtonWidget* myEraseEEPROMButton;
ButtonWidget* myEraseEEPROMButton;
// Show the list of joysticks that the eventhandler knows about
unique_ptr<JoystickDialog> myJoyDialog;