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

Jump to bottom

Feature/steam controller #154

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Feature/steam controller #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f53771a
updates display names for new MFi inputs
Jul 3, 2021
653ce58
adds some ps/xbox specific button support
Jul 5, 2021
b570c63
fix typo
Jul 7, 2021
dfc6ab7
Added Initial Steam Controller Support
lbibass Oct 19, 2021
80b208a
Merge branch 'feat/extended_mfi_support' of https://github.com/iancla…
lbibass Oct 20, 2021
a6b738a
Adding in MFI changes to add support for most Steam Controller buttons.
lbibass Oct 20, 2021
bc5284d
just to get it loaded onto my iPad.
lbibass Oct 20, 2021
b666820
attempt to get delta to compile properly
lbibass Oct 24, 2021
1cd1111
fixed the delta core stuff again?
lbibass Oct 24, 2021
9b92a5f
fixed compilation with SteamController module imported
lbibass Oct 24, 2021
4c8ddad
added steam controller exclusive buttons
lbibass Oct 24, 2021
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
2 changes: 1 addition & 1 deletion Cores/DeltaCore
Open in desktop
Submodule DeltaCore updated 2 files
+1 −1 DeltaCore/Cores/DeltaCoreProtocol.swift
+63 −15 DeltaCore/Game Controllers/MFi/MFiGameController.swift
139 changes: 132 additions & 7 deletions Delta.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,9 @@
isa = PBXProject;
attributes = {
DefaultBuildSystemTypeForWorkspace = Original;
KnownAssetTags = (
New,
);
LastSwiftUpdateCheck = 1230;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Riley Testut";
Expand All @@ -936,7 +939,7 @@
};
BFFA71D61AAC406100EE9DD1 = {
CreatedOnToolsVersion = 6.3;
DevelopmentTeam = 6XVY5G3U44;
DevelopmentTeam = X62PCU6RWZ;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
SystemCapabilities = {
Expand All @@ -957,6 +960,8 @@
Base,
);
mainGroup = BFFA71CE1AAC406100EE9DD1;
packageReferences = (
);
productRefGroup = BFFA71D81AAC406100EE9DD1 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -1347,7 +1352,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DGLES_SILENCE_DEPRECATION";
Expand Down Expand Up @@ -1400,7 +1405,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "-DGLES_SILENCE_DEPRECATION";
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
Expand All @@ -1423,12 +1428,70 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = X62PCU6RWZ;
INFOPLIST_FILE = "Delta/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-Wl,-exported_symbol,_Video_PluginStartup,-exported_symbol,_Video_PluginShutdown,-exported_symbol,_Video_PluginGetVersion,-exported_symbol,_Video_RomOpen,-exported_symbol,_Video_RomClosed,-exported_symbol,_ConfigGetSharedDataFilepath,-exported_symbol,_ConfigGetUserConfigPath,-exported_symbol,_ConfigGetUserCachePath,-exported_symbol,_ConfigGetUserDataPath,-exported_symbol,_ConfigOpenSection,-exported_symbol,_ConfigDeleteSection,-exported_symbol,_ConfigSaveSection,-exported_symbol,_ConfigSaveFile,-exported_symbol,_ConfigSetDefaultInt,-exported_symbol,_ConfigSetDefaultFloat,-exported_symbol,_ConfigSetDefaultBool,-exported_symbol,_ConfigSetDefaultString,-exported_symbol,_ConfigGetParamInt,-exported_symbol,_ConfigGetParamFloat,-exported_symbol,_ConfigGetParamBool,-exported_symbol,_ConfigGetParamString,-exported_symbol,_ConfigExternalGetParameter,-exported_symbol,_ConfigExternalOpen,-exported_symbol,_ConfigExternalClose,-exported_symbol,_VidExt_Init,-exported_symbol,_VidExt_Quit,-exported_symbol,_VidExt_ListFullscreenModes,-exported_symbol,_VidExt_SetVideoMode,-exported_symbol,_VidExt_SetCaption,-exported_symbol,_VidExt_ToggleFullScreen,-exported_symbol,_VidExt_ResizeWindow,-exported_symbol,_VidExt_GL_GetProcAddress,-exported_symbol,_VidExt_GL_SetAttribute,-exported_symbol,_VidExt_GL_GetAttribute,-exported_symbol,_VidExt_GL_SwapBuffers,-exported_symbol,_ChangeWindow,-exported_symbol,_InitiateGFX,-exported_symbol,_MoveScreen,-exported_symbol,_ProcessDList,-exported_symbol,_ProcessRDPList,-exported_symbol,_ShowCFB,-exported_symbol,_UpdateScreen,-exported_symbol,_ViStatusChanged,-exported_symbol,_ViWidthChanged,-exported_symbol,_ReadScreen2,-exported_symbol,_SetRenderingCallback,-exported_symbol,_FBRead,-exported_symbol,_FBWrite,-exported_symbol,_FBGetFrameBufferInfo,-exported_symbol,_ResizeVideoOutput,-exported_symbol,_RSP_PluginStartup,-exported_symbol,_RSP_PluginShutdown,-exported_symbol,_RSP_PluginGetVersion,-exported_symbol,_DoRspCycles,-exported_symbol,_InitiateRSP,-exported_symbol,_RSP_RomClosed,-exported_symbol,_CoreGetAPIVersions,-exported_symbol,_ConfigGetParameter,-exported_symbol,_ConfigSetParameter,-exported_symbol,_CoreDoCommand",
"-l\"Alamofire\"",
"-l\"DSDeltaCore\"",
"-l\"GBADeltaCore\"",
"-l\"GBCDeltaCore\"",
"-l\"GTMSessionFetcher\"",
"-l\"GoogleAPIClientForREST\"",
"-l\"GoogleToolboxForMac\"",
"-l\"Harmony\"",
"-l\"MelonDSDeltaCore\"",
"-l\"N64DeltaCore\"",
"-l\"NESDeltaCore\"",
"-l\"Roxas\"",
"-l\"SDWebImage\"",
"-l\"SMCalloutView\"",
"-l\"SNESDeltaCore\"",
"-l\"SQLite.swift\"",
"-l\"SteamController\"",
"-l\"SwiftyDropbox\"",
"-l\"ZIPFoundation\"",
"-l\"c++\"",
"-l\"sqlite3\"",
"-l\"z\"",
"-framework",
"\"CoreBluetooth\"",
"-framework",
"\"CoreGraphics\"",
"-framework",
"\"CoreText\"",
"-framework",
"\"Crashlytics\"",
"-framework",
"\"Fabric\"",
"-framework",
"\"Foundation\"",
"-framework",
"\"GameController\"",
"-framework",
"\"GoogleSignIn\"",
"-framework",
"\"ImageIO\"",
"-framework",
"\"LocalAuthentication\"",
"-framework",
"\"SafariServices\"",
"-framework",
"\"Security\"",
"-framework",
"\"SystemConfiguration\"",
"-framework",
"\"UIKit\"",
"-framework",
"\"WebKit\"",
);
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG";
PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta;
PRODUCT_BUNDLE_IDENTIFIER = com.lbibass1.Delta;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_INSTALLED_PRODUCT = YES;
Expand All @@ -1438,6 +1501,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Delta/Supporting Files/Delta-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
TVOS_DEPLOYMENT_TARGET = 14.7;
};
name = Debug;
};
Expand All @@ -1452,12 +1517,70 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = X62PCU6RWZ;
INFOPLIST_FILE = "Delta/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-Wl,-exported_symbol,_Video_PluginStartup,-exported_symbol,_Video_PluginShutdown,-exported_symbol,_Video_PluginGetVersion,-exported_symbol,_Video_RomOpen,-exported_symbol,_Video_RomClosed,-exported_symbol,_ConfigGetSharedDataFilepath,-exported_symbol,_ConfigGetUserConfigPath,-exported_symbol,_ConfigGetUserCachePath,-exported_symbol,_ConfigGetUserDataPath,-exported_symbol,_ConfigOpenSection,-exported_symbol,_ConfigDeleteSection,-exported_symbol,_ConfigSaveSection,-exported_symbol,_ConfigSaveFile,-exported_symbol,_ConfigSetDefaultInt,-exported_symbol,_ConfigSetDefaultFloat,-exported_symbol,_ConfigSetDefaultBool,-exported_symbol,_ConfigSetDefaultString,-exported_symbol,_ConfigGetParamInt,-exported_symbol,_ConfigGetParamFloat,-exported_symbol,_ConfigGetParamBool,-exported_symbol,_ConfigGetParamString,-exported_symbol,_ConfigExternalGetParameter,-exported_symbol,_ConfigExternalOpen,-exported_symbol,_ConfigExternalClose,-exported_symbol,_VidExt_Init,-exported_symbol,_VidExt_Quit,-exported_symbol,_VidExt_ListFullscreenModes,-exported_symbol,_VidExt_SetVideoMode,-exported_symbol,_VidExt_SetCaption,-exported_symbol,_VidExt_ToggleFullScreen,-exported_symbol,_VidExt_ResizeWindow,-exported_symbol,_VidExt_GL_GetProcAddress,-exported_symbol,_VidExt_GL_SetAttribute,-exported_symbol,_VidExt_GL_GetAttribute,-exported_symbol,_VidExt_GL_SwapBuffers,-exported_symbol,_ChangeWindow,-exported_symbol,_InitiateGFX,-exported_symbol,_MoveScreen,-exported_symbol,_ProcessDList,-exported_symbol,_ProcessRDPList,-exported_symbol,_ShowCFB,-exported_symbol,_UpdateScreen,-exported_symbol,_ViStatusChanged,-exported_symbol,_ViWidthChanged,-exported_symbol,_ReadScreen2,-exported_symbol,_SetRenderingCallback,-exported_symbol,_FBRead,-exported_symbol,_FBWrite,-exported_symbol,_FBGetFrameBufferInfo,-exported_symbol,_ResizeVideoOutput,-exported_symbol,_RSP_PluginStartup,-exported_symbol,_RSP_PluginShutdown,-exported_symbol,_RSP_PluginGetVersion,-exported_symbol,_DoRspCycles,-exported_symbol,_InitiateRSP,-exported_symbol,_RSP_RomClosed,-exported_symbol,_CoreGetAPIVersions,-exported_symbol,_ConfigGetParameter,-exported_symbol,_ConfigSetParameter,-exported_symbol,_CoreDoCommand",
"-l\"Alamofire\"",
"-l\"DSDeltaCore\"",
"-l\"GBADeltaCore\"",
"-l\"GBCDeltaCore\"",
"-l\"GTMSessionFetcher\"",
"-l\"GoogleAPIClientForREST\"",
"-l\"GoogleToolboxForMac\"",
"-l\"Harmony\"",
"-l\"MelonDSDeltaCore\"",
"-l\"N64DeltaCore\"",
"-l\"NESDeltaCore\"",
"-l\"Roxas\"",
"-l\"SDWebImage\"",
"-l\"SMCalloutView\"",
"-l\"SNESDeltaCore\"",
"-l\"SQLite.swift\"",
"-l\"SteamController\"",
"-l\"SwiftyDropbox\"",
"-l\"ZIPFoundation\"",
"-l\"c++\"",
"-l\"sqlite3\"",
"-l\"z\"",
"-framework",
"\"CoreBluetooth\"",
"-framework",
"\"CoreGraphics\"",
"-framework",
"\"CoreText\"",
"-framework",
"\"Crashlytics\"",
"-framework",
"\"Fabric\"",
"-framework",
"\"Foundation\"",
"-framework",
"\"GameController\"",
"-framework",
"\"GoogleSignIn\"",
"-framework",
"\"ImageIO\"",
"-framework",
"\"LocalAuthentication\"",
"-framework",
"\"SafariServices\"",
"-framework",
"\"Security\"",
"-framework",
"\"SystemConfiguration\"",
"-framework",
"\"UIKit\"",
"-framework",
"\"WebKit\"",
);
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DIMPACTOR";
PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta;
PRODUCT_BUNDLE_IDENTIFIER = com.lbibass1.Delta;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_INSTALLED_PRODUCT = YES;
Expand All @@ -1466,6 +1589,8 @@
SWIFT_OBJC_BRIDGING_HEADER = "Delta/Supporting Files/Delta-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
TVOS_DEPLOYMENT_TARGET = 14.7;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Delta.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 14 additions & 5 deletions Delta.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,19 @@
"pins": [
{
"package": "DeltaCore",
"repositoryURL": "https://github.com/rileytestut/DeltaCore.git",
"repositoryURL": "https://github.com/lbibass/DeltaCore",
"state": {
"branch": "main",
"revision": "eeefb30bd78fb130f1113e823afbce6f4f767cfb",
"branch": "feature/SteamController",
"revision": "4735ed22467ae67877806286f86744647dbebf0e",
"version": null
}
},
{
"package": "SteamController",
"repositoryURL": "https://github.com/zydeco/SteamController",
"state": {
"branch": "master",
"revision": "59d257823a422da57c5acf57d56f740b4b8eb8dd",
"version": null
}
},
Expand All @@ -15,8 +24,8 @@
"repositoryURL": "https://github.com/weichsel/ZIPFoundation.git",
"state": {
"branch": null,
"revision": "ec32d62d412578542c0ffb7a6ce34d3e64b43b94",
"version": "0.9.11"
"revision": "cf10bbff6ac3b873e97b36b9784c79866a051a8e",
"version": "0.9.12"
}
}
]
Expand Down
12 changes: 12 additions & 0 deletions Delta/Extensions/Input+Display.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ extension Input
let input = MFiGameController.Input(input: self)!
switch input
{
case.steamBackButton: return NSLocalizedString("Steam Back Button", comment: "")
case.steamForwardButton: return NSLocalizedString("Steam Forward Button", comment: "")
case.steamSteamButton:return NSLocalizedString("Steam Logo Button", comment: "")
case .menu: return NSLocalizedString("Menu", comment: "")
case .options: return NSLocalizedString("Options", comment: "")
case .home: return NSLocalizedString("Home", comment: "")
case .up: return NSLocalizedString("Up", comment: "")
case .down: return NSLocalizedString("Down", comment: "")
case .left: return NSLocalizedString("Left", comment: "")
Expand All @@ -122,8 +127,15 @@ extension Input
case .y: return NSLocalizedString("Y", comment: "")
case .leftShoulder: return NSLocalizedString("L1", comment: "")
case .leftTrigger: return NSLocalizedString("L2", comment: "")
case .leftThumbstickButton: return NSLocalizedString("L3", comment: "")
case .rightShoulder: return NSLocalizedString("R1", comment: "")
case .rightTrigger: return NSLocalizedString("R2", comment: "")
case .rightThumbstickButton: return NSLocalizedString("R3", comment: "")
case .psTouchpadButton: return NSLocalizedString("Touchpad", comment: "")
case .xboxPaddleButton1: return NSLocalizedString("Paddle1", comment: "")
case .xboxPaddleButton2: return NSLocalizedString("Paddle2", comment: "")
case .xboxPaddleButton3: return NSLocalizedString("Paddle3", comment: "")
case .xboxPaddleButton4: return NSLocalizedString("Paddle4", comment: "")
}

