The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-30 04:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
770 Commits 4 Branches 185 Tags 19 MiB
a9c165d058
Commit Graph

627 Commits

Author SHA1 Message Date
Travis Nickles
30131ded30 More extended keys 2017-11-06 16:38:26 -06:00
Travis Nickles
1f8dcaa2ee Made sure to add extended key flag for more multimedia keys 2017-11-06 16:04:46 -06:00
Travis Nickles
e0aaa37493 Minor tweak 2017-11-06 01:56:48 -06:00
Travis Nickles
e5c124fecd Add extended bit for next track and prev track keys 2017-11-06 00:48:54 -06:00
Travis Nickles
5df02aafa7 Save form position 
Related to issue #142.
 2017-11-05 20:18:36 -06:00
Yuki-nyan
a9eefa9079 Resolved merge conflict by implementing Ryochan7's changes 2017-11-05 15:20:10 +00:00
Travis Nickles
a8c045e8ef Disabled BackgroundImageLayout setting 
Related to issue #141.
 2017-11-04 22:15:23 -05:00
Travis Nickles
c4614d982e Change main form control sizes 
Relating to issue #142.
 2017-11-04 17:30:49 -05:00
Travis Nickles
23804fa1bd Version 1.4.99 2017-11-02 07:05:40 -05:00
Travis Nickles
2fa075348c Remove unnecessary check 2017-10-31 18:36:48 -05:00
Travis Nickles
bf11a6d297 Change device enumeration routine 2017-10-28 20:34:04 -05:00
Travis Nickles
c75cb3ba7b Added Razer Raiju VID and PID combination. Moved arrays. 
Related to issue #136.
 2017-10-28 20:03:55 -05:00
Travis Nickles
076b1d0839 Use array to specify compatible vids 2017-10-28 19:58:23 -05:00
Travis Nickles
212ae71d4e Version 1.4.98 2017-10-27 12:29:04 -05:00
Travis Nickles
677191e8b4 Change to keep lightbar from sticking in some situations 
Hopefully resolves issue #126.
 2017-10-27 02:09:42 -05:00
Travis Nickles
a7f4dec009 Parse extras before launching actions 
Related to issue #133.
 2017-10-26 01:37:21 -05:00
Travis Nickles
99715656e3 Lower times used for taps and holds 
Related to issue #129
 2017-10-23 13:17:55 -05:00
Travis Nickles
debbb23530 Remove unused method 2017-10-20 20:48:48 -05:00
Travis Nickles
91c8020bb9 Added x86 as a platform target 2017-10-20 06:13:14 -05:00
Travis Nickles
ad2b6eea25 Different implementation of linked profile support 
Related to issue #84.
 2017-10-19 14:16:09 -05:00
Travis Nickles
e07f902751 Only load profiles as needed rather than at program startup 2017-10-19 03:21:33 -05:00
Travis Nickles
d9ee5d3263 Version 1.4.97 2017-10-13 18:26:52 -05:00
Travis Nickles
2c5576a7c5 Reduce gyro mouse deadzone 2017-10-13 02:48:44 -05:00
Travis Nickles
f04ab88f69 Rename method 2017-10-13 01:27:21 -05:00
Travis Nickles
ed09317f14 Fix toggling Hide DS4 Controller option 2017-10-12 21:15:42 -05:00
Travis Nickles
0c303a091a Correct touchpad toggle messages 2017-10-11 21:26:21 -05:00
Travis Nickles
036cfcb34d Use refresh calibration method when creating DS4Device instance 2017-10-11 18:57:11 -05:00
Travis Nickles
0df84e1fba Refresh calibration data when pairing to or disconnecting a device from the Sony dongle 2017-10-11 18:55:15 -05:00
Travis Nickles
3a09132805 Fix reading calibration report values. Take connection type into account 2017-10-11 18:48:52 -05:00
Travis Nickles
d1e0be33de Fix calibration report id for BT 2017-10-11 18:24:14 -05:00
Travis Nickles
320c3ee6f6 Make sure to add device serial to HashSet when DS4Device instance is created 
Make sure USB charging does not create second DS4Device instance
 2017-10-11 18:07:34 -05:00
Travis Nickles
73450834bc Remove unused field 2017-10-10 21:42:49 -05:00
Travis Nickles
b1cd3a76e9 First acceptable version of gyro calibration support 
Related to issue #103.
 2017-10-10 17:45:42 -05:00
