summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers (follow)
Commit message (Expand)AuthorAgeFilesLines
* core: hid: Fix native mouse mappingsNarr the Reg2023-02-223-1/+12
* core: hid: Use gyro thresholds modes set by the gameNarr the Reg2023-02-102-12/+9
* service: hid: Return error if arguments of SetSupportedNpadIdType is invalidNarr the Reg2023-02-082-3/+11
* Revert "Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span"ameerj2023-02-032-3/+5
* Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"liamwhite2023-02-022-5/+3
* Merge pull request #9696 from german77/please_forgive_me_for_this_sinbunnei2023-02-011-0/+3
|\
| * input_common: Implement turbo buttonsgerman772023-02-011-0/+3
* | Merge pull request #9508 from ameerj/hle-ipc-buffer-spanbunnei2023-01-302-3/+5
|\ \ | |/ |/|
| * hidbus: Use ReadBufferSpanameerj2022-12-292-3/+5
| * service: Use ReadBufferSpan where it is trivial to do soameerj2022-12-252-2/+2
* | core: hid: Only set the polling mode to the correct sideNarr the Reg2023-01-201-1/+13
* | core: hid: Fix input regressionsNarr the Reg2023-01-201-0/+1
* | service: hid: Set led pattern and fix color detectionNarr the Reg2023-01-201-0/+5
|/
* Merge pull request #9107 from german77/gidoly_rulesliamwhite2022-10-251-2/+2
|\
| * input_common: cache vibration testsgerman772022-10-211-2/+2
* | general: Enforce C4800 everywhere except in video_coreMorph2022-10-221-10/+10
* | hid/npad: Fix copy size in GetSupportedNpadIdTypesLioncash2022-10-211-2/+3
|/
* kernel: remove KWritableEventLiam2022-10-132-11/+10
* service: hid: Partially implement palma controllerNarr the Reg2022-09-253-1/+397
* hid: core: Properly emulate controller color and battery levelNarr the Reg2022-08-081-15/+62
* Merge pull request #8510 from german77/vibrationliamwhite2022-07-151-2/+2
|\
| * input_common: sdl: lower vibration frequency and use it's own unique threadgerman772022-06-291-2/+2
* | service: hid: Correct some mistakes and add more validationsNarr the Reg2022-06-292-9/+28
|/
* core: Replace all instances of ResultCode with Resultgerman772022-06-272-65/+64
* common: Change semantics of UNREACHABLE to unconditionally crashLiam2022-06-141-4/+4
* service: hid: Fix gesture regressionNarr the Reg2022-06-102-4/+3
* Merge pull request #8368 from german77/seventimesbunnei2022-05-302-321/+402
|\
| * service: hid: Implement ResetIsSixAxisSensorDeviceNewlyAssignedgerman772022-05-272-5/+88
| * service: hid: Implement LoadSixAxisSensorCalibrationParameter and GetSixAxisSensorIcInformationgerman772022-05-272-1/+39
| * service: hid: Implement EnableSixAxisSensorUnalteredPassthrough and IsSixAxisSensorUnalteredPassthroughEnabledgerman772022-05-272-0/+31
| * service: hid: Add error handling to sixaxis functionsgerman772022-05-272-31/+54
| * service: hid: Refractor sixaxis functionsgerman772022-05-272-185/+88
| * service: hid: Implement MergeSingleJoyAsDualJoy according to REgerman772022-05-272-62/+52
| * service: hid: Add error handling to setNpadAssignment and variantsgerman772022-05-272-12/+14
| * service: hid: Quick RE fixes and commentsgerman772022-05-272-26/+37
* | input_common: touch: Rewrite touch driver to support multiple touch pointsgerman772022-05-231-1/+5
|/
* service: hid: Fix motion refresh rateNarr the Reg2022-05-061-0/+5
* service: hid: Disable correctly motion inputgerman772022-05-061-50/+41
* service: hid: Ensure all structs are initializedNarr the Reg2022-04-2415-68/+69
* service: hid: Access shared memory directlyNarr the Reg2022-04-2319-278/+324
* general: Convert source file copyright comments over to SPDXMorph2022-04-2320-60/+40
* service: hid: Improve accuracy of sixaxis functionsNarr the Reg2022-04-182-59/+264
* core/hle: Replace lock_guard with scoped_lockMerry2022-04-071-1/+1
* service: npad: Default initialize shared memorygerman772022-04-031-48/+48
* service: hid: Remove inaccurate behavior on initializationgerman772022-03-312-14/+21
* core: Reduce unused includesameerj2022-03-1910-20/+2
* Merge pull request #7481 from german77/gyro-biasbunnei2021-12-212-14/+16
|\
| * service/hid: Improve console motion accuracyNarr the Reg2021-12-132-14/+16
* | core/hid: Cancel any vibration after the testNarr the Reg2021-12-162-10/+4
* | service/hid: Implement SetNpadJoyAssignmentModegerman772021-12-052-25/+148
|/
* core/hid: Ensure only valid npad are connectedgerman772021-12-051-17/+13
* npad: Return NpadButton in GetAndResetPressStateMorph2021-11-302-5/+5
* general: Fix handheld typoMorph2021-11-291-1/+1
* settings: Add debug setting to enable all controllersgerman772021-11-281-0/+4
* service/hid: Finish converting LIFO objects and address some nitsNarr the Reg2021-11-2511-89/+45
* kraken: Address comments from reviewgerman772021-11-251-1/+1
* core/hid: Improve accuary of mouse implementationgerman772021-11-254-5/+8
* core/hid: Fully implement native mousegerman772021-11-251-4/+5
* core/hid: Improve accuracy of the keyboard implementationgerman772021-11-251-0/+1
* core/hid: Fix keyboard alignmentgerman772021-11-251-0/+1
* core/hid: Remove usage of native types, fix a couple of errors with motiongerman772021-11-252-280/+379
* service/hid: Remove includes of core.h and settings.hgerman772021-11-2520-49/+53
* service/hid: Add support for new controllersgerman772021-11-251-1/+30
* core/hid: Rename NpadType to NpadStyleIndexgerman772021-11-252-68/+72
* second commit lion reviewgerman772021-11-258-5/+13
* kraken: Address comments from reviewgerman772021-11-253-6/+1
* core/hid: Update structs to 13.1.0german772021-11-258-29/+76
* core/hid: Rework battery mappingsgerman772021-11-251-2/+9
* service/hid: Fix memory allocated incorrectlygerman772021-11-255-7/+7
* Morph review first wavegerman772021-11-2511-69/+51
* service/hid: Match shared memory closer to HWgerman772021-11-252-26/+75
* kraken: Address comments from reviewgerman772021-11-252-6/+6
* service/hid: Use ring buffer for gesturesgerman772021-11-252-79/+52
* service/hid: Fix gesture inputgerman772021-11-252-61/+92
* core/hid: Only signal when neededgerman772021-11-251-2/+4
* hid: Fix controller connection/disconnectiongerman772021-11-253-26/+56
* core/hid: Add output devicesgerman772021-11-252-40/+5
* service/hid: Rewrite npad to use ring lifo and the emulated controllergerman772021-11-252-890/+605
* service/hid: Update console sixaxis to the emulated consolegerman772021-11-252-28/+26
* service/hid: Update mouse and keyboard to use ring lifo and the emulated devicegerman772021-11-254-158/+71
* service/hid: Update touch and gestures to use ring lifo and the emulated consolegerman772021-11-254-370/+191
* service/hid: Update debug pad, xpad, stubbed and controller base to use ring lifo and the emulated controllergerman772021-11-257-166/+80
* settings: Cleanup settingsgerman772021-11-253-3/+3
* core: Remove unused includesameerj2021-11-041-1/+0
* service/hid: Update to 13.0.0german772021-09-271-0/+1
* hid: Stub SetTouchScreenConfigurationgerman772021-09-101-0/+14
* hle: service: hid: npad: Remove unused kernel reference.bunnei2021-07-211-1/+0
* hle: service: Add a helper module for managing kernel objects.bunnei2021-07-212-6/+14
* npad: Disable vibration check if disabledgerman772021-07-111-0/+5
* npad: Fix data race when updating devicesRodrigo Locatti2021-06-222-0/+8
* touchscreen: Make use of common point structLioncash2021-05-282-10/+10
* common: Extract point into a common structLioncash2021-05-281-29/+7
* hid/gesture: Factor out last gesture retrieval into its own functionLioncash2021-05-182-14/+23
* hid/gesture: Ensure all ID arrays are initializedLioncash2021-05-181-4/+4
* hid/gesture: Make Point a templateLioncash2021-05-182-38/+46
* hid/gesture: Replace x,y members of GestureState with a PointLioncash2021-05-182-6/+4
* hid/gesture: Add default comparators to PointLioncash2021-05-182-10/+7
* hid/gesture: Rename Points to PointLioncash2021-05-181-5/+5
* core: Make variable shadowing a compile-time errorLioncash2021-05-164-34/+41
* Merge pull request #6267 from german77/gestureRewriteMorph2021-05-122-76/+340
|\
| * hid: Improve hardware accuracy of gesturesgerman772021-05-052-76/+340
* | hle: kernel: Remove deprecated Object class.bunnei2021-05-061-1/+0
* | hle: kernel: Migrate KReadableEvent and KWritableEvent to KAutoObject.bunnei2021-05-062-6/+5
* | hle: kernel: Refactor several threads/events/sharedmemory to use slab heaps.bunnei2021-05-062-4/+9
* | hle: kernel: Ensure all kernel objects with KAutoObject are properly created.bunnei2021-05-061-0/+1
* | hle: kernel: Migrate KEvent to KAutoObject.bunnei2021-05-062-4/+3
* | hle: kernel: Refactor IPC interfaces to not use std::shared_ptr.bunnei2021-05-062-3/+2
|/
* service: Resolve cases of member field shadowingLioncash2021-05-0418-19/+19
* hid: Fix touch not initializing properly if disabledgerman772021-05-032-2/+10
* Disable touch if setting is not enabledgerman772021-05-012-2/+2
* address commentsgerman772021-04-272-5/+5
* hid: Implement SevenSixAxis and ConsoleSixAxisSensorgerman772021-04-244-2/+174
* npad: Remove duplicated class member variableLioncash2021-04-192-2/+1
* common: Move settings to common from core.bunnei2021-04-159-9/+9
* service: hid: Stub SetAnalogStickUseCenterClampMorph2021-04-082-0/+6
* Merge pull request #6131 from german77/rightjoyconSLSRMorph2021-04-021-2/+6
|\
| * HID: Fix SL and SR buttons for right joycongerman772021-04-021-2/+6
* | HID: Initialize correctly the gesture finger_id and filter invalid resultsNarr the Reg2021-03-262-3/+13
|/
* Merge pull request #5276 from german77/gesturesMorph2021-02-282-11/+240
|\
| * Implements touch, pan, pinch and rotation gesturesgerman2021-02-282-11/+240
* | hid: Implement GC controllergerman2021-02-082-1/+88
|/
* Merge pull request #5326 from german77/hidUpdate1bunnei2021-02-067-156/+386
|\
| * Add footer types and address commentsgerman2021-02-047-58/+106
| * Fix npad struct to match switchbrewgerman2021-02-042-104/+133
| * Adds missing controller types and propertiesgerman2021-02-047-19/+172
* | hle: kernel: Reimplement KReadableEvent and KWritableEvent.bunnei2021-02-052-7/+13
* | hle: kernel: Rename WritableEvent to KWritableEvent.bunnei2021-02-052-3/+3
* | hle: kernel: Rename ReadableEvent to KReadableEvent.bunnei2021-02-052-3/+4
|/
* npad: Remove unused device handle parameterMorph2021-01-272-7/+6
* Stub Set/Get/Reset SixaxisSensorFusionParametersgerman2021-01-242-0/+23
* Merge pull request #5270 from german77/multiTouchbunnei2021-01-212-29/+130
|\
| * Always initialize keyboard inputgerman2021-01-151-5/+1
| * Add mutitouch support for touch screensgerman2021-01-152-19/+25
| * Allow to return up to 16 touch inputs per enginegerman2021-01-152-55/+75
| * Allow all touch inputs at the same time and remove config options that are not longer necesarygerman2021-01-152-11/+20
| * Add multitouch supportgerman2021-01-152-23/+93
* | npad: Add check for HANDHELD_INDEX in UpdateControllerAt()Morph2021-01-181-1/+1
* | core: Silence Wclass-memaccess warningsReinUsesLisp2021-01-152-10/+19
|/
* controllers/npad: Make press_state atomicMorph2020-12-182-2/+3
* controllers/npad: Validate device handles before useMorph2020-12-122-0/+45
* Add missing types to NpadCommunicationModegerman2020-11-291-0/+2
* Stub set and get NpadCommunicationModegerman2020-11-272-0/+18
* hid: Reimplement Begin/EndPermitVibrationSessionMorph2020-11-162-2/+9
* controllers/npad: Load input devices on initMorph2020-11-161-0/+2
* general: Fix compiler warnings on linux and miscellaneous changesMorph2020-11-162-8/+11
* controllers/npad: Remove the old vibration filterMorph2020-11-162-49/+63
* hid: Implement InitializeVibrationDevice and IsVibrationDeviceMountedMorph2020-11-162-1/+48
* input_common: Add VibrationDevice and VibrationDeviceFactoryMorph2020-11-162-33/+26
* configure_input: Add per-player vibrationMorph2020-11-161-2/+11
* settings: Remove global vibration strength modifierMorph2020-11-161-3/+1
* hid: Mark Begin/EndPermitVibrationSession as stubsMorph2020-11-162-12/+1
* controllers/npad: Send an empty vibration on destruction/deactivationMorph2020-11-162-20/+36
* controllers/npad: Add heuristics to reduce rumble state changesMorph2020-11-161-5/+46
* configure_input: Hook up the vibration percentage spinboxMorph2020-11-161-1/+2
* controllers/npad: Stop games from vibrating incorrect controllersMorph2020-11-161-0/+10
* hid: Fix controller rumble based on new researchMorph2020-11-162-24/+33
* hid: Reorder all HID commandsMorph2020-11-162-24/+24
* controllers/npad: Rename NPadType to NpadStyleSetMorph2020-11-162-8/+8
* controllers/npad: Add DeviceHandle structMorph2020-11-161-27/+50
* settings: Preparation for per-game input settingsMorph2020-11-161-18/+24
* controllers/npad: Connect a controller on init if none are connectedMorph2020-11-161-0/+13
* Revert "core: Fix clang build"bunnei2020-10-219-80/+52
* core: Fix clang buildLioncash2020-10-189-52/+80
* core/CMakeLists: Make some warnings errorsLioncash2020-10-132-27/+2
* Merge pull request #4736 from Morph1984/home-button-input-protection-stubbunnei2020-10-072-0/+12
|\
| * hid: Stub HomeButtonInputProtection service commandsMorph2020-09-302-0/+12
* | Only use inputs corresponding to controller typegerman2020-10-021-49/+58
* | Merge pull request #4291 from german77/ImplementControllerRumbleDavid2020-09-302-8/+19
|\ \ | |/ |/|
| * First implementation of controller rumblegerman2020-09-292-8/+19
* | Use different timing for motiongerman2020-09-243-73/+137
|/
* Merge pull request #4683 from Morph1984/NpadHandheldActivationMode-implbunnei2020-09-202-0/+18
|\
| * hid: Implement Get/SetNpadHandheldActivationModeMorph2020-09-182-0/+18
* | Merge pull request #4594 from german77/MotionHIDbunnei2020-09-172-9/+151
|\ \ | |/ |/|
| * configure_input: Hook up the motion button and checkboxMorph2020-09-051-1/+1
| * Add cemu hook changes related to PR #4609german2020-09-051-2/+1
| * Remove RealMotionDevicegerman2020-09-052-7/+8
| * controllers/npad: Simplify motion entry assignmentMorph2020-09-051-29/+18
| * Include HID and configuration changes related to motiongerman2020-09-052-9/+162
* | Merge pull request #4597 from Morph1984/mjolnir-p2bunnei2020-09-112-100/+23
|\ \ | |/ |/|
| * applets/controller: Implement fallback applet for the SDL frontendMorph2020-09-042-89/+0
| * Project Mjölnir: Part 2 - Controller AppletMorph2020-09-042-11/+23
* | hid: Implement MergeSingleJoyasDualJoyMorph2020-09-042-0/+17
|/
* yuzu: Add motion and touch configurationFearlessTobi2020-08-292-1/+12
* controllers/npad: Fix inconsistencies with controller connection statusesMorph2020-08-261-1/+7
* controllers/npad: Fix LibNX controller connection statusesMorph2020-08-261-1/+9
* controllers/npad: Fix LedPattern for P1-4Morph2020-08-261-3/+3
* Project Mjölnir: Part 1Morph2020-08-262-118/+106
* core: Resolve several -Wextra-semi warningsLioncash2020-08-141-2/+2
* hid: Only update keyboard & debug pad inputs if enabledDavid Marcec2020-07-162-33/+37
* General: Recover Prometheus project from harddrive failure Fernando Sahmkow2020-06-278-9/+9
* hid: Implement Get/ResetGyroscopeZeroDriftModeMorph2020-06-212-1/+17
* hid: Clear keyboard states & fix logic issueDavid Marcec2020-05-121-3/+4
* npad: Lower log level for VibrateController to DebugFearlessTobi2020-04-201-1/+1
* service: hid: npad: Fix implicit fallthrough errors.bunnei2020-04-181-0/+2
* analog_from_button get direction implementationCJBok2020-02-181-5/+5
* Moved analog direction logic to sdl_implCJBok2020-01-151-9/+22
* Corrected directional states sensitivityCJBok2020-01-141-9/+9
* hid: Fix analog sticks directional statesCJBok2020-01-091-12/+12
* kernel: Replace usage of boost::intrusive_ptr with std::shared_ptr for kernel objects. (#3154)bunnei2019-11-252-3/+2
* kernel: events: Remove ResetType::Automatic.bunnei2019-11-031-1/+1
* hid/npad: Fix incorrect connection boolean value in ConnectAllDisconnectedControllers()Lioncash2019-10-181-1/+1
* hid/npad: Add missing break in default caseLioncash2019-10-181-0/+1
* hid/npad: Replace std::for_each with ranged for loopsLioncash2019-10-181-13/+12
* hid/npad: Remove redundant non-const variant of IsControllerSupported()Lioncash2019-10-182-34/+5
* hid/npad: Move function declarationsLioncash2019-10-181-5/+6
* service/hid: Silence -Wunused and -WswitchReinUsesLisp2019-10-0514-21/+14
* service/hid: Remove unused system referenceReinUsesLisp2019-10-052-2/+1
* Signal styleset changes at a better timeDavid Marcec2019-09-241-8/+2
* removed commentDavid Marcec2019-09-221-1/+0
* RebasedDavid Marcec2019-09-222-10/+18
* removed unneeded semicolonDavid Marcec2019-09-221-1/+1
* marked controller constructors as explicitDavid Marcec2019-09-228-8/+8
* RebaseDavid Marcec2019-09-2218-38/+53
* Deglobalize System: HidDavid Marcec2019-09-2218-21/+25
* dittoMorph19842019-09-041-1/+1
* IsVibrationEnabled() as a const member funcMorph19842019-09-041-1/+1
* Update npad.hMorph19842019-09-041-0/+1
* Update npad.cppMorph19842019-09-041-0/+6
* addressed issuesDavid Marcec2019-07-081-6/+7
* hid:StartLrAssignmentMode, hid:StopLrAssignmentMode, hid:SwapNpadAssignmentDavid Marcec2019-07-012-0/+35
* core/kernel/object: Rename ResetType enum membersLioncash2019-05-181-1/+1
* Merge pull request #2090 from FearlessTobi/port-4599bunnei2019-03-213-68/+68
|\
| * remove all occurance of specifying endianness inside BitFieldWeiyi Wang2019-02-063-68/+68
* | core_timing: Convert core timing into a classLioncash2019-02-1617-26/+39
* | core_timing: Rename CoreTiming namespace to Core::TimingLioncash2019-02-128-9/+9
|/
* web_browser: Add bounds checking to applet interfaceZach Hilman2018-12-292-5/+3
* hid: Make Hid service accessible and add GetPressStateZach Hilman2018-12-282-0/+14
* npad: Remove code to invert input in horizontal mode.bunnei2018-12-261-46/+0
* Merge pull request #1803 from DarkLordZach/k-able-eventbunnei2018-12-032-11/+14
|\
| * kernel/event: Reference ReadableEvent from WritableEventZach Hilman2018-11-292-13/+7
| * core: Port all current usages of Event to Readable/WritableEventZach Hilman2018-11-292-8/+17
* | Fixed crash with SetNpadModeDavid Marcec2018-12-021-2/+3
|/
* Merge pull request #1801 from ogniK5377/log-before-executebunnei2018-11-291-1/+2
|\
| * Changed logging to be "Log before execution", Added more error logging, all services should now log on some levelDavid Marcec2018-11-261-1/+2
* | Merge pull request #1817 from DarkLordZach/npad-idx-fixbunnei2018-11-281-2/+2
|\ \
| * | npad: Use NPadIdToIndex to prevent invalid array accessZach Hilman2018-11-281-2/+2
| |/
* / npad: Fix copy/paste error with LED position assignmentsZach Hilman2018-11-271-3/+3
|/
* debug_pad: Avoid loading input for nonexistent buttons (Home and Screenshot)Zach Hilman2018-11-221-2/+3
* hid: Use player-defined controller type as PREFERRED_CONTROLLERZach Hilman2018-11-194-174/+61
* hid/npad: Update NPad to use player controller bindings and typeZach Hilman2018-11-192-55/+108
* hid/touchscreen: Update Touchscreen to use advanced parametersZach Hilman2018-11-191-6/+6
* hid: Add controller bindings for Mouse controllerZach Hilman2018-11-192-4/+30
* hid: Add keyboard bindings for Keyboard controllerZach Hilman2018-11-192-2/+24
* hid: Add controller bindings for DebugPad controllerZach Hilman2018-11-192-21/+43
* Added missing start/end touch attributes to touchscreenDavid Marcec2018-11-192-1/+18
* Added debugpad skeletonDavid Marcec2018-11-192-2/+55
* Added controller helper funcsDavid Marcec2018-11-192-0/+35
* Left joycon rotation button remappingDavid Marcec2018-11-192-7/+21
* Added automatic npad switch based on supported stylesetsDavid Marcec2018-11-192-4/+124
* Added multi-input support and controller assignment at any portDavid Marcec2018-11-192-122/+181
* Fixed priority switching edge case for handheld (#1675)David2018-11-161-12/+46
* hid/npad: Add missing break in switch statement within Controller_NPad::OnUpdate()Lioncash2018-11-141-0/+1
* Updated npad styles on holdtype switchesDavid Marcec2018-11-071-0/+2
* Fixed HID crash when launching more than 1 game & signaled syleset change eventDavid Marcec2018-11-021-0/+3
* npad: Remove unused controller variable from OnInit()Lioncash2018-10-241-2/+3
* Added auto controller switching to supported controllers and single joycon button rotationDavid Marcec2018-10-202-4/+189
* hid/controller: Remove unused header inclusionsLioncash2018-10-189-9/+0
* hid/controller/npad: Remove unused dump_idx member variableLioncash2018-10-181-1/+0
* hid/controller/npad: Remove unnecessary semicolon from the closing brace of LedPattern's constructorLioncash2018-10-181-1/+1
* hid/controller/npad: Remove #pragma once from the cpp fileLioncash2018-10-181-2/+0
* hid/controller/npad: Move npad_id_list into the cpp fileLioncash2018-10-182-2/+10
* hid/controller/npad: Remove unnecessary const from void return typeLioncash2018-10-182-2/+2
* hid/controller: Default the destructors of all controller types in the cpp fileLioncash2018-10-1816-0/+16
* controller_base: Default the base class constructor and destructor in the cpp fileLioncash2018-10-182-2/+4
* Using dual joycons as the default controllerDavid Marcec2018-10-172-74/+58
* WipDavid Marcec2018-10-121-2/+18
* Dynamically decide handheld variant based on supported npad id priorityDavid Marcec2018-10-112-19/+58
* Added BeginPermitVibrationSession and EndPermitVibrationSessionDavid Marcec2018-10-102-0/+8
* Added GetLedPattern and HandheldVariantDavid Marcec2018-10-102-4/+54
* Kirby expects handheld controllers to be at position 8David Marcec2018-10-101-2/+8
* Added the ability to "disconnect" individual npadsDavid Marcec2018-10-102-15/+36
* Removed unneeded forward declarationsDavid Marcec2018-10-102-13/+2
* Addressed changes for better hidDavid Marcec2018-10-1018-130/+208
* "Better Hid" rework part 1David Marcec2018-10-1018-0/+1289