case .controller(.keyboard):
Expand Down
2 changes: 2 additions & 0 deletions Delta/Supporting Files/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<false/>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Uses bluetooth for controllers. </string>
Copy link
Author

Choose a reason for hiding this comment

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

this was necessary because otherwise, delta fails to launch due to permission errors.

<key>NSMicrophoneUsageDescription</key>
<string>Delta uses your microphone to emulate the Nintendo DS microphone.</string>
<key>NSPhotoLibraryUsageDescription</key>
Expand Down
3 changes: 2 additions & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ target 'Delta' do
pod 'MelonDSDeltaCore', :path => 'Cores/MelonDSDeltaCore'
pod 'Roxas', :path => 'External/Roxas'
pod 'Harmony', :path => 'External/Harmony'
# pod 'SteamController'
end

# Unlink DeltaCore to prevent conflicts with Systems.framework
Expand All @@ -36,4 +37,4 @@ post_install do |installer|
end
end
end
end
end
12 changes: 9 additions & 3 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ PODS:
- Crashlytics (3.8.6):
- Fabric (~> 1.6.3)
- DeltaCore (0.1):
- SteamController
- ZIPFoundation
- DSDeltaCore (0.1):
- DeltaCore
Expand Down Expand Up @@ -66,6 +67,9 @@ PODS:
- SQLite.swift (0.12.2):
- SQLite.swift/standard (= 0.12.2)
- SQLite.swift/standard (0.12.2)
- SteamController (1.3):
- SteamController/default (= 1.3)
- SteamController/default (1.3)
- SwiftyDropbox (5.0.0):
- Alamofire (~> 4.7.3)
- ZIPFoundation (0.9.11)
Expand Down Expand Up @@ -99,6 +103,7 @@ SPEC REPOS:
- SDWebImage
- SMCalloutView
- SQLite.swift
- SteamController
- SwiftyDropbox
- ZIPFoundation

