Skip to content

Commit

Permalink
Merge pull request #34 from Touille/beta-3.0-Beyond
Browse files Browse the repository at this point in the history 
3.0 Beyond
  • Loading branch information
@Touille
Touille authored Apr 27, 2018
2 parents 2fed7a3 + 66fa6ab commit 2085422
Show file tree
Hide file tree
Showing 12 changed files with 251 additions and 140 deletions.
129 changes: 91 additions & 38 deletions ...ite Dangerous/ED+HCS V2.3.11.1b.2.0.binds → ... Elite Dangerous/ED+HCS V3.0.5b.3.0.binds
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Root PresetName="ED+HCS V2.3.11.1b" MajorVersion="2" MinorVersion="0">
<Root PresetName="ED+HCS V3.0.5b" MajorVersion="3" MinorVersion="0">
<KeyboardLayout>en-GB</KeyboardLayout>
<MouseXMode Value="" />
<MouseXDecay Value="0" />
Expand Down Expand Up @@ -355,11 +355,15 @@
</TargetNextRouteSystem>
<PrimaryFire>
<Primary Device="ThrustMasterWarthogCombined" Key="Joy_1" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_Q">
<Modifier Device="Keyboard" Key="Key_RightAlt" />
</Secondary>
</PrimaryFire>
<SecondaryFire>
<Primary Device="ThrustMasterWarthogCombined" Key="Joy_2" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_A">
<Modifier Device="Keyboard" Key="Key_RightAlt" />
</Secondary>
</SecondaryFire>
<CycleFireGroupNext>
<Primary Device="{NoDevice}" Key="" />
Expand Down Expand Up @@ -609,83 +613,108 @@
</HeadLookYawAxis>
<MotionHeadlook Value="0" />
<HeadlookMotionSensitivity Value="1.00000000" />
<yawRotateHeadlook Value="0" />
<CamPitchAxis>
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RYAxis" />
<Inverted Value="1" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_YAxis" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CamPitchAxis>
<CamPitchUp>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_T">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamPitchUp>
<CamPitchDown>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_G">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamPitchDown>
<CamYawAxis>
<Binding Device="{NoDevice}" Key="" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_XAxis" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CamYawAxis>
<CamYawLeft>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_Q" />
<Secondary Device="Keyboard" Key="Key_Q">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamYawLeft>
<CamYawRight>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_E" />
<Secondary Device="Keyboard" Key="Key_E">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamYawRight>
<CamTranslateYAxis>
<Binding Device="{NoDevice}" Key="" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CamTranslateYAxis>
<CamTranslateForward>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_W" />
<Primary Device="Keyboard" Key="Key_W" />
<Secondary Device="Keyboard" Key="Key_W">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateForward>
<CamTranslateBackward>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_S" />
<Primary Device="Keyboard" Key="Key_S" />
<Secondary Device="Keyboard" Key="Key_S">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateBackward>
<CamTranslateXAxis>
<Binding Device="{NoDevice}" Key="" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CamTranslateXAxis>
<CamTranslateLeft>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_A" />
<Primary Device="Keyboard" Key="Key_A" />
<Secondary Device="Keyboard" Key="Key_A">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateLeft>
<CamTranslateRight>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_D" />
<Primary Device="Keyboard" Key="Key_D" />
<Secondary Device="Keyboard" Key="Key_D">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateRight>
<CamTranslateZAxis>
<Binding Device="{NoDevice}" Key="" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CamTranslateZAxis>
<CamTranslateUp>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_R" />
<Primary Device="Keyboard" Key="Key_R" />
<Secondary Device="Keyboard" Key="Key_R">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateUp>
<CamTranslateDown>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_F" />
<Primary Device="Keyboard" Key="Key_F" />
<Secondary Device="Keyboard" Key="Key_F">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamTranslateDown>
<CamZoomAxis>
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RXAxis" />
<Inverted Value="0" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RYAxis" />
<Inverted Value="1" />
<Deadzone Value="0.00000000" />
</CamZoomAxis>
<CamZoomIn>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_Z">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamZoomIn>
<CamZoomOut>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_X">
<Modifier Device="Keyboard" Key="Key_RightControl" />
</Secondary>
</CamZoomOut>
<CamTranslateZHold>
<Primary Device="{NoDevice}" Key="" />
Expand Down Expand Up @@ -718,7 +747,7 @@
<Secondary Device="Keyboard" Key="Key_D" />
</SteerRightButton>
<BuggyRollAxisRaw>
<Binding Device="{NoDevice}" Key="" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_XAxis" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</BuggyRollAxisRaw>
Expand All @@ -731,8 +760,8 @@
<Secondary Device="{NoDevice}" Key="" />
</BuggyRollRightButton>
<BuggyPitchAxis>
<Binding Device="{NoDevice}" Key="" />
<Inverted Value="0" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_YAxis" />
<Inverted Value="1" />
<Deadzone Value="0.00000000" />
</BuggyPitchAxis>
<BuggyPitchUpButton>
Expand Down Expand Up @@ -1102,11 +1131,11 @@
<Secondary Device="{NoDevice}" Key="" />
</FreeCamSpeedDec>
<MoveFreeCamY>
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_ZAxis" />
<Inverted Value="1" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RYAxis" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</MoveFreeCamY>
<ThrottleRangeFreeCam Value="Bindings_ThrottleForewardOnly" />
<ThrottleRangeFreeCam Value="" />
<ToggleReverseThrottleInputFreeCam>
<Primary Device="Keyboard" Key="Key_LeftControl">
<Modifier Device="Keyboard" Key="Key_R" />
Expand Down Expand Up @@ -1176,7 +1205,7 @@
<Secondary Device="{NoDevice}" Key="" />
</PitchCameraDown>
<YawCamera>
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RXAxis" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_XAxis" />
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</YawCamera>
Expand All @@ -1190,9 +1219,9 @@
<Secondary Device="{NoDevice}" Key="" />
</YawCameraRight>
<RollCamera>
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_XAxis" />
<Inverted Value="1" />
<Deadzone Value="0.00000000" />
<Binding Device="ThrustMasterWarthogCombined" Key="Joy_RXAxis" />
<Inverted Value="0" />
<Deadzone Value="0.25000000" />
</RollCamera>
<RollCameraLeft>
<Primary Device="{NoDevice}" Key="" />
Expand Down Expand Up @@ -1223,11 +1252,11 @@
<Secondary Device="{NoDevice}" Key="" />
</ToggleAdvanceMode>
<FreeCamZoomIn>
<Primary Device="Keyboard" Key="Key_Numpad_3" />
<Primary Device="Keyboard" Key="Key_Numpad_8" />
<Secondary Device="{NoDevice}" Key="" />
</FreeCamZoomIn>
<FreeCamZoomOut>
<Primary Device="Keyboard" Key="Key_Numpad_1" />
<Primary Device="Keyboard" Key="Key_Numpad_2" />
<Secondary Device="{NoDevice}" Key="" />
</FreeCamZoomOut>
<FStopDec>
Expand Down Expand Up @@ -1255,4 +1284,28 @@
<Inverted Value="0" />
<Deadzone Value="0.00000000" />
</CommanderCreator_Rotation>
<GalnetAudio_Play_Pause>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_Space">
<Modifier Device="Keyboard" Key="Key_LeftAlt" />
</Secondary>
</GalnetAudio_Play_Pause>
<GalnetAudio_SkipForward>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_PageUp">
<Modifier Device="Keyboard" Key="Key_LeftAlt" />
</Secondary>
</GalnetAudio_SkipForward>
<GalnetAudio_SkipBackward>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_PageDown">
<Modifier Device="Keyboard" Key="Key_LeftAlt" />
</Secondary>
</GalnetAudio_SkipBackward>
<GalnetAudio_ClearQueue>
<Primary Device="{NoDevice}" Key="" />
<Secondary Device="Keyboard" Key="Key_End">
<Modifier Device="Keyboard" Key="Key_LeftAlt" />
</Secondary>
</GalnetAudio_ClearQueue>
</Root>
24 changes: 14 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Elite Dangerous Warthog Target Script (HCS Keys Binding) 2.3.11.1b 2017/08/12
# Elite Dangerous Warthog Target Script (HCS Keys Binding) 3.0.2b 2018/03/07

