uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix action.h according to our coding standards.

Browse Source
This commit is contained in:
László Monda
2017-06-15 19:21:00 +02:00
parent 2e9048bbb0
commit a2c13dee1f
1 changed files with 90 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
right/src/action.h
View File

@@ -1,14 +1,25 @@
#ifndef __ACTION_H__ #ifndef __ACTION_H__
#define __ACTION_H__ #define __ACTION_H__
#include <stdint.h> // Includes:
#include "lufa/HIDClassCommon.h"
#include "usb_composite_device.h"
#include "main.h"
#include "module.h" #include <stdint.h>
#include "lufa/HIDClassCommon.h"
#include "usb_composite_device.h"
#include "main.h"
#include "module.h"
typedef enum { // Macros:
#define MOUSE_WHEEL_SPEED 1
#define MOUSE_WHEEL_DIVISOR 4
#define MOUSE_MAX_SPEED 10
#define MOUSE_SPEED_ACCEL_DIVISOR 50
// Typedefs:
typedef enum {
KeyActionType_None, KeyActionType_None,
KeyActionType_Keystroke, KeyActionType_Keystroke,
KeyActionType_Mouse, KeyActionType_Mouse,
@@ -16,24 +27,24 @@ typedef enum {
KeyActionType_SwitchKeymap, KeyActionType_SwitchKeymap,
KeyActionType_PlayMacro, KeyActionType_PlayMacro,
KeyActionType_Test, KeyActionType_Test,
} key_action_type_t; } key_action_type_t;
typedef enum { typedef enum {
KeystrokeType_Basic, KeystrokeType_Basic,
KeystrokeType_Media, KeystrokeType_Media,
KeystrokeType_System, KeystrokeType_System,
} keystroke_type_t; } keystroke_type_t;
typedef enum { typedef enum {
MouseButton_Left = 1 << 0, MouseButton_Left = 1 << 0,
MouseButton_Right = 1 << 1, MouseButton_Right = 1 << 1,
MouseButton_Middle = 1 << 2, MouseButton_Middle = 1 << 2,
MouseButton_4 = 1 << 3, MouseButton_4 = 1 << 3,
MouseButton_5 = 1 << 4, MouseButton_5 = 1 << 4,
MouseButton_t = 1 << 5, MouseButton_t = 1 << 5,
} mouse_button_t; } mouse_button_t;
typedef enum { typedef enum {
MouseMove_Up = 1 << 0, MouseMove_Up = 1 << 0,
MouseMove_Down = 1 << 1, MouseMove_Down = 1 << 1,
MouseMove_Left = 1 << 2, MouseMove_Left = 1 << 2,
@@ -41,31 +52,25 @@ typedef enum {
MouseMove_Accelerate = 1 << 4, MouseMove_Accelerate = 1 << 4,
MouseMove_Decelerate = 1 << 5, MouseMove_Decelerate = 1 << 5,
} mouse_move_action_t; } mouse_move_action_t;
typedef enum { typedef enum {
MouseScroll_Up = 1 << 0, MouseScroll_Up = 1 << 0,
MouseScroll_Down = 1 << 1, MouseScroll_Down = 1 << 1,
MouseScroll_Left = 1 << 2, MouseScroll_Left = 1 << 2,
MouseScroll_Right = 1 << 3, MouseScroll_Right = 1 << 3,
} mouse_scroll_t; } mouse_scroll_t;
typedef enum { typedef enum {
TestAction_DisableUsb, TestAction_DisableUsb,
TestAction_DisableI2c, TestAction_DisableI2c,
TestAction_DisableKeyMatrixScan, TestAction_DisableKeyMatrixScan,
TestAction_DisableLedSdb, TestAction_DisableLedSdb,
TestAction_DisableLedFetPwm, TestAction_DisableLedFetPwm,
TestAction_DisableLedDriverPwm, TestAction_DisableLedDriverPwm,
} test_action_t; } test_action_t;
#define MOUSE_WHEEL_SPEED 1 typedef struct {
#define MOUSE_WHEEL_DIVISOR 4
#define MOUSE_MAX_SPEED 10
#define MOUSE_SPEED_ACCEL_DIVISOR 50
typedef struct {
uint8_t type; uint8_t type;
union { union {
struct { struct {
@@ -93,8 +98,10 @@ typedef struct {
test_action_t testAction; test_action_t testAction;
} __attribute__ ((packed)) test; } __attribute__ ((packed)) test;
}; };
} __attribute__ ((packed)) key_action_t; } __attribute__ ((packed)) key_action_t;
extern void UpdateActiveUsbReports(); // Variables:
extern void UpdateActiveUsbReports();
#endif #endif