diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 827fd15..7010a9f 100644 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -1,4 +1,4 @@ -/* + /* * ======================================================================================================= * ------------------------------------------------------------------------------------------------------- * ---####################-----###########-------###########-----############--############-############-- @@ -9,7 +9,7 @@ * -- -------------------- ------ ------ --------- ------- -- -- * --#####--------------------#####--------#####--------#####--------------------------------------------- * -- -------------------- -------- -------- --------------------------------------------- - * --######--------------##---#####---------------------#####---------- CMtec CMDR Keyboard 42 ----------- + * --######--------------##---#####---------------------#####---------- CMtec CMDR Joystick RC ----------- * --##################### ---#####---------------------#####--------------------------------------------- * ---################### ----#####---------------------#####--------------------------------------------- * --- ----- --------------------- --------------------------------------------- @@ -18,53 +18,55 @@ * * Copyright 2022 Christoffer Martinsson * - * CMtec CMDR Keyboard 42 can be redistributed and/or modified under the terms of the GNU General + * CMtec CMDR Joystick RC can be redistributed and/or modified under the terms of the GNU General * Public License (Version 2), as published by the Free Software Foundation. * A copy of the license can be found online at www.gnu.o urg/licenses. * - * CMtec CMDR Keyboard 42 is distributed in the hope that it will be useful, but WITHOUT ANY + * CMtec CMDR Joystick RC is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR * A PARTICULAR PURPOSE. See the GNU General Public License for more details. * - * Keyboard/Mouse based on standard teensy "Keypad" library for button scanning, standard teensy - * "usb_keyboard" library for HID keyboard/mouse usb data communication. - * + * Joystick based on standard teensy "Keypad" library for button scanning, standard teensy + * "usb_joystick" library for HID joystick usb data communication. + * * Layer 0 - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | Q | W | E | R | T | | Y | U | I | O | P | Å | - * | Ctrl/Esc | A | S | D | F | G | | H | J | K | L | Ö | Ä | - * | Shift | Z | X | C | V | B | | N | M | , | . | - | Shift | - * -----------------------| Alt | Spc | Fn1 | | Spc | Entr| Win |-------------------- - * ------------------- ------------------- - * Layer 1 (Fn1) - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | - * | Ctrl/Esc | 1 | 2 | 3 | 4 | 5 | | Left| Down| Up |Right| Del | § | - * | Shift | 6 | 7 | 8 | 9 | 0 | | < | ´ | ' | ¨ | + | Shift | - * -----------------------| Alt | Spc | Fn1 | | BSpc| AltG| Win |-------------------- - * ------------------- ------------------- - * Layer 2 (Fn2) - * ------------------------------------------ --------------------------------------- - * | Fn2/Tab | F12 | F13 | F14 | F15 | F16 | | | M1 | M2 | M3 | MWU | CapLk | - * | Ctrl/Esc | Play| Next| F17 | F18 | F19 | | ML | MD | MU | MR | MWD | Esc | - * | Shift | F20 | F21 | F22 | F23 | F24 | | Home| PgD | PgU | End | Ins | Shift | - * -----------------------| Alt | Win | Fn1 | | | | |-------------------- - * ------------------- ------------------- + * + * | B7 | | B9 | + * --------------------------------------------- + * | B8 | | | B1 | B2 | | | B10 | + * | X1,Y1 | | B3 | B4 | | X2,Y2 | + * | Fn1 | | B5 |Y1 offset| B6 | | Fn2 | + * --------------------------------------------- + * + * Layer 1 (Fn1) + * + * | B17| | B19| + * --------------------------------------------- + * | B18 | | | B11| B12| | | B20 | + * | X1,Y1 | | B13| B14| | X3,Y2 | + * | Fn1 | | B15|Y1 offset| B16| | Fn2 | + * --------------------------------------------- + * + * Layer 2 (Fn2) + * + * | B27| | B29| + * --------------------------------------------- + * | B28 | | | B21| B22| | | B30 | + * | X1,Y1 | | B23| B24| | X3,Y3 | + * | Fn1 | | B25|Y1 offset| B26| | Fn2 | + * --------------------------------------------- + * * Features: * - * * 42 keys "Split" keyboard layout. 36 finger buttons and 6 thumb buttons. - * * Extreme low profile (only one pcb). - * * Cost efficient solution with one pcb and one 3D printed cover. - * * Function keys with total of three layer support (Primary + 2fn layers). - * * Mouse movement, wheel up, wheel down, left button, right button and middle button support - * * Status indication - - * - LED off = Normal mode - * - LED flashing = Caps Lock activated - * * Tap/Hold functionality (only for layer0) + * * 5 physical axis. + * * 6 joystick axis using layers. + * * 12 physical buttons. + * * 32 joystick buttons using three layers (Fn1 and Fn2). */ #include #include +#include #define USB_LED_NUM_LOCK 0 #define USB_LED_CAPS_LOCK 1 @@ -72,20 +74,60 @@ #define KEY_OFFSET 0xAA00 // Offset to apply for not interfere with already defined keyboard keys -#define KEY_MWU 1 + KEY_OFFSET // Mouse wheel up -#define KEY_MWD 2 + KEY_OFFSET // Mouse wheel down -#define KEY_M1 3 + KEY_OFFSET // Mouse button 1 (left) -#define KEY_M2 4 + KEY_OFFSET // Mouse button 2 (right) -#define KEY_M3 5 + KEY_OFFSET // Mouse button 3 (middle/wheel) -#define KEY_MU 6 + KEY_OFFSET // Mouse Y+ -#define KEY_ML 7 + KEY_OFFSET // Mouse X- -#define KEY_MD 8 + KEY_OFFSET // Mouse Y- -#define KEY_MR 9 + KEY_OFFSET // Mouse X+ -#define KEY_FN1 10 + KEY_OFFSET // Function layer 1 button -#define KEY_FN2 11 + KEY_OFFSET // Function layer 2 button +#define NO_JOY 0 + +#define JOY_A1 1 + KEY_OFFSET +#define JOY_A2 2 + KEY_OFFSET +#define JOY_A3 3 + KEY_OFFSET +#define JOY_A4 4 + KEY_OFFSET +#define JOY_A5 5 + KEY_OFFSET +#define JOY_A6 6 + KEY_OFFSET +#define JOY_A7 7 + KEY_OFFSET +#define JOY_A8 8 + KEY_OFFSET +#define JOY_A9 9 + KEY_OFFSET +#define JOY_A10 10 + KEY_OFFSET +#define JOY_A11 11 + KEY_OFFSET +#define JOY_A12 12 + KEY_OFFSET +#define JOY_A13 13 + KEY_OFFSET +#define JOY_A14 14 + KEY_OFFSET +#define JOY_A15 15 + KEY_OFFSET +#define JOY_A16 16 + KEY_OFFSET +#define JOY_A17 17 + KEY_OFFSET +#define JOY_A18 18 + KEY_OFFSET +#define JOY_A19 19 + KEY_OFFSET +#define JOY_A20 20 + KEY_OFFSET +#define JOY_A21 21 + KEY_OFFSET +#define JOY_A22 22 + KEY_OFFSET +#define JOY_A23 23 + KEY_OFFSET +#define JOY_A24 24 + KEY_OFFSET +#define JOY_A25 25 + KEY_OFFSET +#define JOY_A26 26 + KEY_OFFSET +#define JOY_A27 27 + KEY_OFFSET +#define JOY_A28 28 + KEY_OFFSET +#define JOY_A29 29 + KEY_OFFSET +#define JOY_A30 30 + KEY_OFFSET +#define JOY_A31 31 + KEY_OFFSET +#define JOY_A32 32 + KEY_OFFSET + +#define JOY_AHU1 49 + KEY_OFFSET +#define JOY_AHR1 50 + KEY_OFFSET +#define JOY_AHD1 51 + KEY_OFFSET +#define JOY_AHL1 52 + KEY_OFFSET + +#define KEY_FN1 61 + KEY_OFFSET // Function layer 1 button +#define KEY_FN2 62 + KEY_OFFSET // Function layer 2 button #define TAP_TIMEOUT 150 // Key tap timeout (ms) -#define NBR_OF_BUTTONS 42 // Number of buttons used (42 in this case) +#define NBR_OF_BUTTONS 12 // Number of buttons used (12 in this case) + +#define HID_AXIS_MAX 1023 +#define HID_AXIS_MIN 0 +#define HID_AXIS_CENTER 512 +#define AXIS_MAX 4096 +#define AXIS_MIN 0 +#define AXIS_CENTER 2048 +#define DEADZONE_X 50 +#define DEADZONE_Y 50 struct Button { @@ -106,17 +148,16 @@ struct Button bool tap_inhibit = false; }; -const byte KP_ROWS = 4; -const byte KP_COLS = 12; +const byte KP_ROWS = 3; +const byte KP_COLS = 4; -byte kp_rowPins[KP_ROWS] = {0, 1, 2, 3}; -byte kp_colPins[KP_COLS] = {9, 8, 7, 6, 5, 4, 19, 18, 17, 16, 15, 14}; +byte kp_rowPins[KP_ROWS] = {6, 7, 8}; +byte kp_colPins[KP_COLS] = {9, 10, 11, 12}; char kp_keys[KP_ROWS][KP_COLS] = { - {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}, - {13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}, - {25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36}, - {0, 0, 0, 37, 38, 39, 40, 41, 42, 0, 0, 0}}; + {1, 2, 3, 4}, + {5, 6, 7, 8}, + {9, 10, 11, 12}}; Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, KP_COLS); @@ -124,12 +165,14 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, /* Valid "Fn0 (hold) key" when using tap mode are: KEY_LEFT_SHIFT, KEY_RIGHT_SHIFT, KEY_LEFT_CTRL, KEY_RIGHT_CTRL, KEY_RIGHT_ALT, KEY_LEFT_GUI, KEY_RIGHT_GUI, KEY_FN1, KEY_FN2 * "Button ID" corresponding with the physical design of the actual keyboard. DO NOT CHANGE BTN ID! - ------------------------------------- ------------------------------------- - | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 1O | 11 | 12 | - | 13 | 14 | 15 | 16 | 17 | 18 | | 19 | 20 | 21 | 22 | 23 | 24 | - | 25 | 26 | 27 | 28 | 29 | 30 | | 31 | 32 | 33 | 34 | 35 | 36 | - ------------------| 37 | 38 | 39 | | 40 | 41 | 42 |------------------ - ------------------- ------------------- + + | 1 | | 4 | + --------------------------------------------- + | 5 | | | 2 | 3 | | | 8 | + | X1,Y1 | | 6 | 7 | | X3,Y3 | + | 9 | | 10 |Y1 offset| 11 | | 12 | + --------------------------------------------- + * "Fn0 hold key" is normal key in non tap mode. In tap mode this key is the hold key. * "Fn0 tap key" enables tap mode. * "Fn1 key" is the layer 1 key to use. Don NOT add KEY_FN1 or KEY_FN2 to this layer. @@ -141,49 +184,19 @@ Keypad kp_keypad = Keypad(makeKeymap(kp_keys), kp_rowPins, kp_colPins, KP_ROWS, // clang-format off Button buttons[NBR_OF_BUTTONS] = { -/* Btn ID Fn0 (hold) key Fn0 tap key Fn1 key Fn2 key Hold direct */ - {1, KEY_FN2, KEY_TAB, NO_KEY, NO_KEY, true, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {2, KEY_Q, NO_KEY, KEY_F1, KEY_F12, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {3, KEY_W, NO_KEY, KEY_F2, KEY_F13, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {4, KEY_E, NO_KEY, KEY_F3, KEY_F14, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {5, KEY_R, NO_KEY, KEY_F4, KEY_F15, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {6, KEY_T, NO_KEY, KEY_F5, KEY_F16, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {7, KEY_Y, NO_KEY, KEY_F6, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {8, KEY_U, NO_KEY, KEY_F7, KEY_M1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {9, KEY_I, NO_KEY, KEY_F8, KEY_M2, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {10, KEY_O, NO_KEY, KEY_F9, KEY_M3, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {11, KEY_P, NO_KEY, KEY_F10, KEY_MWU, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {12, 'å', NO_KEY, KEY_F11, KEY_CAPS_LOCK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {13, KEY_LEFT_CTRL, KEY_ESC, NO_KEY, NO_KEY, true, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {14, KEY_A, NO_KEY, KEY_1, KEY_MEDIA_PLAY_PAUSE, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {15, KEY_S, NO_KEY, KEY_2, KEY_MEDIA_NEXT_TRACK, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {16, KEY_D, NO_KEY, KEY_3, KEY_F17, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {17, KEY_F, NO_KEY, KEY_4, KEY_F18, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {18, KEY_G, NO_KEY, KEY_5, KEY_F19, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {19, KEY_H, NO_KEY, KEY_LEFT_ARROW, KEY_ML, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {20, KEY_J, NO_KEY, KEY_DOWN_ARROW, KEY_MD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {21, KEY_K, NO_KEY, KEY_UP_ARROW, KEY_MU, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {22, KEY_L, NO_KEY, KEY_RIGHT_ARROW, KEY_MR, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {23, 'ö', NO_KEY, KEY_DELETE, KEY_MWD, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {24, 'ä', NO_KEY, '§', KEY_ESC, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {25, KEY_LEFT_SHIFT, NO_KEY, KEY_LEFT_SHIFT, KEY_LEFT_SHIFT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {26, KEY_Z, NO_KEY, KEY_6, KEY_F20, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {27, KEY_X, NO_KEY, KEY_7, KEY_F21, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {28, KEY_C, NO_KEY, KEY_8, KEY_F22, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {29, KEY_V, NO_KEY, KEY_9, KEY_F23, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {30, KEY_B, NO_KEY, KEY_0, KEY_F24, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {31, KEY_N, NO_KEY, '<', KEY_HOME, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {32, KEY_M, NO_KEY, KEY_EQUAL, KEY_PAGE_DOWN, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {33, KEY_COMMA, NO_KEY, KEY_BACKSLASH, KEY_PAGE_UP, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {34, KEY_PERIOD, NO_KEY, KEY_RIGHT_BRACE, KEY_END, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {35, KEY_SLASH, NO_KEY, KEY_MINUS, KEY_INSERT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {36, KEY_RIGHT_SHIFT, NO_KEY, KEY_RIGHT_SHIFT, KEY_RIGHT_SHIFT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {37, KEY_LEFT_ALT, NO_KEY, KEY_LEFT_ALT, KEY_LEFT_ALT, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {38, KEY_SPACE, NO_KEY, KEY_SPACE, KEY_LEFT_GUI, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {39, KEY_FN1, NO_KEY, KEY_FN1, KEY_FN1, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {40, KEY_SPACE, NO_KEY, KEY_BACKSPACE, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {41, KEY_ENTER, NO_KEY, KEY_RIGHT_ALT, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}, - {42, KEY_LEFT_GUI, NO_KEY, KEY_LEFT_GUI, NO_KEY, false, IDLE, NO_KEY, false, 0, false, false, 0, 0, false}}; +/* Btn ID Fn0 (hold) key Fn1 key Fn2 key */ + {1, JOY_A7, JOY_A17, JOY_A27, IDLE, NO_KEY, false}, + {2, JOY_A1, JOY_A11, JOY_A21, IDLE, NO_KEY, false}, + {3, JOY_A2, JOY_A12, JOY_A22, IDLE, NO_KEY, false}, + {4, JOY_A9, JOY_A19, JOY_A29, IDLE, NO_KEY, false}, + {5, JOY_A8, JOY_A18, JOY_A28, IDLE, NO_KEY, false}, + {6, JOY_A3, JOY_A13, JOY_A23, IDLE, NO_KEY, false}, + {7, JOY_A4, JOY_A14, JOY_A24, IDLE, NO_KEY, false}, + {8, JOY_A10, JOY_A20, JOY_A30, IDLE, NO_KEY, false}, + {9, KEY_FN1, NO_KEY, NO_KEY, IDLE, NO_KEY, false}, + {10, JOY_A5, JOY_A15, JOY_A25, IDLE, NO_KEY, false}, + {11, JOY_A6, JOY_A16, JOY_A26, IDLE, NO_KEY, false}, + {12, KEY_FN2, NO_KEY, NO_KEY, IDLE, NO_KEY, false}}; // clang-format on /* End of keymap config ----------------------------------------------------------------------------------------------------------------------------- */ @@ -194,19 +207,375 @@ int status_led_mode = 0; unsigned long current_timestamp = 0; unsigned long button_timestamp = 0; -unsigned long mouse_wheel_timestamp = 0; unsigned long indicator_timestamp = 0; -bool mouse_l = false; -bool mouse_r = false; -bool mouse_u = false; -bool mouse_d = false; -int mouse_x = 0; -int mouse_y = 0; -int mouse_wheel = 0; - bool key_pressed = false; +int fn_mode = 0; + +// USB HID data variables +int xy_x1 = HID_AXIS_CENTER; +int xy_y1 = HID_AXIS_CENTER; +int xy_x2 = HID_AXIS_CENTER; +int xy_y2 = HID_AXIS_CENTER; +int xy_x3 = HID_AXIS_CENTER; +int xy_y3 = HID_AXIS_CENTER; + +enum EEPROM_ADR +{ + MAX_X1_ADR_HIGH, + MAX_X1_ADR_LOW, + MIN_X1_ADR_HIGH, + MIN_X1_ADR_LOW, + CNT_X1_ADR_HIGH, + CNT_X1_ADR_LOW, + MAX_Y1_ADR_HIGH, + MAX_Y1_ADR_LOW, + MIN_Y1_ADR_HIGH, + MIN_Y1_ADR_LOW, + CNT_Y1_ADR_HIGH, + CNT_Y1_ADR_LOW, + MAX_X2_ADR_HIGH, + MAX_X2_ADR_LOW, + MIN_X2_ADR_HIGH, + MIN_X2_ADR_LOW, + CNT_X2_ADR_HIGH, + CNT_X2_ADR_LOW, + MAX_Y2_ADR_HIGH, + MAX_Y2_ADR_LOW, + MIN_Y2_ADR_HIGH, + MIN_Y2_ADR_LOW, + CNT_Y2_ADR_HIGH, + CNT_Y2_ADR_LOW, + MAX_X3_ADR_HIGH, + MAX_X3_ADR_LOW, + MIN_X3_ADR_HIGH, + MIN_X3_ADR_LOW, + CNT_X3_ADR_HIGH, + CNT_X3_ADR_LOW, + EEPROM_ADR_NBR_OF_BYTES +}; + +int joystick_counter = 0; +int joystick_x1 = 0; +int joystick_x1_raw = 0; +int joystick_x1_max = 4096; +int joystick_x1_min = 0; +int joystick_x1_center = joystick_x1_max/2; +int joystick_y1 = 0; +int joystick_y1_raw = 0; +int joystick_y1_max = 4096; +int joystick_y1_min = 0; +int joystick_y1_center = joystick_y1_max/2; +int joystick_x2 = 0; +int joystick_x2_raw = 0; +int joystick_x2_max = 4096; +int joystick_x2_min = 0; +int joystick_x2_center = joystick_x2_max/2; +int joystick_y2 = 0; +int joystick_y2_raw = 0; +int joystick_y2_max = 4096; +int joystick_y2_min = 0; +int joystick_y2_center = joystick_y2_max/2; +int joystick_x3 = 0; +int joystick_x3_raw = 0; +int joystick_x3_max = 4096; +int joystick_x3_min = 0; +int joystick_x3_center = joystick_x3_max/2; + +float exp_constant = 0.2; + +#define CALIBRATION_OFF 0 +#define CALIBRATION_CENTER 1 +#define CALIBRATION_MINMAX 2 +int joystick_calibration_mode = 0; + +void save_to_eeprom(){ + EEPROM.write(MAX_X1_ADR_LOW, joystick_x1_max); + EEPROM.write(MAX_X1_ADR_HIGH, joystick_x1_max >> 8); + EEPROM.write(MIN_X1_ADR_LOW, joystick_x1_min); + EEPROM.write(MIN_X1_ADR_HIGH, joystick_x1_min >> 8); + EEPROM.write(CNT_X1_ADR_LOW, joystick_x1_center); + EEPROM.write(CNT_X1_ADR_HIGH, joystick_x1_center >> 8); + + EEPROM.write(MAX_Y1_ADR_LOW, joystick_y1_max); + EEPROM.write(MAX_Y1_ADR_HIGH, joystick_y1_max >> 8); + EEPROM.write(MIN_Y1_ADR_LOW, joystick_y1_min); + EEPROM.write(MIN_Y1_ADR_HIGH, joystick_y1_min >> 8); + EEPROM.write(CNT_Y1_ADR_LOW, joystick_y1_center); + EEPROM.write(CNT_Y1_ADR_HIGH, joystick_y1_center >> 8); + + EEPROM.write(MAX_X2_ADR_LOW, joystick_x2_max); + EEPROM.write(MAX_X2_ADR_HIGH, joystick_x2_max >> 8); + EEPROM.write(MIN_X2_ADR_LOW, joystick_x2_min); + EEPROM.write(MIN_X2_ADR_HIGH, joystick_x2_min >> 8); + EEPROM.write(CNT_X2_ADR_LOW, joystick_x2_center); + EEPROM.write(CNT_X2_ADR_HIGH, joystick_x2_center >> 8); + + EEPROM.write(MAX_Y2_ADR_LOW, joystick_y2_max); + EEPROM.write(MAX_Y2_ADR_HIGH, joystick_y2_max >> 8); + EEPROM.write(MIN_Y2_ADR_LOW, joystick_y2_min); + EEPROM.write(MIN_Y2_ADR_HIGH, joystick_y2_min >> 8); + EEPROM.write(CNT_Y2_ADR_LOW, joystick_y2_center); + EEPROM.write(CNT_Y2_ADR_HIGH, joystick_y2_center >> 8); + + EEPROM.write(MAX_X3_ADR_LOW, joystick_x3_max); + EEPROM.write(MAX_X3_ADR_HIGH, joystick_x3_max >> 8); + EEPROM.write(MIN_X3_ADR_LOW, joystick_x3_min); + EEPROM.write(MIN_X3_ADR_HIGH, joystick_x3_min >> 8); + EEPROM.write(CNT_X3_ADR_LOW, joystick_x3_center); + EEPROM.write(CNT_X3_ADR_HIGH, joystick_x3_center >> 8); + +} + +void load_from_eeprom(){ + joystick_x1_max = (EEPROM.read(MAX_X1_ADR_HIGH) << 8); + joystick_x1_max |= EEPROM.read(MAX_X1_ADR_LOW); + joystick_x1_min = (EEPROM.read(MIN_X1_ADR_HIGH) << 8); + joystick_x1_min |= EEPROM.read(MIN_X1_ADR_LOW); + joystick_x1_center = (EEPROM.read(CNT_X1_ADR_HIGH) << 8); + joystick_x1_center |= EEPROM.read(CNT_X1_ADR_LOW); + + joystick_y1_max = (EEPROM.read(MAX_Y1_ADR_HIGH) << 8); + joystick_y1_max |= EEPROM.read(MAX_Y1_ADR_LOW); + joystick_y1_min = (EEPROM.read(MIN_Y1_ADR_HIGH) << 8); + joystick_y1_min |= EEPROM.read(MIN_Y1_ADR_LOW); + joystick_y1_center = (EEPROM.read(CNT_Y1_ADR_HIGH) << 8); + joystick_y1_center |= EEPROM.read(CNT_Y1_ADR_LOW); + + joystick_x2_max = (EEPROM.read(MAX_X2_ADR_HIGH) << 8); + joystick_x2_max |= EEPROM.read(MAX_X2_ADR_LOW); + joystick_x2_min = (EEPROM.read(MIN_X2_ADR_HIGH) << 8); + joystick_x2_min |= EEPROM.read(MIN_X2_ADR_LOW); + joystick_x2_center = (EEPROM.read(CNT_X2_ADR_HIGH) << 8); + joystick_x2_center |= EEPROM.read(CNT_X2_ADR_LOW); + + joystick_y2_max = (EEPROM.read(MAX_Y2_ADR_HIGH) << 8); + joystick_y2_max |= EEPROM.read(MAX_Y2_ADR_LOW); + joystick_y2_min = (EEPROM.read(MIN_Y2_ADR_HIGH) << 8); + joystick_y2_min |= EEPROM.read(MIN_Y2_ADR_LOW); + joystick_y2_center = (EEPROM.read(CNT_Y2_ADR_HIGH) << 8); + joystick_y2_center |= EEPROM.read(CNT_Y2_ADR_LOW); + + joystick_x3_max = (EEPROM.read(MAX_X3_ADR_HIGH) << 8); + joystick_x3_max |= EEPROM.read(MAX_X3_ADR_LOW); + joystick_x3_min = (EEPROM.read(MIN_X3_ADR_HIGH) << 8); + joystick_x3_min |= EEPROM.read(MIN_X3_ADR_LOW); + joystick_x3_center = (EEPROM.read(CNT_X3_ADR_HIGH) << 8); + joystick_x3_center |= EEPROM.read(CNT_X2_ADR_LOW); + +} + +void update_analog(){ + + if(joystick_counter == 0){ + joystick_x1_raw = analogRead(0); + joystick_counter++; + } + else if(joystick_counter == 1){ + joystick_y1_raw = analogRead(1); + joystick_counter++; + } + else if(joystick_counter == 2){ + joystick_x2_raw = analogRead(2); + joystick_counter++; + } + else if(joystick_counter == 3){ + joystick_y2_raw = analogRead(3); + joystick_counter++; + } + else if(joystick_counter == 4){ + joystick_x3_raw = analogRead(4); + joystick_counter = 0; + + if (joystick_calibration_mode == CALIBRATION_OFF){ + + // ---------------------------------------------------------- + // Map X1 joystick values to proper HID values + // ---------------------------------------------------------- + if(joystick_x1_raw > (joystick_x1_center + DEADZONE_X)){ + joystick_x1 = constrain(map(joystick_x1_raw, (joystick_x1_center + DEADZONE_X), joystick_x1_max, AXIS_CENTER, AXIS_MAX), AXIS_CENTER, AXIS_MAX); + } + else if(joystick_x1_raw < (joystick_x1_center - DEADZONE_X)){ + joystick_x1 = constrain(map(joystick_x1_raw, joystick_x1_min, (joystick_x1_center - DEADZONE_X), AXIS_MIN, AXIS_CENTER), AXIS_MIN, AXIS_CENTER); + } + else{ + joystick_x1 = AXIS_CENTER; + } + // ---------------------------------------------------------- + // Map Y1 joystick values to proper HID values + // ---------------------------------------------------------- + if(joystick_y1_raw > (joystick_y1_center + DEADZONE_Y)){ + joystick_y1 = constrain(map(joystick_y1_raw, (joystick_y1_center + DEADZONE_Y), joystick_y1_max, AXIS_CENTER, AXIS_MAX), AXIS_CENTER, AXIS_MAX); + } + else if(joystick_y1_raw < (joystick_y1_center - DEADZONE_Y)){ + joystick_y1 = constrain(map(joystick_y1_raw, joystick_y1_min, (joystick_y1_center - DEADZONE_Y), AXIS_MIN, AXIS_CENTER), AXIS_MIN, AXIS_CENTER); + } + else{ + joystick_y1 = AXIS_CENTER; + } + + // ---------------------------------------------------------- + // Map X2 joystick values to proper HID values + // ---------------------------------------------------------- + if(joystick_x2_raw > (joystick_x2_center + DEADZONE_X)){ + joystick_x2 = constrain(map(joystick_x2_raw, (joystick_x2_center + DEADZONE_X), joystick_x2_max, AXIS_CENTER, AXIS_MAX), AXIS_CENTER, AXIS_MAX); + } + else if(joystick_x2_raw < (joystick_x2_center - DEADZONE_X)){ + joystick_x2 = constrain(map(joystick_x2_raw, joystick_x2_min, (joystick_x2_center - DEADZONE_X), AXIS_MIN, AXIS_CENTER), AXIS_MIN, AXIS_CENTER); + } + else{ + joystick_x2 = AXIS_CENTER; + } + // ---------------------------------------------------------- + // Map Y1 joystick values to proper HID values + // ---------------------------------------------------------- + if(joystick_y2_raw > (joystick_y2_center + DEADZONE_Y)){ + joystick_y2 = constrain(map(joystick_y2_raw, (joystick_y2_center + DEADZONE_Y), joystick_y2_max, AXIS_CENTER, AXIS_MAX), AXIS_CENTER, AXIS_MAX); + } + else if(joystick_y2_raw < (joystick_y2_center - DEADZONE_Y)){ + joystick_y2 = constrain(map(joystick_y2_raw, joystick_y2_min, (joystick_y2_center - DEADZONE_Y), AXIS_MIN, AXIS_CENTER), AXIS_MIN, AXIS_CENTER); + } + else{ + joystick_y2 = AXIS_CENTER; + } + + // ---------------------------------------------------------- + // Map X3 joystick values to proper HID values + // ---------------------------------------------------------- + if(joystick_x3_raw > (joystick_x3_center + DEADZONE_X)){ + joystick_x3 = constrain(map(joystick_x3_raw, (joystick_x3_center + DEADZONE_X), joystick_x3_max, AXIS_CENTER, AXIS_MAX), AXIS_CENTER, AXIS_MAX); + } + else if(joystick_x3_raw < (joystick_x3_center - DEADZONE_X)){ + joystick_x3 = constrain(map(joystick_x3_raw, joystick_x3_min, (joystick_x3_center - DEADZONE_X), AXIS_MIN, AXIS_CENTER), AXIS_MIN, AXIS_CENTER); + } + else{ + joystick_x3 = AXIS_CENTER; + } + + // ---------------------------------------------------------- + // Calculate new axis values after applying exp curve + // ---------------------------------------------------------- + // Normal mode + exp_constant = 0.2; + + if (joystick_x1 != AXIS_CENTER){ + float joystick_x_float = joystick_x1 / float(AXIS_MAX); + float joystick_x_exp = exp_constant * (0.5 + 256 * pow((joystick_x_float - 0.5),9)) + (1 - exp_constant) * joystick_x_float; + joystick_x1 = int(joystick_x_exp * float(HID_AXIS_MAX)); + joystick_x1 = constrain(joystick_x1, HID_AXIS_MIN, HID_AXIS_MAX); + } + else{ + joystick_x1 = HID_AXIS_CENTER; + } + if (joystick_y1 != AXIS_CENTER){ + float joystick_y_float = joystick_y1 / float(AXIS_MAX); + float joystick_y_exp = exp_constant * (0.5 + 256 * pow((joystick_y_float - 0.5),9)) + (1 - exp_constant) * joystick_y_float; + joystick_y1 = int(joystick_y_exp * float(HID_AXIS_MAX)); + joystick_y1 = constrain(joystick_y1, HID_AXIS_MIN, HID_AXIS_MAX); + } + else{ + joystick_y1 = HID_AXIS_CENTER; + } + + if (joystick_x2 != AXIS_CENTER){ + float joystick_x_float = joystick_x2 / float(AXIS_MAX); + float joystick_x_exp = exp_constant * (0.5 + 256 * pow((joystick_x_float - 0.5),9)) + (1 - exp_constant) * joystick_x_float; + joystick_x2 = int(joystick_x_exp * float(HID_AXIS_MAX)); + joystick_x2 = constrain(joystick_x2, HID_AXIS_MIN, HID_AXIS_MAX); + } + else{ + joystick_x2 = HID_AXIS_CENTER; + } + if (joystick_y2 != AXIS_CENTER){ + float joystick_y_float = joystick_y2 / float(AXIS_MAX); + float joystick_y_exp = exp_constant * (0.5 + 256 * pow((joystick_y_float - 0.5),9)) + (1 - exp_constant) * joystick_y_float; + joystick_y2 = int(joystick_y_exp * float(HID_AXIS_MAX)); + joystick_y2 = constrain(joystick_y2, HID_AXIS_MIN, HID_AXIS_MAX); + } + else{ + joystick_y2 = HID_AXIS_CENTER; + } + + if (joystick_x3 != AXIS_CENTER){ + float joystick_x_float = joystick_x3 / float(AXIS_MAX); + float joystick_x_exp = exp_constant * (0.5 + 256 * pow((joystick_x_float - 0.5),9)) + (1 - exp_constant) * joystick_x_float; + joystick_x3 = int(joystick_x_exp * float(HID_AXIS_MAX)); + joystick_x3 = constrain(joystick_x3, HID_AXIS_MIN, HID_AXIS_MAX); + } + else{ + joystick_x3 = HID_AXIS_CENTER; + } + } + else{ + + // ---------------------------------------------------------- + // Calibration mode. + // ---------------------------------------------------------- + joystick_x1 = HID_AXIS_CENTER; + joystick_x1 = HID_AXIS_CENTER; + joystick_x2 = HID_AXIS_CENTER; + joystick_y2 = HID_AXIS_CENTER; + joystick_x3 = HID_AXIS_CENTER; + + if (joystick_calibration_mode == CALIBRATION_CENTER){ + joystick_x1_center = joystick_x1_raw; + joystick_y1_center = joystick_y1_raw; + joystick_x1_max = joystick_x1_center; + joystick_x1_min = joystick_x1_center; + joystick_y1_max = joystick_y1_center; + joystick_y1_min = joystick_y1_center; + + joystick_x2_center = joystick_x2_raw; + joystick_y2_center = joystick_y2_raw; + joystick_x2_max = joystick_x2_center; + joystick_x2_min = joystick_x2_center; + joystick_y2_max = joystick_y2_center; + joystick_y2_min = joystick_y2_center; + + joystick_x3_center = joystick_x3_raw; + joystick_x3_max = joystick_x3_center; + joystick_x3_min = joystick_x3_center; + } + else if (joystick_calibration_mode == CALIBRATION_MINMAX){ + if(joystick_x1_raw > joystick_x1_max){ + joystick_x1_max = joystick_x1_raw; + } + if(joystick_x1_raw < joystick_x1_min){ + joystick_x1_min = joystick_x1_raw; + } + if(joystick_y1_raw > joystick_y1_max){ + joystick_y1_max = joystick_y1_raw; + } + if(joystick_y1_raw < joystick_y1_min){ + joystick_y1_min = joystick_y1_raw; + } + + if(joystick_x2_raw > joystick_x2_max){ + joystick_x2_max = joystick_x2_raw; + } + if(joystick_x2_raw < joystick_x2_min){ + joystick_x2_min = joystick_x2_raw; + } + if(joystick_y2_raw > joystick_y2_max){ + joystick_y2_max = joystick_y2_raw; + } + if(joystick_y2_raw < joystick_y2_min){ + joystick_y2_min = joystick_y2_raw; + } + + if(joystick_x3_raw > joystick_x3_max){ + joystick_x3_max = joystick_x3_raw; + } + if(joystick_x3_raw < joystick_x3_min){ + joystick_x3_min = joystick_x3_raw; + } + } + } + } +} + + /** Perform key action. @@ -222,92 +591,21 @@ bool set_key(uint16_t keycode, uint8_t kstate) return false; } - /* Mouse buttons (HID mouse) */ - if (keycode >= KEY_M1 && keycode <= KEY_M3) - { - if (kstate == RELEASED) - { - Mouse.release(1 << (((keycode - KEY_OFFSET) - (KEY_M1 - KEY_OFFSET)))); - } - else if (kstate == PRESSED) - { - Mouse.press(1 << (((keycode - KEY_OFFSET) - (KEY_M1 - KEY_OFFSET)))); + /* Joystick buttons */ + else if (keycode >= JOY_A1 && keycode <= JOY_A32) { + if (kstate == RELEASED) { + Joystick.button(keycode-KEY_OFFSET, false); + } else if (kstate == PRESSED) { + Joystick.button(keycode-KEY_OFFSET, true); } } - /* Mouse wheel (HID mouse) */ - else if ((keycode == KEY_MWU || keycode == KEY_MWD)) - { - if (kstate == RELEASED) - { - mouse_wheel = 0; - } - else if (kstate == PRESSED) - { - if (keycode == KEY_MWU) - { - mouse_wheel = 1; - } - else - { - mouse_wheel = -1; - } - } - } - - /* Mouse X/Y (HID mouse) */ - else if ((keycode == KEY_MU || keycode == KEY_MD || keycode == KEY_ML || keycode == KEY_MR)) - { - if (kstate == RELEASED) - { - if (keycode == KEY_ML) - { - mouse_l = false; - } - if (keycode == KEY_MR) - { - mouse_r = false; - } - if (keycode == KEY_MU) - { - mouse_u = false; - } - if (keycode == KEY_MD) - { - mouse_d = false; - } - } - else if (kstate == PRESSED) - { - if (keycode == KEY_MU) - { - mouse_u = true; - } - else if (keycode == KEY_MD) - { - mouse_d = true; - } - else if (keycode == KEY_MR) - { - mouse_r = true; - } - else if (keycode == KEY_ML) - { - mouse_l = true; - } - } - } - - /* Normal keyboard keys (HID keyboard) */ - else - { - if (kstate == RELEASED) - { - Keyboard.release(keycode); - } - else if (kstate == PRESSED) - { - Keyboard.press(keycode); + /* Joystick hat */ + else if (keycode >= JOY_AHU1 && keycode <= JOY_AHL1) { + if (kstate == RELEASED) { + Joystick.hat(-1); + } else if (kstate == PRESSED) { + Joystick.hat(((keycode-KEY_OFFSET)-(JOY_AHU1-KEY_OFFSET)) * 90); } } @@ -325,7 +623,7 @@ void scan_buttons() if (kp_keypad.getKeys()) { - /* Enter bootloader if all four corner-buttons is pressed together */ + /* Enter bootloader if all reboot-buttons is pressed together */ int reboot = 0; for (int i = 0; i < LIST_MAX; i++) { @@ -333,15 +631,15 @@ void scan_buttons() { reboot += 1; } - if ((kp_keypad.key[i].kchar == 25) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + if ((kp_keypad.key[i].kchar == 4) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) { reboot += 1; } - if ((kp_keypad.key[i].kchar == 12) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + if ((kp_keypad.key[i].kchar == 10) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) { reboot += 1; } - if ((kp_keypad.key[i].kchar == 36) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + if ((kp_keypad.key[i].kchar == 11) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) { reboot += 1; } @@ -351,8 +649,34 @@ void scan_buttons() _reboot_Teensyduino_(); } - /* Check for FN mode */ - int fn_mode = 0; + /* Enter calibration mode if all calibration-buttons is pressed together */ + int calibrate = 0; + for (int i = 0; i < LIST_MAX; i++) + { + if ((kp_keypad.key[i].kchar == 2) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + { + calibrate += 1; + } + if ((kp_keypad.key[i].kchar == 3) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + { + calibrate += 1; + } + if ((kp_keypad.key[i].kchar == 10) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + { + calibrate += 1; + } + if ((kp_keypad.key[i].kchar == 11) && (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD)) + { + calibrate += 1; + } + } + if (calibrate == 4) + { + joystick_calibration_mode = CALIBRATION_CENTER; + } + + /* Check for Fn mode */ + fn_mode = 0; for (int i = 0; i < LIST_MAX; i++) { if (kp_keypad.key[i].kstate == PRESSED || kp_keypad.key[i].kstate == HOLD) @@ -364,12 +688,7 @@ void scan_buttons() /* Check if FN1 key are defined to this button (Layer 0 and first position in combo array)*/ if (buttons[j].keycode == KEY_FN1) { - fn_mode = 1; - } - /* Check if FN2 key are defined to this button (Layer 0 and first position in combo array)*/ - else if (buttons[j].keycode == KEY_FN2) - { - fn_mode = 2; + fn_mode++; } break; } @@ -386,26 +705,6 @@ void scan_buttons() { if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && kp_keypad.key[i].stateChanged == true) { - /* Tap state: - 0 = idle (not pressed for a while) - 1 = pressed - 2 = released within timeout, pressing tap key - 3 = pressed again within timeout, holding tap key */ - if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 0) - { - buttons[j].tap_timeout_timestamp = current_timestamp + TAP_TIMEOUT; - buttons[j].tap_timeout_enable = true; - buttons[j].tap_release_timestamp = current_timestamp + TAP_TIMEOUT + 10; - buttons[j].tap_release_enable = true; - buttons[j].tap_state = 1; - } - else if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 2) - { - buttons[j].tap_timeout_enable = false; - buttons[j].tap_release_enable = false; - buttons[j].tap_state = 3; - } - buttons[j].run_keycode = true; buttons[j].kstate = PRESSED; break; @@ -418,21 +717,6 @@ void scan_buttons() { if (buttons[j].keypad_kchar == kp_keypad.key[i].kchar && kp_keypad.key[i].stateChanged == true) { - /* Tap state: - 0 = idle (not pressed for a while) - 1 = pressed - 2 = released within timeout, pressing tap key - 3 = pressed again within timeout, holding tap key */ - if (buttons[j].tap_keycode != NO_KEY && buttons[j].tap_state == 1) - { - buttons[j].tap_release_timestamp = current_timestamp + TAP_TIMEOUT + 10; - buttons[j].tap_release_enable = true; - buttons[j].tap_state = 2; - } - else - { - buttons[j].tap_state = 0; - } buttons[j].run_keycode = true; buttons[j].kstate = RELEASED; break; @@ -441,6 +725,7 @@ void scan_buttons() } } + /* Check if any "non tap keys" has been pressed */ for (int i = 0; i < NBR_OF_BUTTONS; i++) { @@ -465,87 +750,32 @@ void scan_buttons() /* Check if key pressed or released */ if (buttons[i].kstate == PRESSED) { - /* Check if key is in tap mode */ - if (buttons[i].tap_keycode != NO_KEY) + if (fn_mode == 0) { - /* Key is in tap mode. Perform action dependant on tap state*/ - if (buttons[i].tap_state == 1) - { - if (buttons[i].hold_direct == true) - { - /* Press hold key if "hold direct" is enabled (tap state = 1) */ - set_key(buttons[i].keycode, PRESSED); - } - - /* Reset tap inhibit flag */ - buttons[i].tap_inhibit = false; - } + set_key(buttons[i].keycode, PRESSED); + buttons[i].last_keycode = buttons[i].keycode; } - else + else if (fn_mode == 1) { - if (fn_mode == 1) - { - set_key(buttons[i].fn1_keycode, PRESSED); - buttons[i].last_keycode = buttons[i].fn1_keycode; - } - else if (fn_mode == 2) - { - set_key(buttons[i].fn2_keycode, PRESSED); - buttons[i].last_keycode = buttons[i].fn2_keycode; - } - else - { - set_key(buttons[i].keycode, PRESSED); - buttons[i].last_keycode = buttons[i].keycode; - } + set_key(buttons[i].fn1_keycode, PRESSED); + buttons[i].last_keycode = buttons[i].fn1_keycode; + } + else if (fn_mode == 2) + { + set_key(buttons[i].fn2_keycode, PRESSED); + buttons[i].last_keycode = buttons[i].fn2_keycode; } } else if (buttons[i].kstate == RELEASED) { - /* Check if key is in tap mode */ - if (buttons[i].tap_keycode != NO_KEY) - { - /* Key is in tap mode. Perform action dependant on tap state*/ - if (buttons[i].tap_state == 2) - { - /* Press tap key if no other keys are pressed (tap state = 2) */ - set_key(buttons[i].tap_keycode, RELEASED); // Fix for not send press and hold for the tap key - set_key(buttons[i].keycode, RELEASED); - if (buttons[i].tap_inhibit == false) - { - set_key(buttons[i].tap_keycode, PRESSED); - } - } - else - { - /* Release all keys (tap state = 0,1,3) */ - set_key(buttons[i].keycode, RELEASED); - set_key(buttons[i].tap_keycode, RELEASED); - buttons[i].tap_state = 0; - } - } - else - { - /* Sending release command for last keycode related to this button */ - set_key(buttons[i].last_keycode, RELEASED); - } + /* Sending release command for last keycode related to this button */ + set_key(buttons[i].last_keycode, RELEASED); } /* Reset run_keycode flag */ buttons[i].run_keycode = false; } } - } - - /* Set status indication */ - if (keyboard_leds & (1 << USB_LED_CAPS_LOCK)) - { - /* 2 = blinking (CapsLock) */ - status_led_mode = 2; - } - else - { - /* 0 = off (normal) */ - status_led_mode = 0; + } } @@ -554,6 +784,15 @@ void setup() /* Init HW */ pinMode(STATUS_LED, OUTPUT); digitalWrite(STATUS_LED, LOW); + + // Set ADC resolution to 12bit + analogReadResolution(12); + analogReadAveraging(32); + delay(500); + + // Init Joystick + Joystick.useManualSend(true); + } void loop() @@ -564,87 +803,35 @@ void loop() /* Scan buttons 1ms */ if (current_timestamp >= button_timestamp) { - button_timestamp = current_timestamp + 1; - scan_buttons(); - } - - /* Fn tap timeout TAP_TIMEOUT */ - for (int i = 0; i < NBR_OF_BUTTONS; i++) - { - if (current_timestamp >= buttons[i].tap_timeout_timestamp && buttons[i].tap_timeout_enable) - { - if (buttons[i].tap_state == 1) - { - if (buttons[i].hold_direct == false) - { - set_key(buttons[i].keycode, PRESSED); - } - buttons[i].tap_state = 0; - } - else if (buttons[i].tap_state == 2) - { - buttons[i].tap_state = 0; - } - buttons[i].tap_timeout_enable = false; + button_timestamp = current_timestamp + 100; + update_analog(); + //scan_buttons(); + + // ---------------------------------------------------------- + // Update joystick axis data + // ---------------------------------------------------------- + Joystick.X(joystick_x1); + Joystick.Y(joystick_y1); + + if (fn_mode == 2){ + Joystick.Z(HID_AXIS_CENTER); + Joystick.Zrotate(HID_AXIS_CENTER); + Joystick.sliderLeft(joystick_x2); + Joystick.sliderRight(joystick_y2); } - } - - /* Fn tap release TAP_TIMEOUT + 10ms */ - for (int i = 0; i < NBR_OF_BUTTONS; i++) - { - if (current_timestamp >= buttons[i].tap_release_timestamp && buttons[i].tap_release_enable) - { - set_key(buttons[i].tap_keycode, RELEASED); - buttons[i].tap_release_enable = false; - buttons[i].tap_state = 0; + else if (fn_mode == 1){ + Joystick.Z(HID_AXIS_CENTER); + Joystick.Zrotate(joystick_y2); + Joystick.sliderLeft(joystick_x2); + Joystick.sliderRight(HID_AXIS_CENTER); } - } - - /* Update mouse 20ms */ - if (current_timestamp >= mouse_wheel_timestamp && (mouse_wheel != 0 || mouse_x != 0 || mouse_y != 0 || mouse_d == true || mouse_l == true || mouse_r == true || mouse_u == true)) - { - /* Stop movement when no buttons are pressed */ - if (mouse_d == false && mouse_u == false) - { - mouse_y = 0; + else{ + Joystick.Z(joystick_x2); + Joystick.Zrotate(joystick_y2); + Joystick.sliderLeft(joystick_x3); + Joystick.sliderRight(joystick_x3); } - if (mouse_l == false && mouse_r == false) - { - mouse_x = 0; - } - - /* Stop movement when both up/down or left/right are pressed */ - if (mouse_d == true && mouse_u == true) - { - mouse_y = 0; - } - if (mouse_l == true && mouse_r == true) - { - mouse_x = 0; - } - - /* Move mouse cursor/wheel */ - Mouse.move(mouse_x, mouse_y, mouse_wheel); - - /* Add mouse acceleration for next movement */ - if (mouse_r == true && mouse_x < 50) - { - mouse_x++; - } - if (mouse_l == true && mouse_x > -50) - { - mouse_x--; - } - if (mouse_d == true && mouse_y < 50) - { - mouse_y++; - } - if (mouse_u == true && mouse_y > -50) - { - mouse_y--; - } - - mouse_wheel_timestamp = current_timestamp + 20; + Joystick.send_now(); } /* Update indicator 200ms */ diff --git a/mCAD/cmdr-joystick.FCStd b/mCAD/cmdr-joystick.FCStd index c1d3ca4..e22ac0b 100644 Binary files a/mCAD/cmdr-joystick.FCStd and b/mCAD/cmdr-joystick.FCStd differ diff --git a/mCAD/cmdr-joystick.FCStd1 b/mCAD/cmdr-joystick.FCStd1 index ac3fa37..1d1074f 100644 Binary files a/mCAD/cmdr-joystick.FCStd1 and b/mCAD/cmdr-joystick.FCStd1 differ