Windows/ahk-joystick-focus
1
0
Fork 0
Code Issues Pull requests Releases 3 Activity

Merge branch 'develop' into release

Browse source
This commit is contained in:
alterNERDtive 2020-08-03 20:08:21 +02:00
commit 2e22e19cd5
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -1,3 +1,12 @@
# v0.2 (2020-08-03)
## Fixed
* reading booleans from the .ini file “correctly” (= it works™) (#3)
* no longer force-killing tools on exit, gracefully instead (#4)
-----
# v0.1 (2020-02-08) # v0.1 (2020-02-08)
Initial release. Currently not working properly with throttle axes; see #1 and Initial release. Currently not working properly with throttle axes; see #1 and

18
focus.ahk
View file

@ -26,7 +26,7 @@ setWorkingDir %A_ScriptDir%
#Persistent #Persistent
; check for config file and exit if it doesn’t exist ; check for config file and exit if it doesn’t exist
if !FileExist("focus.ini") { if (!FileExist("focus.ini")) {
msgbox, No config file found. Please follow the instructions in the README file. msgbox, No config file found. Please follow the instructions in the README file.
ExitApp, 1 ExitApp, 1
} }
@ -43,7 +43,7 @@ readConfig(file) {
; [target] ; [target]
IniRead, tname, % file, target, name IniRead, tname, % file, target, name
config["target"] := {"name": tname} config["target","name"] := tname
; [polling] ; [polling]
IniRead, prate, % file, polling, pollingrate IniRead, prate, % file, polling, pollingrate
@ -74,13 +74,17 @@ readConfig(file) {
IniRead, tmp, % file, devices, device%A_Index%useAxes IniRead, tmp, % file, devices, device%A_Index%useAxes
if (tmp == "ERROR") if (tmp == "ERROR")
tmp := True tmp := True
else
tmp := %tmp%
useAxes.push(tmp) useAxes.push(tmp)
IniRead, tmp, % file, devices, device%A_Index%useButtons IniRead, tmp, % file, devices, device%A_Index%useButtons
if (tmp == "ERROR") if (tmp == "ERROR")
tmp := True tmp := True
else
tmp := %tmp%
useButtons.push(tmp) useButtons.push(tmp)
} }
config["devices"] := {"threshold": thold, "names": names, "sensitivities": senses, "useAxes": useAxes, "UseButtons": useButtons} config["devices"] := {"threshold": thold, "names": names, "sensitivities": senses, "useAxes": useAxes, "useButtons": useButtons}
; [tools] ; [tools]
IniRead, tkill, % file, tools, kill IniRead, tkill, % file, tools, kill
@ -93,7 +97,7 @@ readConfig(file) {
else else
paths.push(tmp) paths.push(tmp)
} }
config["tools"] := {"kill": tkill, "paths": paths} config["tools"] := {"kill": %tkill%, "paths": paths}
return config return config
} }
@ -129,7 +133,7 @@ watchTarget:
for ip, path in config["tools"]["paths"] { for ip, path in config["tools"]["paths"] {
SplitPath, path, file SplitPath, path, file
if (WinExist("ahk_exe " file)) { if (WinExist("ahk_exe " file)) {
Process, Close, % file WinClose
} }
} }
} }
@ -143,7 +147,7 @@ watchSticks:
; poll all axes ; poll all axes
for id, dev in config["devices"]["names"] { for id, dev in config["devices"]["names"] {
; check if axes are enabled for this device ; check if axes are enabled for this device
if config["devices"]["useAxes"][id] = True { if (config["devices"]["useAxes"][id]) {
for ia, axis in [ "X", "Y" ] { for ia, axis in [ "X", "Y" ] {
; axes are 0-100 ; axes are 0-100
; -50 means we get a deviation from "0" aka resting state ; -50 means we get a deviation from "0" aka resting state
@ -160,7 +164,7 @@ watchSticks:
; check ALL THE BUTTONS! ; check ALL THE BUTTONS!
for id, dev in config["devices"]["names"] { for id, dev in config["devices"]["names"] {
; check if buttons are enabled for this device ; check if buttons are enabled for this device
if config["devices"]["useButtons"][id] = True { if (config["devices"]["useButtons"][id]) {
; get button count for the device and loop over all of them ; get button count for the device and loop over all of them
buttons := getKeystate(dev "Buttons") buttons := getKeystate(dev "Buttons")
Loop, %buttons% Loop, %buttons%