Travis Nickles
957ad3b1d5 Tweak updating of pending output report 2017-10-07 00:55:14 -05:00
Travis Nickles
3425a0edb3 Version 1.4.96 2017-10-06 13:37:37 -05:00
Travis Nickles
169b1027cb Updated Spanish translation provided by jose350 
Related to issue #124.
 2017-10-06 11:51:54 -05:00
Travis Nickles
93e933aadf Add extra search folder for compiled localization files 
Related to issue #124.
 2017-10-06 02:29:57 -05:00
Travis Nickles
6ab0f3f020 Make sure one full wheel click is used per action 2017-10-05 22:00:04 -05:00
Travis Nickles
2622aa46b6 Populate tool tip with input delay info no matter which connection type is used 
Related to issue #28.
 2017-10-05 16:06:27 -05:00
Travis Nickles
16f6f5be32 Change main device list to be dependent on device path rather than mac address 
Should resolve issue #71.
 2017-10-05 00:24:53 -05:00
Travis Nickles
5ac42d1fe1 Set a neutral language for the application 
Seems to improve application performance
 2017-10-03 23:32:00 -05:00
Travis Nickles
67b2c2ff4a Fix service start text for tray icon context menu 
Related to issue #122.
 2017-10-03 18:14:12 -05:00
Travis Nickles
4f4bf78bea Fixed service changing when dinput only mode has changed 2017-10-02 13:38:39 -05:00
Travis Nickles
22912dff50 Add headphone volume support for DS4 v2 controllers 2017-10-02 03:16:57 -05:00
Travis Nickles
c5ef4196bd Version 1.4.95 2017-09-21 18:13:01 -05:00
Travis Nickles
8f287a3714 Reset gyro trigger items and touchpad invert items before parsing triggers 2017-09-20 22:04:22 -05:00
Travis Nickles
2e8aee10e0 Default touchpad jitter compensation to true again 
The current settings work pretty well and
would probably be preferred
 2017-09-20 21:44:31 -05:00
Travis Nickles
f96731ea8a Correct reverse smoothing buffer traversal 2017-09-20 21:39:55 -05:00
Travis Nickles
cdb17f43a7 Change touchpad jitter compensation 2017-09-20 21:19:42 -05:00
Travis Nickles
39d0579f09 Change SixAxis routines 
Hopefully I won't regret this later
 2017-09-20 11:34:53 -05:00
Travis Nickles
9ae43db945 Remove unused parameters from method call 2017-09-20 00:52:33 -05:00
Travis Nickles
62051665bd Tweak pulse charging routine 2017-09-19 22:08:03 -05:00
Travis Nickles
6348720776 Minor tweak 2017-09-19 21:36:33 -05:00
Travis Nickles
ac4e940605 Split flash duration into segments. 
Needed to reduce CPU usage while flashing is active
 2017-09-19 21:13:46 -05:00
Travis Nickles
98c1a9ff41 Remove unused list 2017-09-19 20:42:10 -05:00
Travis Nickles
e8880c5d28 Minor tweak 2017-09-17 13:37:31 -05:00
Travis Nickles
a2478fcb90 Version 1.4.94 2017-09-10 13:28:26 -05:00
Travis Nickles
64f51675c7 Changed ControlService thread 2017-09-08 01:29:35 -05:00
Travis Nickles
d7f74815e1 Changed thread affinity of ControlService instance 
Seems to help. Only tested with Gex so far using KB emulation.
Need to try some other games
 2017-09-07 22:37:56 -05:00