![ED LOGO](http://edassets.org/img/preview/elite-dangerous-logo_grey.png)
![ED LOGO](https://www.elitedangerous.com/_assets/img/logo-elite-dangerous.png)


***Special thanks go out to Aussiedroid, DarKcyde0, WraithMG11235, Synkc, Solarfly and Farinhir***
Expand All @@ -12,20 +12,23 @@
### INSTALATION:

* The Warthog Script can be run from any location. All files from __Thrustmaster Warthog Script__ folder need to be in the same folder.
* Copy the Elite Dangerous Binds Profile __ED+HCS V2.X.XX.XX.2.0.binds__ from __Default Keybinds - Elite Dangerous__ Folder to:
* Copy the Elite Dangerous Binds Profile __ED+HCS V3.X.XX.XX.3.0.binds__ from __Default Keybinds - Elite Dangerous__ Folder to:
```
\Users\<User>\AppData\Local\Frontier Developments\Elite Dangerous\Options\Bindings
```
* Just Drag&Drop __ED+HCS v2.3.tmc__ to TARGET Script Editor and Run. (Default script path can also be set in the options). Always make sure the script is running prior to starting Elite Dangerous.
* Just Drag&Drop __ED+HCS v3.0.tmc__ to TARGET Script Editor and Run. (Default script path can also be set in the options). Always make sure the script is running prior to starting Elite Dangerous.
* Most commands can be tested prior to starting the game in Target Script Editor using the Debug Message, Event Tester and Device Analyzer.
* Launch Elite Dangerous, Options, Controls and chose the correct Binds Profile __ED+HCS V2.X.XX.XX.2.0.binds__
* Launch Elite Dangerous, Options, Controls and chose the correct Binds Profile __ED+HCS V3.X.XX.XX.3.0.binds__
* Play :)

### WARNING : If you want to change Bindings keys IN GAME, Make sure to use ENG(UK) Keyboard layout in Wndows. If you did not, your Bindings file will be unusable with the script. (ED change some keys inside the file, even if you don't change them, to the current windows keyboard layout)
---
---
---
### BEFORE FLYING:

***First, I'm sorry for my English, as it is not my native language. You are Welcome to help me on my English Skill, and, obviously, with my Coding Skill (it is, also, not my native language) ;)***

__All the Settings are in the Settings File__ : **ED+HCS v2.3_Settings.tmh**
__All the Settings are in the Settings File__ : **ED+HCS v3.0_Settings.tmh**

__The Command's are on the Joystick and Throttle Chart : [S]ShortPress, [L]LongPress, [EL]ExtraLongPress, [S3]Modifier Key on Joystick__

Expand Down Expand Up @@ -104,9 +107,10 @@ center of the axis, and then apply it to the X and Y axis (Throttle Coolie Swit

- [x] 3 Autopilot Mode : Easy Request and Cancel Docking procedure, Escape Fight and System Jump

### EXPLORER MODE:
### EXPLORER MODE (ENG L Throttle swith UP):

***Thinking to make a mode wich restore all the Original ED Gameplay with one Switch (without all the advanced option (like optimalPIP, PIP Preset's, SecureRetract,...) instead of explorer mode. Let me know what you think.***

- [x] Desactivate some advanced functions you don't need for Exploration with one switch: Automatic PIP Mode (for fire & hardpoints), Automatic retract Hardpoint when you stop fire,... (if activated). If switch off this mode, it will return to all your previous choices.
- [ ] You don't need to keep fire key pressed to scan system or use Scan (System, wake...), **If Explorer mode is enable**, just press and release.( This function work on both Fire, chose wich you want to assign to scan in Settings File : ExploreModeFire , Triger use for Scan : 0 is Tg1, 1 is S2, 2 is Tg1 and S2 ). **If Explorer mode is disable**, you can also use this function : Press [S3] & Fire 1 or/and Fire 2. (Warning : check TG1ScanDelay & S2ScanDelay in setting File. by default TG1ScanDelay is 6sec (system scan) and S2ScanDelay is 11sec (other scan))
- [ ] When You are in Explorer Mode Automatic System System Jump (long press speedbrake forward on your throttle arm) Work like this : target next system in route , set Full speed, then jump, then, when you enter your next system, set throttle speed to 0, then automatically push the fire button for discovery scan (so check the settings file to put your discovery scan on fire 1 or fire 2 as it is in game), then automatically target the nearest star. __YOU CAN DESACTIVATE AUTO DISCOVERY SCAN AND AUTO TARGET NEAREST STAR IN SETTINGS FILE : AutoDiscoveryScan & TargetNearestStar options.
PLEASE, IF YOU USE THIS, ALIGN TO YOU NEXT SYSTEM BEFORE PUSHING THE JUMP__ You can, also change delay Speed to 0 when entering system : FSDOFFDelay Or Automatic Scan when entering system : FSDJumpScanDelay
- [ ] You don't need to keep fire key pressed to scan system or use Scan (System, wake...), **If Explorer mode is enable**, just press and release.( This function work on both Fire, chose wich you want to assign to scan in Settings File : ExploreModeFire , Triger use for Scan : 0 is Tg1, 1 is S2, 2 is Tg1 and S2 ). **If Explorer mode is disable**, you can also use this function : Press [S3] & Fire 1 or/and Fire 2. (Warning : check TG1ScanDelay & S2ScanDelay in setting File. by default TG1ScanDelay is 6sec (system scan) and S2ScanDelay is 11sec (other scan))
Binary file modified ...aster Warthog Chart/Elite Dangerous - Thrustmaster Warthog Chart - Throttle.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 13 additions & 29 deletions Thrustmaster Warthog Script/ED+HCS v2.3.tmc → Thrustmaster Warthog Script/ED+HCS v3.0.tmc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (C) 2017 Thomas Duployez (CMDR Touille)
// V2.3.11.1b 2017/08
// Copyright (C) 2018 Thomas Duployez (CMDR Touille)
// V3.0.2b 2018/03
// Distributed freely under the MIT License.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
Expand All @@ -24,14 +24,14 @@
//--------------------------------------------------------------------------------------------------------------------------------------------------------------//

include "target.tmh"
include "ED+HCS v2.3_Variables.tmh"
include "ED+HCS v2.3_Settings.tmh"
include "ED+HCS v2.3_USBKey.ttm"
include "ED+HCS v2.3_KeyBindings.ttm"
include "ED+HCS v2.3_Macros.tmh"
include "ED+HCS v2.3_Functions_HARDWARE.tmh"
include "ED+HCS v2.3_Functions_TOGGLE.tmh"
include "ED+HCS v2.3_Functions_CORE.tmh"
include "ED+HCS v3.0_Variables.tmh"
include "ED+HCS v3.0_Settings.tmh"
include "ED+HCS v3.0_USBKey.ttm"
include "ED+HCS v3.0_KeyBindings.ttm"
include "ED+HCS v3.0_Macros.tmh"
include "ED+HCS v3.0_Functions_HARDWARE.tmh"
include "ED+HCS v3.0_Functions_TOGGLE.tmh"
include "ED+HCS v3.0_Functions_CORE.tmh"

//--------------------------------------------------------------------------------------------------------------------------------------------------------------//
int main()
Expand Down Expand Up @@ -96,7 +96,7 @@ int main()
// ;) //
//--------------------------------------------------------------------------------------------------------------------------------------------------------------//

printf("--------------------------V2.3.11.1b----2017/08/13------------------------\x0a");
printf("--------------------------V3.0.2b-------2017/03/07------------------------\x0a");
printf("---------Enhanced Elite Dangerous Warthog Profile by CMDR Touille---------\x0a");
printf("------------------------------Fly Safe CMDR! o7---------------------------\x0a");
printf("-o/--o/--o/-Aussiedroid-DarKcyde0-WraithMG11235-Synkc-Solarfly-o/--o/--o/-\x0a");
Expand Down Expand Up @@ -299,7 +299,7 @@ int main()

// -------------------------Speedbrake
MapKey (&Throttle, T3_SPDF, TEMPO(EXEC("initFrameShiftDrive();"), EXEC("initSystemJump();"), ExtraPressDelay)); // Switch FORWARD
// MapKey (&Throttle, T3_SPDM, 0); // Switch MIDDLE
// MapKey (&Throttle, T3_SPDM, 0); // Switch MIDDLE
MapKeyIO(&Throttle, T3_SPDB, EXEC("initToggleSuperCruiseMode();"), TEMPO(EXEC("initThrottleBoost();"), EXEC("initSuperCruise();"), LongPressDelay)); // Switch BACK HOLD

// -------------------------Boat Switch
Expand All @@ -313,7 +313,7 @@ int main()
TEMPO(PULSE+DeployHeatSink, PULSE+ChargeECM, LongPressDelay),
PULSE+MC_Primary_Utility
);
// MapKey(&Throttle, T3_CHM, 0); // Switch MIDDLE
// MapKey(&Throttle, T3_CHM, 0); // Switch MIDDLE
MapKeyUMD(&Throttle, T3_CHB, // Switch BACK
TEMPO(PULSE+FireChaffLauncher, PULSE+UseShieldCell, LongPressDelay),
TEMPO(PULSE+FireChaffLauncher, PULSE+UseShieldCell, LongPressDelay),
Expand Down Expand Up @@ -498,22 +498,6 @@ int EventHandle(int type, alias o, int x)
initBACKLIGHT(LMFD_BL, vLMFDLightBackup);
}

// Combine rudder toe brakes into new axis, mapped to DX_THROTTLE_AXIS
// if (&o == &TFRPRudder & (x == TRPLEFT | x == TRPRIGHT)) {
// if (TFRPRudder[TRPLEFT] < TFRPRudder[TRPRIGHT]) TRPCOMBO = TFRPRudder[TRPRIGHT];
// else TRPCOMBO = TFRPRudder[TRPLEFT];
// DXAxis (DX_THROTTLE_AXIS, -TRPCOMBO);
// }

//Map the MODE_FILTERED TFRP through Target; we can Trim, set deadzones, J/Scurves, etc.
// if (&o == &TFRPRudder) {
// GetAxisData(&o, x);
// axdata.val = AxisVal(o[x], &axdata);
// if(x == TRPLEFT | x == TRPRIGHT) axdata.val = -axdata.val; //Reverse the Toe Brakes, TM why u do dis??
// //axdata.locked = 1; //Uncomment to disable pedals but keep TRPCOMBO axis
// if(!axdata.locked & !axdata.relative) GameOutput(&o, x, axdata.val);
// }

//Map the MODE_FILTERED TFRP through Target; we can Trim, set deadzones, J/Scurves, etc.
if(&o == &TFRPRudder){
GetAxisData(&o, x);
Expand Down
Loading

0 comments on commit 2085422

Please sign in to comment.