Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync changes from Master #30

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Sync changes from Master #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d79c3
Some fixes (#29)
kikexx Sep 27, 2024
21092e1
Consistency, slight cleanup
SeongGino Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions SamcoEnhanced/SamcoEnhanced.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,10 @@ bool buttonPressed = false; // Sanity check.
#endif // USES_SOLENOID
#ifdef USES_DISPLAY
bool serialDisplayChange = false; // Signal of pending display update, sent by Core 2 to be used by Core 1 in dual core configs
uint8_t serialLifeCount = 0;
uint16_t serialLifeCount = 0; // Changed from uint16_t for games with life values > 255
uint8_t serialAmmoCount = 0;
uint16_t dispMaxLife = 0; // Max value for life in lifebar mode (100%)
uint16_t dispLifePercentage = 0; // Actual value to show in lifebar mode #%
#endif // USES_DISPLAY
#endif // MAMEHOOKER

Expand Down Expand Up @@ -1423,7 +1425,12 @@ void ExecRunMode()
// so just do it here using the signal sent by it.
if(serialDisplayChange) {
if(OLED.serialDisplayType == ExtDisplay::ScreenSerial_Ammo) { OLED.PrintAmmo(serialAmmoCount); }
else if(OLED.serialDisplayType == ExtDisplay::ScreenSerial_Life && OLED.lifeBar) { OLED.PrintLife(dispLifePercentage); }
else if(OLED.serialDisplayType == ExtDisplay::ScreenSerial_Life) { OLED.PrintLife(serialLifeCount); }
else if(OLED.serialDisplayType == ExtDisplay::ScreenSerial_Both && OLED.lifeBar) {
OLED.PrintAmmo(serialAmmoCount);
OLED.PrintLife(dispLifePercentage);
}
else if(OLED.serialDisplayType == ExtDisplay::ScreenSerial_Both) {
OLED.PrintAmmo(serialAmmoCount);
OLED.PrintLife(serialLifeCount);
Expand Down Expand Up @@ -3259,6 +3266,7 @@ void SerialProcessing()
}
if(Serial.read() == 'B') {
OLED.lifeBar = true;
dispMaxLife = 0;
} else { OLED.lifeBar = false; }
// prevent glitching if currently in pause mode
if(gunMode == GunMode_Run) {
Expand Down Expand Up @@ -3570,6 +3578,10 @@ void SerialProcessing()
}
}
serialLifeCount = atoi(serialInputS);
if (OLED.lifeBar){
if (serialLifeCount > dispMaxLife) { dispMaxLife = serialLifeCount; }
dispLifePercentage = (100 * serialLifeCount) / dispMaxLife; // Calculate the Life % to show
}
break;
}
}
Expand Down Expand Up @@ -3759,12 +3771,14 @@ void SerialHandling()
void TriggerFireSimple()
{
if(!buttonPressed && // Have we not fired the last cycle,
offscreenButtonSerial && buttons.offScreen) { // and are pointing the gun off screen WITH the offScreen button mode set?
AbsMouse5.press(MOUSE_RIGHT); // Press the right mouse button
offscreenButtonSerial && buttons.offScreen) { // and are pointing the gun off screen WITH the offScreen button mode set?
if(buttons.analogOutput) { Gamepad16.press(LightgunButtons::ButtonDesc[BtnIdx_A].reportCode3); }
else { AbsMouse5.press(MOUSE_RIGHT); }
offscreenBShot = true; // Mark we pressed the right button via offscreen shot mode,
buttonPressed = true; // Mark so we're not spamming these press events.
} else if(!buttonPressed) { // Else, have we simply not fired the last cycle?
AbsMouse5.press(MOUSE_LEFT); // We're handling the trigger button press ourselves for a reason.
if(buttons.analogOutput) { Gamepad16.press(LightgunButtons::ButtonDesc[BtnIdx_Trigger].reportCode3); }
else { AbsMouse5.press(MOUSE_LEFT); }
buttonPressed = true; // Set this so we won't spam a repeat press event again.
}
}
Expand All @@ -3774,10 +3788,18 @@ void TriggerNotFireSimple()
{
if(buttonPressed) { // Just to make sure we aren't spamming mouse button events.
if(offscreenBShot) { // if it was marked as an offscreen button shot,
AbsMouse5.release(MOUSE_RIGHT); // Release the right mouse,
if(buttons.analogOutput) { //Check if gamepad mode is enabled
Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_A].reportCode3); //If gamepad mode is enabled release A Button
} else {
AbsMouse5.release(MOUSE_RIGHT); // Release the right mouse,
}
offscreenBShot = false; // And set it off.
} else { // Else,
AbsMouse5.release(MOUSE_LEFT); // It was a normal shot, so just release the left mouse button.
if(buttons.analogOutput) { //Check if gamepad mode is enabled
Gamepad16.release(LightgunButtons::ButtonDesc[BtnIdx_Trigger].reportCode3); // If gamepad mode is enabled release the Trigger button
} else {
AbsMouse5.release(MOUSE_LEFT); // It was a normal shot, so just release the left mouse button.
}
}
buttonPressed = false; // Unset the button pressed bit.
}
Expand Down
Loading