Travis Nickles
67430aa18d Version 1.4.93 2017-09-07 02:53:33 -05:00
Travis Nickles
1961307c6d Remove BackgroundWorker instance. Use simple thread instead 2017-09-06 05:21:03 -05:00
Travis Nickles
e847fd6458 Tweak temp thread creation 2017-09-05 21:28:54 -05:00
Travis Nickles
c6d7507a01 Trim code. Use namespace 2017-09-05 04:27:24 -05:00
Travis Nickles
ec3ebb73b5 Minor tweaks 2017-09-05 03:34:49 -05:00
Travis Nickles
acb15eb7f8 Change old url to updater. Minor tweaks. 2017-08-29 21:57:31 -05:00
Travis Nickles
506ab59894 Version 1.4.92 2017-08-28 13:59:29 -05:00
Travis Nickles
1fedb61d2b Change thread affinity of BackgroundWorker 2017-08-27 21:26:36 -05:00
Travis Nickles
c8809f37cb Thread priority changes 2017-08-27 03:45:35 -05:00
Travis Nickles
e0daa9683f Version 1.4.91 2017-08-26 13:07:32 -05:00
Travis Nickles
1493e1619b Raise hotplug delay timeout 2017-08-26 13:05:33 -05:00
Travis Nickles
e6df8c939e Add sleep period before hotplug routine 
Needed for first output report to be received
 2017-08-26 06:28:42 -05:00
Travis Nickles
6190ddff9b Change thread affinity of DS4Device objects 
Drastically improves performance. Might be able to remove the
need for the separate input thread later.
 2017-08-26 04:25:42 -05:00
Travis Nickles
150476d6aa Using directives matter 2017-08-26 00:49:39 -05:00
Travis Nickles
51ba40541a Version 1.4.90 2017-08-25 19:17:21 -05:00
Travis Nickles
ea858feafa Make sure uiContext is available for invoking events 2017-08-25 16:38:17 -05:00
Travis Nickles
33966389a4 Take out async keyword from hotplug routine. Delegate to different thread. 
Further testing should be done to make sure there are no
regressions.
 2017-08-25 03:59:32 -05:00
Travis Nickles
644c674a27 Remove async usage in method 2017-08-24 23:08:35 -05:00
Travis Nickles
3e217266c5 Remove unnecessary async call. Run in different thread 2017-08-24 21:50:03 -05:00
Travis Nickles
85479184be Make sure profiles list is not rendered while options form is open 2017-08-24 04:29:08 -05:00
Travis Nickles
1f4464271e Random tweak. Minor change drastically increases GUI performance 2017-08-24 01:34:02 -05:00
Travis Nickles
e4365c6c40 Remove timer usage for program scanning 2017-08-23 05:12:36 -05:00
Travis Nickles
51a18545e2 Only refresh ListView once items are added 2017-08-23 04:34:58 -05:00
Travis Nickles
e3f99fb9e3 Minor tweaks 2017-08-23 02:51:09 -05:00
Travis Nickles
123e6a20c0 Minor tweak 2017-08-22 21:13:01 -05:00
Travis Nickles
2ea4967486 Change input key method to return DS4Controls value instead of string 2017-08-22 19:52:32 -05:00
Travis Nickles
0817da3864 Minor tweaks. Use different timer class for some timers. 
Take some routines out of the main thread
 2017-08-22 17:37:39 -05:00
Travis Nickles
699436565c Reduce latency queue capacity 2017-08-22 05:20:23 -05:00
Travis Nickles
13103ff7a8 Removed references to some unused assemblies 2017-08-22 05:10:19 -05:00
Travis Nickles
5df34b8378 Trim event handler method. Add name for timeout threads. 
Decent performance boost with this change
 2017-08-21 05:25:18 -05:00
Travis Nickles
dce5c811f2 Raise timeout interval 2017-08-20 22:02:49 -05:00
Travis Nickles
ece7b25f0c Minor tweaks 2017-08-19 18:48:06 -05:00
Travis Nickles
0571f8b663 Version 1.4.89 2017-08-19 18:54:59 -05:00
Travis Nickles
dd1c2eca62 Change touchpad jitter values 2017-08-19 18:39:03 -05:00
Travis Nickles
c03c173f31 Use EaseOutQuad curve for idle disconnect led color 
Linear seems to have the led blank too quickly towards the end
 2017-08-18 23:33:37 -05:00
Travis Nickles
f0d967cd63 Minor tweak to touchpad jitter compensation code 2017-08-18 20:52:11 -05:00
Travis Nickles
560777710d Use correct bounds for touchpad invert disabling. Allow PS to be selectable. 
Resolves issue #108.
 2017-08-18 20:50:38 -05:00
