Commit Graph

1594 Commits

Author SHA1 Message Date
Kristian Sloth Lauszus
372151848a Just define the usb_status_t variable inside the if-statements 2018-06-30 23:44:58 +02:00
Kristian Sloth Lauszus
5b32c0da43 Disable the key press test code 2018-06-30 23:42:39 +02:00
Kristian Sloth Lauszus
edf34de4b5 Fixed comment 2018-06-30 23:23:12 +02:00
Kristian Sloth Lauszus
8c7eb079ec Re-added code from 994e2f6b79 2018-06-30 23:03:50 +02:00
Kristian Sloth Lauszus
6612f7cced Fixed warning 2018-06-30 22:48:52 +02:00
Kristian Sloth Lauszus
7606f311c8 Fix coding style 2018-06-30 22:38:23 +02:00
Kristian Sloth Lauszus
9fe73233af Fix merge issue 2018-06-30 22:36:48 +02:00
Kristian Sloth Lauszus
cba1ef97b6 Revert "Set the USB interrupt priority to the maximum possible" 2018-06-30 22:31:32 +02:00
Kristian Sloth Lauszus
c69f664e85 Merge branch 'master' into dev
# Conflicts:
#	right/src/timer.c
#	right/src/timer.h
#	right/src/usb_report_updater.c
2018-06-30 22:27:52 +02:00
Kristian Sloth Lauszus
6c895988de Merge branch 'Lauszus-dev' into dev
# Conflicts:
#	right/src/usb_interfaces/usb_interface_basic_keyboard.c
#	right/src/usb_interfaces/usb_interface_media_keyboard.c
#	right/src/usb_interfaces/usb_interface_mouse.c
#	right/src/usb_interfaces/usb_interface_system_keyboard.c
#	right/src/usb_report_updater.c
2018-06-30 22:23:32 +02:00
Eric Tang
f16a004583 Revert "Default to kStatus_USB_Success"
This reverts commit 6eceb6ad30.
2018-06-30 13:06:23 -07:00
Kristian Sloth Lauszus
c870f335a7 Set the other interrupts back to the value there were before 2018-06-30 18:55:31 +02:00
Kristian Sloth Lauszus
b6f59563c7 Revert cancelling a transfer, as the USB endpoint is still locked up 2018-06-30 18:25:03 +02:00
Kristian Sloth Lauszus
409bd01af6 Decreasing the USB priority actually works better
Needs more testing
2018-06-30 17:28:19 +02:00
Kristian Sloth Lauszus
b9b5eb2c76 Make sure the device is attached before sending the report 2018-06-30 17:06:59 +02:00
Kristian Sloth Lauszus
11a8ffbaf5 Make sure the composite device is attached before setting the kStatus_USB_Success flag 2018-06-30 17:06:59 +02:00
Kristian Sloth Lauszus
9938f14d20 Set the USB interrupt priority to the maximum possible 2018-06-30 17:06:59 +02:00
Kristian Sloth Lauszus
217259ba63 Cancel the ongoing transfer if it is still in progress 2018-06-30 17:06:58 +02:00
Eric Tang
e5afa33b79 Allow scanning to continue if the host is asleep 2018-06-29 23:06:31 -07:00
Eric Tang
d3dfc9bd2c Revert "Simplify logic"
This reverts commit 994e2f6b79.
2018-06-29 23:01:31 -07:00
Eric Tang
8f6251bc4d Only set the semaphore if the report is successfully requested 2018-06-29 23:01:20 -07:00
Eric Tang
b93f211502 Don't retry sending a report if it fails 2018-06-29 22:44:42 -07:00
Eric Tang
69411e53e9 Rename usbMouseAction to UsbMouseAction 2018-06-29 17:23:15 -07:00
Eric Tang
39819e6058 Type Backspace instead of b 2018-06-29 13:29:40 -07:00
Eric Tang
bd97bba4b5 Wake up the host before attempting to send reports 2018-06-29 13:19:49 -07:00
Eric Tang
4214f3e0b6 Use a semaphore to control the rate at which reports are updated 2018-06-29 13:08:24 -07:00
Eric Tang
6eceb6ad30 Default to kStatus_USB_Success 2018-06-29 12:54:06 -07:00
Eric Tang
994e2f6b79 Simplify logic 2018-06-29 12:43:59 -07:00
Eric Tang
baa5e8f037 Remove redundant guard clauses 2018-06-29 12:37:53 -07:00
Eric Tang
cbd5f1b500 Redefine USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH 2018-06-28 17:25:14 -07:00
Eric Tang
c1dc4be8c8 Fix USB_DeviceGetHidDescriptor 2018-06-28 17:25:09 -07:00
Eric Tang
1bd8c7dca8 Use a switch statement 2018-06-28 16:10:26 -07:00
László Monda
d72ea4dde5 Merge pull request #131 from UltimateHackingKeyboard/macro-engine
Implement the macro engine
2018-06-27 23:02:09 +02:00
Eric Tang
5d621880ec Merge branch 'dev' of https://github.com/Lauszus/firmware into Lauszus-dev 2018-06-27 13:44:17 -07:00
László Monda
5c3e2966c4 Restore the logic of the key debouncer. Make it only debounce keypresses and set its timeout to 100ms. 2018-06-27 21:42:15 +02:00
László Monda
d21fe30139 Bump firmware version to 8.3.2. Update changelog, package.json and versions.h v8.3.2 2018-06-27 14:26:29 +02:00
László Monda
224d9eae42 Merge pull request #130 from UltimateHackingKeyboard/key-release-debouncing
Fix key chattering
2018-06-27 14:13:05 +02:00
Kristian Sloth Lauszus
8c02f3db53 Merge branch 'master' into dev
# Conflicts:
#	right/src/usb_interfaces/usb_interface_basic_keyboard.c
#	right/src/usb_interfaces/usb_interface_basic_keyboard.h
#	right/src/usb_interfaces/usb_interface_media_keyboard.c
#	right/src/usb_interfaces/usb_interface_media_keyboard.h
#	right/src/usb_interfaces/usb_interface_mouse.c
#	right/src/usb_interfaces/usb_interface_mouse.h
#	right/src/usb_interfaces/usb_interface_system_keyboard.c
#	right/src/usb_interfaces/usb_interface_system_keyboard.h
#	right/src/usb_report_updater.c
2018-06-27 10:12:40 +02:00
Eric Tang
02bbeb7177 Fix the formatting in timer.c 2018-06-26 22:13:13 -07:00
Eric Tang
cdfabaec42 Make the debounce counters count down 2018-06-26 21:58:48 -07:00
Eric Tang
0e9525ce9a Don't clear the whole report 2018-06-26 18:39:41 -07:00
Eric Tang
633a6cec77 Clear the report at the end of a move mouse or scroll mouse macro 2018-06-26 18:39:41 -07:00
Eric Tang
d35a7cc644 Clear the report at the end of a text macro 2018-06-26 18:39:41 -07:00
Eric Tang
76a91c010b Implement the text macro action 2018-06-26 18:39:41 -07:00
Eric Tang
54b0a595bc Rename functions for consistency 2018-06-26 18:39:41 -07:00
Eric Tang
4b9aa0860c Implement the mouse macro actions 2018-06-26 18:39:41 -07:00
Eric Tang
df8792a60d Fix code formatting 2018-06-26 18:39:41 -07:00
Eric Tang
5988fce59b Implement the delay macro action 2018-06-26 18:39:41 -07:00
Eric Tang
314eb0d771 Stop macros from repeating 2018-06-26 18:39:41 -07:00
Eric Tang
c1f5a96e1b Correctly pass pointers to the active reports to memcpy 2018-06-26 18:39:41 -07:00