diff --git a/firmware/.gitignore b/teensylc/.gitignore similarity index 100% rename from firmware/.gitignore rename to teensylc/.gitignore diff --git a/firmware/.gitkeep b/teensylc/.gitkeep similarity index 100% rename from firmware/.gitkeep rename to teensylc/.gitkeep diff --git a/firmware/Makefile b/teensylc/Makefile similarity index 100% rename from firmware/Makefile rename to teensylc/Makefile diff --git a/firmware/extra_script.py b/teensylc/extra_script.py similarity index 100% rename from firmware/extra_script.py rename to teensylc/extra_script.py diff --git a/firmware/include/.gitkeep b/teensylc/include/.gitkeep similarity index 100% rename from firmware/include/.gitkeep rename to teensylc/include/.gitkeep diff --git a/firmware/lib/.gitkeep b/teensylc/lib/.gitkeep similarity index 100% rename from firmware/lib/.gitkeep rename to teensylc/lib/.gitkeep diff --git a/firmware/lib/teensy-libc b/teensylc/lib/teensy-libc similarity index 100% rename from firmware/lib/teensy-libc rename to teensylc/lib/teensy-libc diff --git a/firmware/platformio.ini b/teensylc/platformio.ini similarity index 100% rename from firmware/platformio.ini rename to teensylc/platformio.ini diff --git a/firmware/src/cmdr_joystick.cpp b/teensylc/src/cmdr_joystick.cpp similarity index 87% rename from firmware/src/cmdr_joystick.cpp rename to teensylc/src/cmdr_joystick.cpp index 20ca156..16de500 100644 --- a/firmware/src/cmdr_joystick.cpp +++ b/teensylc/src/cmdr_joystick.cpp @@ -279,23 +279,10 @@ void send_usb_data() { Joystick.Zrotate(joystick_x1_10bit); Joystick.Z(joystick_y1_10bit); - - if (fn_mode == 2) { - Joystick.X(AXIS_10BIT_CENTER); - Joystick.Y(AXIS_10BIT_CENTER); - Joystick.sliderRight(joystick_x2_10bit); - Joystick.sliderLeft(joystick_y2_10bit); - } else if (fn_mode == 1) { - Joystick.X(AXIS_10BIT_CENTER); - Joystick.Y(joystick_y2_10bit); - Joystick.sliderRight(joystick_x2_10bit); - Joystick.sliderLeft(AXIS_10BIT_CENTER); - } else { - Joystick.X(joystick_x2_10bit); - Joystick.Y(joystick_y2_10bit); - Joystick.sliderRight(AXIS_10BIT_CENTER); - Joystick.sliderLeft(AXIS_10BIT_CENTER); - } + Joystick.X(joystick_x2_10bit); + Joystick.Y(joystick_y2_10bit); + Joystick.sliderRight(AXIS_10BIT_CENTER); + Joystick.sliderLeft(AXIS_10BIT_CENTER); // Set USB digital channels for (int i = 1; i < 32; i++) { @@ -304,29 +291,14 @@ void send_usb_data() { Joystick.hat(JOYSTICK_HAT_CENTER); - if (fn_mode == 2) { - if (digitalRead(BUTTON_TOP_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(12, 1); - if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(13, 1); - if (digitalRead(BUTTON_TOP_LEFT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(14, 1); - if (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(15, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(16, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(17, 1); - } else if (fn_mode == 1) { - if (digitalRead(BUTTON_TOP_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(8, 1); - if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(9, 1); - if (digitalRead(BUTTON_TOP_LEFT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(10, 1); - if (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(11, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(1, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(2, 1); - } else { - if (digitalRead(BUTTON_FRONT_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(3, 1); - if (digitalRead(BUTTON_TOP_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(4, 1); - if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(5, 1); - if (digitalRead(BUTTON_TOP_LEFT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(6, 1); - if (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(7, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(1, 1); - if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(2, 1); - } + if (digitalRead(BUTTON_FRONT_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(3, 1); + if (digitalRead(BUTTON_FRONT_LEFT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(8, 1); + if (digitalRead(BUTTON_TOP_LEFT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(4, 1); + if (digitalRead(BUTTON_TOP_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(5, 1); + if (digitalRead(BUTTON_TOP_LEFT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(6, 1); + if (digitalRead(BUTTON_TOP_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(7, 1); + if (digitalRead(BUTTON_FRONT_RIGHT_UPPER_PIN) == BUTTON_PRESSED) Joystick.button(1, 1); + if (digitalRead(BUTTON_FRONT_RIGHT_LOWER_PIN) == BUTTON_PRESSED) Joystick.button(2, 1); Joystick.send_now(); } @@ -397,15 +369,6 @@ void process_input_data() { joystick_y2_12bit = apply_calibration_12bit(analog_y2_gimbal_value, joystick_y2_12bit_min, joystick_y2_12bit_max, joystick_y2_12bit_center, DEADZONE_Y, exp_constant); - // Check fn mode - fn_mode = 0; - if (digitalRead(BUTTON_FRONT_LEFT_LOWER_PIN) == BUTTON_PRESSED) { - fn_mode = 1; - if (digitalRead(BUTTON_FRONT_LEFT_UPPER_PIN) == BUTTON_PRESSED) { - fn_mode = 2; - } - } - // Check toggle mode buttons if (digitalRead(BUTTON_FRONT_LEFT_UPPER_PIN) == BUTTON_PRESSED) { toggle_button_mode = true;