Travis Nickles
55b2de6d67 Change touchpad jitter compensation routine 2017-08-18 02:41:37 -05:00
Travis Nickles
3e39d688d4 Minor tweak. Remove one BeginInvoke call in form method. 2017-08-18 02:40:09 -05:00
Travis Nickles
5618bdb270 Minor tweaks 2017-08-16 18:00:44 -05:00
Travis Nickles
28004dfb22 Version 1.4.88 2017-08-16 16:04:41 -05:00
Travis Nickles
684c8a73b2 Minor tweak 2017-08-15 21:27:11 -05:00
Travis Nickles
b7f5e3fb3c Update TaskScheduler version. Change build target to .NET Framework 4.5.2. 
.NET Framework 4.5 has been unsupported for some time
 2017-08-15 04:40:43 -05:00
Travis Nickles
8f78d5850e Adding new gyro values 
Not sure if I will ever use them
 2017-08-10 02:45:11 -05:00
Travis Nickles
bd379e5c7e Add new accel fields 2017-08-09 03:24:24 -05:00
Travis Nickles
2ffc51c8e3 Changed variable name to better show current intent 2017-08-08 22:07:52 -05:00
Travis Nickles
8dca930400 Create separate output accel values 2017-08-08 20:19:17 -05:00
Travis Nickles
a32e80fe61 Add offset for touchpad mouse 2017-08-06 20:31:55 -05:00
Travis Nickles
cb599a984f Make touchpad jitter compensation default to false 2017-08-06 19:50:49 -05:00
Travis Nickles
8ae6e062e3 Add experimental touchpad invert disable routine. Raise mouse stick offset 2017-08-04 22:36:46 -05:00
Travis Nickles
4d31294bfb Change build string in about window 2017-08-04 22:25:03 -05:00
Travis Nickles
acb03500a0 Lower mouse speed factor 2017-08-04 06:11:55 -05:00
Travis Nickles
315797fe53 Minor changes to exclusive mode routine 2017-08-04 06:10:48 -05:00
Travis Nickles
22babe9ded Trim hotplug launching routine to speed up main thread 2017-08-01 02:42:59 -05:00
Travis Nickles
f042120ede Add wait period after device is enabled. 
Seems to be needed for exclusive mode to behave better
with recent Windows 10 update
 2017-08-01 02:42:16 -05:00
Travis Nickles
4af6404b49 Version 1.4.87 2017-07-27 19:47:38 -05:00
Travis Nickles
7f75565aec Rid another unnecessary state copy call. 2017-07-27 07:32:09 -05:00
Travis Nickles
473958ba1a Correct touchpad X coordinate. Change DS4State. 2017-07-27 05:41:44 -05:00
Travis Nickles
60a21a9fe3 Minor changes 2017-07-26 21:38:34 -05:00
Travis Nickles
436d0ed1ef No longer make unnecessary state object copies 2017-07-26 06:13:18 -05:00
Travis Nickles
8250f9be5c Attempt to use timestamp from ds4. Preserve changes. 2017-07-26 04:30:50 -05:00
Travis Nickles
9d88fda0d2 Tweak gyro mouse 2017-07-24 22:55:28 -05:00
Travis Nickles
aab2bb13f4 Add finger on touchpad back as a shift modifier 2017-07-22 20:48:04 -05:00
Yuki-nyan
86d311b72a Merge pull request #5 from Ryochan7/jay 
Update to Version 1.4.86
 2017-07-21 19:35:49 +01:00