Expand Down Expand Up @@ -127,7 +132,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
Crashlytics: e156f27e43abaa331f9b7afed091bda37e1052cc
DeltaCore: 86a78ac8fb0d40190231b5fb64d109f7516de187
DeltaCore: 9519a6af84fcd13cf064fda78f5da19cf42cf333
DSDeltaCore: c113b64288d253fafe350ee23df143c76a11e173
Fabric: be0459577cee96fe21f68de24588be2dd71482b8
GBADeltaCore: 55e32d21508ce7383a1b1587e425ccc60620ad66
Expand All @@ -145,9 +150,10 @@ SPEC CHECKSUMS:
SMCalloutView: 5c0ee363dc8e7204b2fda17dfad38c93e9e23481
SNESDeltaCore: 1e9cc751501082480f8181d4449322ee4ec26dac
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
SteamController: a868a0d6818dc38697f21d4556c9db6ed003f6a8
SwiftyDropbox: 378b4425a2e8d0cb24c7b0f2e3af72bfbaaf1e73
ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197

PODFILE CHECKSUM: 2f9219b1db18479e650fc2159f58160b4cc13aad
PODFILE CHECKSUM: 8b26e270d52714412ffcea0ccfe32a2d456c8354

COCOAPODS: 1.10.1
COCOAPODS: 1.11.2
8 changes: 6 additions & 2 deletions Pods/Local Podspecs/DeltaCore.podspec.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading