Travis Nickles
|
459c6e71f0
|
Added exclusive icon to main controller listing
|
2019-09-06 16:04:07 -05:00 |
|
Travis Nickles
|
9b25bb83cb
|
Added max saturation setting for rainbow lightbar mode
Related to issue #802
|
2019-09-06 10:50:20 -05:00 |
|
Travis Nickles
|
2a6cc418d6
|
Tweak controls
|
2019-09-06 09:21:40 -05:00 |
|
Travis Nickles
|
6afb274509
|
Tweak LS groupbox
|
2019-09-04 04:57:54 -05:00 |
|
Travis Nickles
|
7d80ea9a84
|
Tweaked layout
|
2019-09-04 04:35:32 -05:00 |
|
Travis Nickles
|
32ddf3adf4
|
Added more curve editor links.
|
2019-09-03 07:21:53 -05:00 |
|
Travis Nickles
|
6f861eba2f
|
Fixed Mouse Joystick X Axis setting
|
2019-09-03 06:20:05 -05:00 |
|
Travis Nickles
|
fa1d8f003d
|
Added sixaxis event hooks
|
2019-09-03 05:53:10 -05:00 |
|
Travis Nickles
|
f0b4331bd5
|
Preliminary settings change
|
2019-09-03 05:45:06 -05:00 |
|
Travis Nickles
|
eff927e7ed
|
Force dead zone and anti-dead zone for new profiles
Related to issue #804
|
2019-08-30 13:32:56 -05:00 |
|
Travis Nickles
|
9bd51043b8
|
Added smoothing to Mouse Joystick
|
2019-08-26 22:15:38 -05:00 |
|
Travis Nickles
|
111e44c2b8
|
Added vertical scale to Mouse Joystick
|
2019-08-26 18:53:28 -05:00 |
|
Travis Nickles
|
3f18aec71f
|
Change gyro toggle setting on mode change in form
|
2019-08-26 17:47:57 -05:00 |
|
Travis Nickles
|
b2e7eb987d
|
Added toggle option to Mouse Joystick
|
2019-08-26 05:51:54 -05:00 |
|
Travis Nickles
|
ca41c511c6
|
Changed Mouse Joystick max zone default
|
2019-08-26 04:12:02 -05:00 |
|
Travis Nickles
|
aced5deab7
|
Fixed square stick roundness default in GUI
|
2019-08-25 15:48:26 -05:00 |
|
Travis Nickles
|
c3f2819c14
|
Fixed panel visibility for a blank profile
|
2019-08-25 15:41:13 -05:00 |
|
Travis Nickles
|
cf656582a5
|
Fixed typo for hover text
Related to issue #791
|
2019-08-25 02:49:07 -05:00 |
|
Travis Nickles
|
709738aa59
|
Fixed gyro trigger item marking
|
2019-08-24 01:52:46 -05:00 |
|
Travis Nickles
|
b99e866a96
|
Fixed saving invert option for Mouse Joystick
|
2019-08-24 01:13:30 -05:00 |
|
Travis Nickles
|
bc437a2769
|
Adjusted defaulyts. Fixed trigger turn default
|
2019-08-23 22:08:15 -05:00 |
|
Travis Nickles
|
78cf371dce
|
Fixed issue with gyro triggers getting reset
|
2019-08-23 21:39:22 -05:00 |
|
Travis Nickles
|
a949f803a4
|
Lower default Mouse Joystick dead zone
|
2019-08-23 01:27:47 -05:00 |
|
Travis Nickles
|
1e9bc19fc1
|
Initial mouse joystick test
|
2019-08-22 22:03:03 -05:00 |
|
Travis Nickles
|
aee4be939e
|
Merge branch 'jay' of https://github.com/mika-n/DS4Windows into mika-n-jay
|
2019-08-19 17:42:39 -05:00 |
|
Travis Nickles
|
a54254edfe
|
Fixed tool tip typo
Related to issue #789
|
2019-08-19 02:28:16 -05:00 |
|
mika-n
|
45bfd2043a
|
Added new GUI options to "macro special action" screen (run on release, repeat, synchronized run, keep key state). Added tooltip explanation texts to these macro options.
|
2019-08-11 21:54:54 +03:00 |
|
Travis Nickles
|
0b6cb77108
|
Increased wakeup delay. Use custom flow on wakeup
|
2019-07-30 04:28:55 -05:00 |
|
Travis Nickles
|
aa0124970a
|
No longer use quiet mode for ViGEm installer
|
2019-07-29 02:37:53 -05:00 |
|
Travis Nickles
|
7e18f0d45c
|
Minor tweak
|
2019-07-29 01:13:43 -05:00 |
|
Travis Nickles
|
1f66d984cd
|
Seems to best fix issues with suspending. The delay is MS fault
Related to issue #730
|
2019-07-28 21:53:41 -05:00 |
|
Travis Nickles
|
af9557e53b
|
Disable control service button while a routine is active
|
2019-07-26 03:41:38 -05:00 |
|
Travis Nickles
|
0630719ffc
|
Fixed some strings in pt-BR resx files
Related to issue #757
|
2019-07-26 03:21:51 -05:00 |
|
Travis Nickles
|
4ffda750f7
|
Use old routines for preset curves
|
2019-07-25 14:54:39 -05:00 |
|
mika-n
|
13150015f0
|
Custom curve GUI tweaks.
|
2019-07-19 01:49:22 +03:00 |
|
mika-n
|
acc1b3f952
|
Fixed placement and alignment of couple checkbox options in "Other" settings block. Certain checkbox objects didn't align well (left align) and placement of options was not logical.
|
2019-07-18 00:24:05 +03:00 |
|
mika-n
|
5339a5aa9c
|
Fixed the image size issue in "run program with profile" app icon (didn't zoom the image correctly)
|
2019-07-18 00:11:29 +03:00 |
|
mika-n
|
8a96f92c3c
|
finnish language tweaks
|
2019-07-17 23:53:20 +03:00 |
|
mika-n
|
3c6b927e1a
|
merge
|
2019-07-17 23:33:39 +03:00 |
|
mika-n
|
d4905227c4
|
Custom output curve GUI changes (new edit field in Output curve tab page) and clickable HTML link to open the custom curve web app editor.
|
2019-07-17 23:20:38 +03:00 |
|
mika-n
|
7015a4d1b9
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay-bezierCurveOutput
|
2019-07-14 22:31:53 +03:00 |
|
mika-n
|
5207d7dee8
|
small idx fix to saving an auto-profile entry in cases where new window title is empty.
|
2019-07-12 00:32:24 +03:00 |
|
mika-n
|
08779ba1cd
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-12 00:01:13 +03:00 |
|
mika-n
|
e9d9e9f428
|
Support auto-profile matching using both program path and application window title values. Support wildchar string match logic in auto-profile path and window title values. Re-wrote auto-profile checking thread to be less RAM hungry and better performance (caching to remember the previous application and window handle values)
|
2019-07-11 23:58:03 +03:00 |
|
Travis Nickles
|
1eac0f9dd5
|
Should fix updater not getting invoked for version checker
Related to issue #751
|
2019-07-08 00:32:31 -05:00 |
|
mika-n
|
22866d6a5c
|
New customizable output curve functionality. User can create any kind of output curve via a bezier curve editor (external HTML web app in BezierCurveEditor folder).
|
2019-07-07 00:47:54 +03:00 |
|
Travis Nickles
|
268d8d5541
|
Add wait period while suspending
|
2019-07-05 15:22:57 -05:00 |
|
mika-n
|
19a96973ff
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-03 00:11:12 +03:00 |
|
mika-n
|
c6daa18032
|
Changed IPC communication to use memory mapped memory instead of physical file to store the name of the DS4Form window class.
|
2019-07-03 00:02:29 +03:00 |
|
Travis Nickles
|
8e55e7178b
|
Make sure profile name is searched by an exact match
Fixes issue with profile selections when using
similar names
|
2019-07-02 15:41:29 -05:00 |
|
mika-n
|
7061a5c6c4
|
Tweaked inter-process message posting (added safety checks to ignore too large data packets). Added LogDebug message when a profile is loaded via cmdline commands.
|
2019-07-01 13:34:36 +03:00 |
|
mika-n
|
3817b2e026
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-07-01 10:53:07 +03:00 |
|
Travis Nickles
|
dfaecd474f
|
Group trigger mod profile properties
|
2019-06-30 20:59:51 -05:00 |
|
mika-n
|
1c67d6145e
|
Added cmdline options to send start/stop/shutdown/LoadProfile/LoadTempProfile commands to a background DS4Win app via IPC messaging interface.
|
2019-07-01 02:45:55 +03:00 |
|
Travis Nickles
|
a6ed8240df
|
Group together stick zone modifiers
|
2019-06-30 00:40:24 -05:00 |
|
Travis Nickles
|
a09b06cb28
|
Take Color Dialog out of KB360 form
Form can now be designed in x64 mode
|
2019-06-29 21:36:54 -05:00 |
|
Travis Nickles
|
7db29d115b
|
Add necessary tag to resx file
|
2019-06-29 18:16:55 -05:00 |
|
Imre Kristoffer Eilertsen
|
bb738569e2
|
Update DS4Form.nb.resx
|
2019-06-27 01:27:33 +02:00 |
|
Imre Kristoffer Eilertsen
|
59509ab13d
|
Update Hotkeys.resx
|
2019-06-27 01:21:08 +02:00 |
|
Imre Kristoffer Eilertsen
|
be0177d4ef
|
Update DS4Form.nb.resx
|
2019-06-27 01:11:53 +02:00 |
|
Imre Kristoffer Eilertsen
|
536151379c
|
Create Hotkeys.nb.resx
|
2019-06-27 01:09:43 +02:00 |
|
Imre Kristoffer Eilertsen
|
c5644ddcf2
|
Update WelcomeDialog.nb.resx
|
2019-06-27 00:51:47 +02:00 |
|
Imre Kristoffer Eilertsen
|
006d21ca8b
|
Create WinProgs.nb.resx
|
2019-06-27 00:47:37 +02:00 |
|
Imre Kristoffer Eilertsen
|
42173a6ced
|
Update Options.nb.resx
|
2019-06-27 00:41:42 +02:00 |
|
Imre Kristoffer Eilertsen
|
0593b485ec
|
Update DS4Form.nb.resx
|
2019-06-27 00:35:14 +02:00 |
|
Travis Nickles
|
157bb67951
|
Group square stick profile properties into a class
|
2019-06-26 01:35:41 -05:00 |
|
Kamilczak020
|
4b901b3489
|
Implemented square stick roundness selectability
|
2019-06-25 23:42:08 +02:00 |
|
Travis Nickles
|
6e55d78aaa
|
Merge branch 'jay' of https://github.com/DandelionSprout/DS4Windows into DandelionSprout-jay
|
2019-06-22 19:05:09 -05:00 |
|
Travis Nickles
|
3473fe1dc9
|
Removed color dialog dep from design for some forms
Allows using the designer for x64 target for some forms
|
2019-06-17 01:22:39 -05:00 |
|
Imre Kristoffer Eilertsen
|
e454f0c6bf
|
Overhaul, part 2/~3
|
2019-06-13 13:33:09 +02:00 |
|
Imre Kristoffer Eilertsen
|
4a47893e0c
|
Update Options.nb.resx
|
2019-06-13 13:27:32 +02:00 |
|
Imre Kristoffer Eilertsen
|
33049bef3e
|
Overhaul, part 1/~2
|
2019-06-13 13:25:12 +02:00 |
|
Imre Kristoffer Eilertsen
|
a931ae162d
|
Update WelcomeDialog.nb.resx
|
2019-06-10 11:31:59 +02:00 |
|
Imre Kristoffer Eilertsen
|
95c9212d6a
|
Update WelcomeDialog.nb.resx
|
2019-06-10 11:29:44 +02:00 |
|
Imre Kristoffer Eilertsen
|
4b08d0b306
|
Update SpecActions.nb.resx
|
2019-06-10 11:28:01 +02:00 |
|
Imre Kristoffer Eilertsen
|
338383d4a9
|
Update SaveWhere.nb.resx
|
2019-06-10 11:24:40 +02:00 |
|
Imre Kristoffer Eilertsen
|
c3a712cb58
|
Update Options.nb.resx
|
2019-06-10 11:22:37 +02:00 |
|
Imre Kristoffer Eilertsen
|
b5646c6ef6
|
Update DupBox.nb.resx
|
2019-06-10 11:16:13 +02:00 |
|
Imre Kristoffer Eilertsen
|
b07b4ce89f
|
What could possibly go wrong with this new approach?
Apart from just about everything?
|
2019-06-10 11:13:28 +02:00 |
|
Travis Nickles
|
ddb4ca96ba
|
Added easeout cubic curve option
|
2019-06-09 02:15:00 -05:00 |
|
Travis Nickles
|
50187fe9c1
|
Take user control out of design mode. Fixes design view on my end.
LanguagePackComboBox in DS4Form has caused massive issues in VS
2017 and 2019 since the clean Windows install
|
2019-06-04 02:19:19 -05:00 |
|
Imre Kristoffer Eilertsen
|
c2faa0e0da
|
Create DupBox.nb.resx
|
2019-06-04 00:32:09 +02:00 |
|
Imre Kristoffer Eilertsen
|
df7a36d252
|
Create DS4Form.nb.resx
|
2019-06-04 00:30:49 +02:00 |
|
Imre Kristoffer Eilertsen
|
7598fc48f3
|
Create Options.nb.resx
|
2019-06-02 18:03:14 +02:00 |
|
Imre Kristoffer Eilertsen
|
ee842b2098
|
Create SaveWhere.nb.resx
|
2019-06-02 17:39:03 +02:00 |
|
Imre Kristoffer Eilertsen
|
9655675401
|
Create SpecActions.nb.resx
|
2019-06-02 17:35:57 +02:00 |
|
Imre Kristoffer Eilertsen
|
331e5939ea
|
Create WelcomeDialog.nb.resx
|
2019-06-02 17:29:51 +02:00 |
|
Travis Nickles
|
c7b45b7dcc
|
Use leave event rather than text changed event
|
2019-05-30 17:52:25 -05:00 |
|
mika-n
|
93bd802dc1
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-05-28 12:24:44 +03:00 |
|
Travis Nickles
|
aa3d907b2a
|
Monitor process rather than search for process name
|
2019-05-28 00:50:50 -05:00 |
|
Travis Nickles
|
60c137138d
|
Minor window title parse tweak
Change to monitor process id later
|
2019-05-28 00:26:27 -05:00 |
|
mika-n
|
5767a1866d
|
UPD listen host address or IP number option in UDP server settings. By default UDP server listens onlhy 127.0.0.1 loopback interface, so connections work only within a host computer. This new UDPServerListenAddress option allows to use specific IP or 0.0.0.0 (=all interfaces) as listen address to enable remote UDP connections.
|
2019-05-27 01:07:17 +03:00 |
|
Travis Nickles
|
ba9bdf8b42
|
Merge branch 'jay' of https://github.com/carloshbcabral/DS4Windows into carloshbcabral-jay
|
2019-05-19 20:12:25 -05:00 |
|
Travis Nickles
|
db5c08722b
|
Added hovertext message for touchpad toggle
|
2019-05-19 19:54:11 -05:00 |
|
Travis Nickles
|
fa38d4e315
|
Updated Welcome Dialog to usee ViGEm Installer 1.6.115
|
2019-05-16 22:02:03 -05:00 |
|
Travis Nickles
|
3d89b3786b
|
Close connection to ViGEmBus before opening Driver Setup window
|
2019-05-08 01:11:36 -05:00 |
|
CarlosCabral
|
63e09ebbb8
|
🖼 Optimized Images Part II - The Mission
|
2019-05-07 20:33:53 -03:00 |
|
CarlosCabral
|
01ac5e3584
|
🖼 Optimized Images
|
2019-05-07 19:48:28 -03:00 |
|
FuriaESP
|
6b6cc53c64
|
Replace and add new icons
|
2019-05-04 00:54:15 +02:00 |
|
Travis Nickles
|
b73f706ec2
|
Enforce default X360 in more places
Related to issue #683
|
2019-05-02 20:18:59 -05:00 |
|
Travis Nickles
|
f01c86deee
|
Move Forms to seperate namespace
|
2019-04-30 14:29:50 -05:00 |
|
Travis Nickles
|
f9f72b1f4a
|
Added hover text for output controller option
|
2019-04-25 21:21:24 -05:00 |
|
Travis Nickles
|
ab8dbd29f9
|
Merge branch 'jay' into ds4emulate
|
2019-04-23 21:07:19 -05:00 |
|
mika-n
|
b09e5c277e
|
Added "Unload on regular trigger release" checkbox option to "SpecialAction.Profiles" edit panel. This option can be used to automatically unload a profile (ie. goes back to previous profile) when a regular trigger key is released.
|
2019-04-23 14:54:04 +03:00 |
|
mika-n
|
4f87d24ee3
|
Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay
|
2019-04-23 10:43:14 +03:00 |
|
mika-n
|
c168dabded
|
ActionLoadProfile: Support for automatically untriggered (=unloaded) profiles when a regular action keys are released. LoadProfile special action has a new "automatically unload when a regular trigger released" option. This is sort of like "shift modifier for the whole profile" functionality.
|
2019-04-23 03:39:44 +03:00 |
|
Travis Nickles
|
ec1e03a52c
|
Merge branch 'jay' into ds4emulate
|
2019-04-22 17:28:50 -05:00 |
|
Travis Nickles
|
38e6b0e2e1
|
Link to newer ViGEmBus installer
|
2019-04-22 17:26:51 -05:00 |
|
Travis Nickles
|
19b2112b54
|
Fixed botched merge conflict
|
2019-04-21 02:24:36 -05:00 |
|
Travis Nickles
|
6c72566e36
|
Merge branch 'jay' into ds4emulate
# Conflicts:
# DS4Windows/DS4Forms/Options.resx
|
2019-04-21 02:07:28 -05:00 |
|
Travis Nickles
|
e0513f3f06
|
Removed extra config loading section
Should not be needed in WinProgs. Config will be
loaded by this point
|
2019-04-21 01:54:56 -05:00 |
|
Travis Nickles
|
61a35ce328
|
Merge branch 'customSteamFolder' of https://github.com/Sander0542/DS4Windows into Sander0542-customSteamFolder
|
2019-04-21 01:10:02 -05:00 |
|
Travis Nickles
|
d59a11f36a
|
Raised sixaxis dead zones. Updated TODO file
|
2019-04-21 00:13:09 -05:00 |
|
Sander Jochems
|
342bbc4f0c
|
Use the saved folder (WinProgs.cs)
|
2019-04-20 17:47:29 +02:00 |
|
Sander Jochems
|
ceb2319084
|
Add Property Logic (DS4Form.cs)
|
2019-04-20 17:47:08 +02:00 |
|
Sander Jochems
|
b583275b6b
|
Add two elements to DS4Form.resx
|
2019-04-20 17:46:16 +02:00 |
|
Sander Jochems
|
f01bc65ce1
|
Make the steam consts public (WinProgs.cs)
|
2019-04-20 17:42:09 +02:00 |
|
Travis Nickles
|
b23ffcda76
|
Merge branch 'jay' into ds4emulate
|
2019-04-19 06:17:31 -05:00 |
|
Travis Nickles
|
fb013baf72
|
Added Patreon and SubsribeStar as tipping options
|
2019-04-19 04:10:29 -05:00 |
|
Travis Nickles
|
0b345b8474
|
Update action string aliases in the GUI
|
2019-04-18 22:56:18 -05:00 |
|
Travis Nickles
|
1b58265c28
|
Added profile setting for controller type
|
2019-04-18 01:12:10 -05:00 |
|
mika-n
|
88e3e0e3a2
|
Allow saving and editing loadProfile special action without unload trigger definition (ie. don't crash when editing specAction without unload trigger and allow saving an empty list of unload trigger keys for loadProfile action type).
|
2019-04-07 16:01:41 +03:00 |
|
Travis Nickles
|
592a0245b7
|
Skip updater execution if new version could not be downloaded
Related to issue #638
|
2019-03-30 08:08:21 -05:00 |
|
Travis Nickles
|
0d957b0bfa
|
Added null check for method.
Should help prevent crashing on a quick connect and disconnect caused by a
bad USB cable
|
2019-03-25 21:38:08 -05:00 |
|
Travis Nickles
|
59161a5b62
|
Make sure to remove event handler when finished
|
2019-03-23 01:44:03 -05:00 |
|
Travis Nickles
|
83628f8849
|
Update some color picker options toupdate lightbar with preview
|
2019-03-23 01:27:05 -05:00 |
|
Travis Nickles
|
ffb46157bb
|
Revert hotplug delay change
|
2019-03-22 00:14:42 -05:00 |
|
Travis Nickles
|
3e08da9705
|
Removed old ScpVBus related classes
|
2019-03-19 02:32:49 -05:00 |
|
Travis Nickles
|
5a6859556c
|
Removed old xinput ports setting
No longer relevant with ViGEmBus
|
2019-03-19 01:52:18 -05:00 |
|
Travis Nickles
|
575f157420
|
Changed method name to specify ViGEmBus
|
2019-03-19 01:33:41 -05:00 |
|
Travis Nickles
|
fb73c19574
|
Changed Welcome dialog to account for ViGEmBus installer program
|
2019-03-19 00:47:26 -05:00 |
|
Travis Nickles
|
be0b3c3a58
|
Merge branch 'jay' into vigem-udpserver
|
2019-03-18 22:07:42 -05:00 |
|
Travis Nickles
|
d6f9cecd3f
|
Put hotplug delay back in but in a later spot
|
2019-03-18 21:03:02 -05:00 |
|
Travis Nickles
|
d6a935b74c
|
Merge branch 'jay' into vigem-udpserver
|
2019-03-18 16:24:20 -05:00 |
|
Travis Nickles
|
956e691780
|
Removed extra hotplug delay
Apparently not needed since version 1.5.12 with the hotplug
event change. BT works fine in Windows 7.
|
2019-03-18 16:23:19 -05:00 |
|
Travis Nickles
|
22e212999d
|
Merge branch 'jay' into vigem-udpserver
|
2019-03-17 21:18:59 -05:00 |
|
Travis Nickles
|
6564ff125a
|
Changed driver message in Welcome dialog.
The old message was confusing and led to the wrong impression
about the purpose of the driver
|
2019-03-17 14:44:32 -05:00 |
|
Travis Nickles
|
27a68196e4
|
Deprecate old mouse acceleration option. Make new default value false
|
2019-03-17 01:28:16 -05:00 |
|
Travis Nickles
|
489a36be00
|
Merge branch 'jay' into vigem-udpserver
|
2019-03-12 18:55:35 -05:00 |
|
Travis Nickles
|
54b6b2754a
|
Change when delay takes place for hotplug routine
|
2019-03-12 16:03:08 -05:00 |
|
Travis Nickles
|
0ea8cef46e
|
Merge branch 'jay' into vigem-udpserver
|
2019-03-10 09:33:00 -05:00 |
|
Travis Nickles
|
8f3ce714a2
|
Removed unwanted boxing for AdvancedColorDialog
|
2019-03-07 13:35:13 -06:00 |
|
Travis Nickles
|
45485bb44d
|
Added color dialog instance back since VS removed it
Related to issue #599
|
2019-03-07 13:14:43 -06:00 |
|
Travis Nickles
|
ef01b4d3b3
|
Altered controller readings to better represent mapped state
Related to issue #587.
|
2019-03-07 01:06:55 -06:00 |
|
Travis Nickles
|
1dbf9abb02
|
Implemented square stick functionality
Related to issue #341.
|
2019-03-04 17:21:58 -06:00 |
|
Travis Nickles
|
c575b3b525
|
Merge branch 'jay' into vigem-udpserver
# Conflicts:
# DS4Windows/DS4Control/ScpUtil.cs
|
2019-02-28 04:24:03 -06:00 |
|
Travis Nickles
|
61f7893d06
|
Update the updater version number
|
2019-02-25 01:24:54 -06:00 |
|
mika-n
|
a3c51c8688
|
merge
|
2019-02-20 08:39:55 +02:00 |
|
mika-n
|
8d087b01ff
|
merge conflicts with base branch
|
2019-02-19 15:00:17 +02:00 |
|
mika-n
|
27dbab06c5
|
Deadzone and anti-deadzone handling (the first rugged version, not perfect yet) and small performance improvements here and there.
|
2019-02-19 11:10:16 +02:00 |
|