Travis Nickles
a8442d2772 Version 1.4.86 2017-07-20 13:49:55 -05:00
Travis Nickles
3dcd4d94b9 Added clamping for rotation. Fixed bug with identical dict keys 2017-07-20 04:25:15 -05:00
Travis Nickles
1b0ddfd910 Minor changes 2017-07-20 00:57:14 -05:00
Travis Nickles
5a84f8b2e3 Added sixaxis output curve options 2017-07-19 18:17:11 -05:00
Travis Nickles
fd1479f09f Added output curve options for L2 and R2 2017-07-19 15:15:59 -05:00
Travis Nickles
0e8daf05b0 Make sure sixaxis value ratios do not go above 1.0 2017-07-18 20:18:01 -05:00
Travis Nickles
ec130f6156 Add sixaxis anti-deadzone settings 2017-07-18 19:44:55 -05:00
Travis Nickles
7ddd2c1bf5 Add sixaxis max zone setting 2017-07-18 17:28:16 -05:00
Travis Nickles
8eb9d6391f Some optimizations 2017-07-18 15:37:01 -05:00
Travis Nickles
a335decc90 Move accel dead zone calculations 2017-07-18 14:21:03 -05:00
Travis Nickles
8a6ecb9fe0 Correct default BT poll rate option 2017-07-17 17:50:18 -05:00
Travis Nickles
9972e85e13 More minor gyro changes 2017-07-16 19:42:43 -05:00
Travis Nickles
dba2b1bbb3 Tweaks to how imu data is used 2017-07-16 07:11:58 -05:00
Travis Nickles
887a4fbdbd Make imu data part of the DS4State 2017-07-16 03:30:49 -05:00
Travis Nickles
817505a989 Take poll time into account for gyro mouse 2017-07-16 02:22:21 -05:00
Travis Nickles
6e1b9004de Minor optimizations 2017-07-15 08:50:38 -05:00
Travis Nickles
c5158d66c8 Version 1.4.85 2017-07-14 22:58:52 -05:00
Travis Nickles
10621b8c69 Change trackbar value for gyro 2017-07-14 22:41:00 -05:00
Travis Nickles
53b0de087c Allow gyro roll to control mouse x axis. Related to issue #90. 2017-07-14 07:46:45 -05:00
Travis Nickles
56fff28f65 Try to correct some problems with imu data usage 2017-07-13 08:17:00 -05:00
Travis Nickles
c5dd97ebe5 Preserve minor optimizations before next test 2017-07-13 07:27:25 -05:00
Travis Nickles
c0403fa7ab Add touchpad mouse axis inverting. Related to issue #83. 2017-07-12 22:39:46 -05:00
Travis Nickles
6f069482a2 Minor optimizations 2017-07-12 08:04:37 -05:00
Yuki-nyan
48545207b4 Merge pull request #4 from Ryochan7/jay 
Update to Version 1.4.84
 2017-07-10 00:15:46 +01:00
Travis Nickles
9da0255529 Version 1.4.84 2017-07-04 12:33:28 -05:00
Travis Nickles
25be090c89 Only pop up confirm window when user explicitly closes application. Related to issue #82. 2017-07-03 17:33:45 -05:00
Travis Nickles
9bf937d7b9 Program init changes 2017-07-03 08:31:58 -07:00
Travis Nickles
001f2e5432 Preserve refactor 2017-07-03 01:24:54 -07:00
Travis Nickles
089383b64e Simple comment update 2017-07-02 16:59:35 -07:00
Travis Nickles
eab3cdeaad Change output report for USB and Sony 2017-07-02 16:58:30 -07:00
Travis Nickles
0cf1956566 Change output report for BT 2017-07-02 10:14:15 -07:00
Travis Nickles
4ae72cfdb2 Removed more property usage 2017-07-02 08:29:55 -07:00
Travis Nickles
ee6a7fafd4 Improve response time for BT connections 2017-07-02 02:11:16 -07:00
Travis Nickles
ea69d69a6f Improve response time when using USB and Sony dongle 2017-07-02 01:52:55 -07:00
Travis Nickles
b62b490ff1 Allow Disconnect BT special action to work with Sony dongle connections 
This might be temporary
 2017-06-30 21:29:20 -07:00
Travis Nickles
2d198d6446 Version 1.4.83 2017-06-30 18:46:48 -07:00
Travis Nickles
d2d72cda9f FIx tooltip text regarding device battery status. Related to issue #78. 2017-06-30 07:01:54 -07:00
Travis Nickles
dbc33d1986 Tweak routine for runtime 2017-06-30 06:46:54 -07:00
Travis Nickles
625483530a Merge branch 'confirm-on-close' of https://github.com/rafsanjani/DS4Windows into rafsanjani-confirm-on-close 2017-06-30 05:53:24 -07:00
Travis Nickles
d74820dbf5 Add rotation routine for LS and RS 2017-06-30 01:42:19 -07:00
Travis Nickles
2fabd860a2 Enable xinput hotplug from a sync change when using Sony dongle 2017-06-29 19:27:08 -07:00
Travis Nickles
b34c258a59 Fix another version comparison 2017-06-29 18:28:36 -07:00
Travis Nickles
3137801a4b Version 1.4.82 2017-06-29 08:11:39 -07:00
Travis Nickles
6c21572249 Minor changes 2017-06-29 06:16:02 -07:00
Travis Nickles
484337f42f Add gyro mouse smoothing routine 2017-06-28 21:42:16 -07:00
Travis Nickles
86816db41a Lower gyro mouse offset 2017-06-27 08:19:55 -07:00
Travis Nickles
5f907de036 Expose full accel values for future experiments 2017-06-27 03:16:10 -07:00
Travis Nickles
2e74fd67c1 Fixed a couple of urls. Resolves issue #75. 2017-06-27 01:57:38 -07:00
Travis Nickles
49024cddaf Tweak gyro mouse variables 2017-06-26 23:38:01 -07:00
Aziz Rafsanjani
dcd5b74472 If 'Close Minimizes' is unchecked then prompt user for confirmation when Main Form is closed 2017-06-25 18:07:48 +00:00
Travis Nickles
6c0a1a94a9 Version 1.4.81 2017-06-24 19:43:46 -07:00
Travis Nickles
4dfb2cf0db Minor performance tweaks for input thread 2017-06-24 19:10:09 -07:00
Travis Nickles
64693190f0 Fix gyro mouse coefficient. Change base gyro mouse settings. 2017-06-24 19:09:03 -07:00
Travis Nickles
588c2d4385 Add vertical scale for gyro mouse mode 2017-06-24 02:52:39 -07:00
Travis Nickles
a4b540d62c Change variable name 2017-06-22 22:30:22 -07:00
Travis Nickles
19afe15937 Make lastActive field matter for USB connections again. Related to issue #45. 2017-06-22 22:14:58 -07:00
Travis Nickles
9f554cf6c1 Minor optimization 2017-06-22 09:02:51 -07:00
Travis Nickles
35031f5c5f Double check that mouse remainders are reset when gyro mouse is not active 2017-06-22 07:36:40 -07:00
Travis Nickles
6eb618a934 Lower gyro deadzone value 2017-06-22 06:49:02 -07:00
Travis Nickles
44aef8b90d Fixed distinction between one finger touchpad touch and two finger touch 
Touch 2 being active does not necessarily mean two fingers
are currently on the touchpad
 2017-06-22 03:24:51 -07:00
Travis Nickles
2d58034415 Allow gyro button triggers to disable gyro 2017-06-22 00:43:44 -07:00
Travis Nickles
162092800e Add deadzone routine to Gyro mouse 
Not sure if this will stay
 2017-06-21 21:18:15 -07:00
Travis Nickles
bf774ba6f7 Correct some variables 2017-06-21 18:11:14 -07:00
Travis Nickles
f4302a752d Initial attempt at fixing gyro support. Related to issue #48. 
It will be a mess for the forseeable future
 2017-06-21 18:07:21 -07:00
Travis Nickles
d6d6f63073 Change some thread priorities 2017-06-19 21:37:08 -07:00
Travis Nickles
08be7f1060 Improve readability. Make sure to reset recordingMacro flag when closing form. 2017-06-19 21:36:36 -07:00
Travis Nickles
328b2dc14c Attempt to smooth out mouse cursor for analog sticks 2017-06-19 08:50:28 -07:00
Travis Nickles
5678ee6cd5 Version 1.4.80 2017-06-18 23:26:46 -07:00
Travis Nickles
2780dc3ac4 Change thread affinity of x360Bus object 2017-06-18 07:07:48 -07:00
Travis Nickles
1f2f9f16db Minor tweaks to improve responsiveness 2017-06-18 03:20:10 -07:00
Travis Nickles
80d0ef7c9b Version 1.4.79 2017-06-17 15:35:41 -07:00
Travis Nickles
fc929d963e Fix mic device and volume detection 2017-06-17 09:06:33 -07:00
Travis Nickles
39930cf2e8 Small change 
Hating the JIT compiler right now
 2017-06-17 07:13:39 -07:00
Travis Nickles
cd305dc206 Version 1.4.78 2017-06-17 03:14:00 -07:00
Travis Nickles
a473224293 Fix mouse distance offset for negative stick axes 2017-06-17 03:13:33 -07:00
Travis Nickles
18abb8e7a1 Version 1.4.77 2017-06-17 01:56:18 -07:00
Travis Nickles
712f470b9e Change scope of some variables 2017-06-14 07:42:29 -07:00