diff --git a/CHANGELOG.md b/CHANGELOG.md index f96c3d89..361cba37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed the "PLATFORM_PC_DEBUG" option. - Instead, "pc_debug" still exists, but internally uses "custom" platform. - Allowlist: rename `uni_bt_allowlist_allow_addr()` to `uni_bt_allowlist_is_allowed_addr()` +- Folder organization: + - bt/: includes all the Bluetooth related files + - platform/: includes all the platform files + - parser:/ includes all the parser files + - Added file, easier for 3rd party user. Just include that file, and + and don't worry about internal folder re-organization. ## [3.10.1] - 2023-11-05 ### New diff --git a/examples/esp32/main/main.c b/examples/esp32/main/main.c index 4f8ed9b4..0f926baa 100644 --- a/examples/esp32/main/main.c +++ b/examples/esp32/main/main.c @@ -5,10 +5,9 @@ #include #include +#include #include "sdkconfig.h" -#include "uni_init.h" -#include "uni_platform.h" // Sanity check #ifndef CONFIG_BLUEPAD32_PLATFORM_CUSTOM diff --git a/examples/esp32/main/my_platform.c b/examples/esp32/main/my_platform.c index ad9620ef..c5e6745c 100644 --- a/examples/esp32/main/my_platform.c +++ b/examples/esp32/main/my_platform.c @@ -4,12 +4,7 @@ #include #include -#include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_gamepad.h" -#include "uni_hid_device.h" -#include "uni_log.h" -#include "uni_platform.h" +#include // Custom "instance" typedef struct my_platform_instance_s { diff --git a/examples/linux/Makefile b/examples/linux/Makefile index 11c17d10..23c770f1 100644 --- a/examples/linux/Makefile +++ b/examples/linux/Makefile @@ -73,44 +73,44 @@ clean_src: rm -rf * ${BTSTACK_ROOT}/platform/embedded/*.o bluepad32: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} btstack_ring_buffer.o btstack_hid_parser.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_allowlist.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_bredr.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_conn.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_le.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_sdp.o \ + ${BLUEPAD32_ROOT}/bt/uni_bt_setup.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_8bitdo.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_android.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_atari.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_ds3.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_ds4.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_ds5.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_generic.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_icade.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_keyboard.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_mouse.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_nimbus.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_ouya.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_psmove.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_smarttvremote.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_steam.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_switch.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_wii.o \ + ${BLUEPAD32_ROOT}/parser/uni_hid_parser_xboxone.o \ + ${BLUEPAD32_ROOT}/platform/uni_platform.o \ ${BLUEPAD32_ROOT}/uni_balance_board.o \ - ${BLUEPAD32_ROOT}/uni_bt.o \ - ${BLUEPAD32_ROOT}/uni_bt_allowlist.o \ - ${BLUEPAD32_ROOT}/uni_bt_bredr.o \ - ${BLUEPAD32_ROOT}/uni_bt_conn.o \ - ${BLUEPAD32_ROOT}/uni_bt_le.o \ - ${BLUEPAD32_ROOT}/uni_bt_sdp.o \ - ${BLUEPAD32_ROOT}/uni_bt_setup.o \ ${BLUEPAD32_ROOT}/uni_circular_buffer.o \ ${BLUEPAD32_ROOT}/uni_controller.o \ ${BLUEPAD32_ROOT}/uni_gamepad.o \ ${BLUEPAD32_ROOT}/uni_hci_cmd.o \ ${BLUEPAD32_ROOT}/uni_hid_device.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_8bitdo.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_android.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_atari.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_ds3.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_ds4.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_ds5.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_generic.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_icade.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_keyboard.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_mouse.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_nimbus.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_ouya.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_psmove.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_smarttvremote.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_steam.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_switch.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_wii.o \ - ${BLUEPAD32_ROOT}/uni_hid_parser_xboxone.o \ ${BLUEPAD32_ROOT}/uni_init.o \ ${BLUEPAD32_ROOT}/uni_joystick.o \ ${BLUEPAD32_ROOT}/uni_keyboard.o \ ${BLUEPAD32_ROOT}/uni_log.o \ ${BLUEPAD32_ROOT}/uni_mouse.o \ - ${BLUEPAD32_ROOT}/uni_platform.o \ ${BLUEPAD32_ROOT}/uni_property.o \ ${BLUEPAD32_ROOT}/uni_property_mem.o \ ${BLUEPAD32_ROOT}/uni_utils.o \ diff --git a/examples/linux/main.c b/examples/linux/main.c index b6690b93..891b75c6 100644 --- a/examples/linux/main.c +++ b/examples/linux/main.c @@ -76,9 +76,9 @@ #include "hci_transport_usb.h" // Bluepad32 related +#include + #include "sdkconfig.h" -#include "uni_init.h" -#include "uni_platform.h" // Local includes #include "my_platform.h" diff --git a/examples/linux/my_platform.c b/examples/linux/my_platform.c index c727256b..7da04b91 100644 --- a/examples/linux/my_platform.c +++ b/examples/linux/my_platform.c @@ -21,13 +21,7 @@ limitations under the License. #include #include -#include "uni_bt.h" -#include "uni_error.h" -#include "uni_gamepad.h" -#include "uni_hid_device.h" -#include "uni_hid_parser_mouse.h" -#include "uni_log.h" -#include "uni_platform.h" +#include // // Globals diff --git a/examples/linux/my_platform.h b/examples/linux/my_platform.h index 7b84beef..4be11a10 100644 --- a/examples/linux/my_platform.h +++ b/examples/linux/my_platform.h @@ -1,7 +1,7 @@ #ifndef MY_PLATFORM #define MY_PLATFORM -#include "uni_platform.h" +#include struct uni_platform* get_my_platform(void); diff --git a/examples/pico_w/src/main.c b/examples/pico_w/src/main.c index 67075519..0185ca7d 100644 --- a/examples/pico_w/src/main.c +++ b/examples/pico_w/src/main.c @@ -4,11 +4,9 @@ #include #include #include +#include #include "sdkconfig.h" -#include "uni_init.h" -#include "uni_log.h" -#include "uni_platform.h" // Sanity check #ifndef CONFIG_BLUEPAD32_PLATFORM_CUSTOM diff --git a/examples/pico_w/src/my_platform.c b/examples/pico_w/src/my_platform.c index 9f75a40a..1c165e27 100644 --- a/examples/pico_w/src/my_platform.c +++ b/examples/pico_w/src/my_platform.c @@ -5,13 +5,9 @@ #include #include +#include #include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_gamepad.h" -#include "uni_hid_device.h" -#include "uni_log.h" -#include "uni_platform.h" // Sanity check #ifndef CONFIG_BLUEPAD32_PLATFORM_CUSTOM diff --git a/src/components/bluepad32/CMakeLists.txt b/src/components/bluepad32/CMakeLists.txt index 5b8d559c..9602b6e4 100644 --- a/src/components/bluepad32/CMakeLists.txt +++ b/src/components/bluepad32/CMakeLists.txt @@ -1,41 +1,42 @@ -set(srcs "uni_balance_board.c" - "uni_bt.c" - "uni_bt_allowlist.c" - "uni_bt_conn.c" - "uni_bt_le.c" - "uni_bt_setup.c" +set(srcs + "bt/uni_bt.c" + "bt/uni_bt_allowlist.c" + "bt/uni_bt_conn.c" + "bt/uni_bt_le.c" + "bt/uni_bt_setup.c" + "parser/uni_hid_parser.c" + "parser/uni_hid_parser_8bitdo.c" + "parser/uni_hid_parser_android.c" + "parser/uni_hid_parser_atari.c" + "parser/uni_hid_parser_ds3.c" + "parser/uni_hid_parser_ds4.c" + "parser/uni_hid_parser_ds5.c" + "parser/uni_hid_parser_generic.c" + "parser/uni_hid_parser_icade.c" + "parser/uni_hid_parser_keyboard.c" + "parser/uni_hid_parser_mouse.c" + "parser/uni_hid_parser_nimbus.c" + "parser/uni_hid_parser_ouya.c" + "parser/uni_hid_parser_psmove.c" + "parser/uni_hid_parser_smarttvremote.c" + "parser/uni_hid_parser_steam.c" + "parser/uni_hid_parser_switch.c" + "parser/uni_hid_parser_wii.c" + "parser/uni_hid_parser_xboxone.c" + "platform/uni_platform.c" + "platform/uni_platform_arduino.c" + "platform/uni_platform_arduino_bootstrap.cpp" + "uni_balance_board.c" "uni_circular_buffer.c" "uni_controller.c" "uni_gamepad.c" "uni_hci_cmd.c" "uni_hid_device.c" - "uni_hid_parser.c" - "uni_hid_parser_8bitdo.c" - "uni_hid_parser_android.c" - "uni_hid_parser_atari.c" - "uni_hid_parser_ds3.c" - "uni_hid_parser_ds4.c" - "uni_hid_parser_ds5.c" - "uni_hid_parser_generic.c" - "uni_hid_parser_icade.c" - "uni_hid_parser_keyboard.c" - "uni_hid_parser_mouse.c" - "uni_hid_parser_nimbus.c" - "uni_hid_parser_ouya.c" - "uni_hid_parser_psmove.c" - "uni_hid_parser_smarttvremote.c" - "uni_hid_parser_steam.c" - "uni_hid_parser_switch.c" - "uni_hid_parser_wii.c" - "uni_hid_parser_xboxone.c" "uni_init.c" "uni_joystick.c" "uni_keyboard.c" "uni_log.c" "uni_mouse.c" - "uni_platform.c" - "uni_platform_arduino.c" - "uni_platform_arduino_bootstrap.cpp" "uni_property.c" "uni_utils.c" "uni_virtual_device.c") @@ -46,8 +47,8 @@ if(CONFIG_IDF_TARGET_ESP32 OR PICO_SDK_VERSION_STRING) # - Pico W list(APPEND srcs # BR/EDR code only gets compiled on ESP32 - "uni_bt_bredr.c" - "uni_bt_sdp.c") + "bt/uni_bt_bredr.c" + "bt/uni_bt_sdp.c") endif() if(IDF_TARGET) @@ -72,15 +73,15 @@ if(CONFIG_IDF_TARGET_ESP32) # Files that are only meant to be compiled on ESP32 (original) list(APPEND srcs # Place here files that are ESP32-only - "uni_platform_mightymiggy.c" - "uni_platform_nina.c" - "uni_platform_unijoysticle.c" - "uni_platform_unijoysticle_2.c" - "uni_platform_unijoysticle_2plus.c" - "uni_platform_unijoysticle_800xl.c" - "uni_platform_unijoysticle_a500.c" - "uni_platform_unijoysticle_c64.c" - "uni_platform_unijoysticle_singleport.c") + "platform/uni_platform_mightymiggy.c" + "platform/uni_platform_nina.c" + "platform/uni_platform_unijoysticle.c" + "platform/uni_platform_unijoysticle_2.c" + "platform/uni_platform_unijoysticle_2plus.c" + "platform/uni_platform_unijoysticle_800xl.c" + "platform/uni_platform_unijoysticle_a500.c" + "platform/uni_platform_unijoysticle_c64.c" + "platform/uni_platform_unijoysticle_singleport.c") endif() # Valid for ESP-IDF only diff --git a/src/components/bluepad32/uni_bt.c b/src/components/bluepad32/bt/uni_bt.c similarity index 98% rename from src/components/bluepad32/uni_bt.c rename to src/components/bluepad32/bt/uni_bt.c index 9f7104b2..8ef0ba57 100644 --- a/src/components/bluepad32/uni_bt.c +++ b/src/components/bluepad32/bt/uni_bt.c @@ -52,7 +52,7 @@ * this file. */ -#include "uni_bt.h" +#include "bt/uni_bt.h" #include #include @@ -63,21 +63,22 @@ #include #include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_bt_bredr.h" -#include "uni_bt_conn.h" -#include "uni_bt_defines.h" -#include "uni_bt_le.h" -#include "uni_bt_sdp.h" -#include "uni_bt_setup.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_bredr.h" +#include "bt/uni_bt_conn.h" +#include "bt/uni_bt_defines.h" +#include "bt/uni_bt_le.h" +#include "bt/uni_bt_sdp.h" +#include "bt/uni_bt_setup.h" +#include "parser/uni_hid_parser.h" +#include "platform/uni_platform.h" #include "uni_common.h" #include "uni_config.h" #include "uni_hci_cmd.h" #include "uni_hid_device.h" #include "uni_hid_device_vendors.h" -#include "uni_hid_parser.h" #include "uni_log.h" -#include "uni_platform.h" #include "uni_property.h" // globals diff --git a/src/components/bluepad32/uni_bt_allowlist.c b/src/components/bluepad32/bt/uni_bt_allowlist.c similarity index 99% rename from src/components/bluepad32/uni_bt_allowlist.c rename to src/components/bluepad32/bt/uni_bt_allowlist.c index 4bffade1..8939d20b 100644 --- a/src/components/bluepad32/uni_bt_allowlist.c +++ b/src/components/bluepad32/bt/uni_bt_allowlist.c @@ -16,9 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_bt_allowlist.h" +#include "bt/uni_bt_allowlist.h" #include "sdkconfig.h" + #include "uni_common.h" #include "uni_log.h" #include "uni_property.h" diff --git a/src/components/bluepad32/uni_bt_bredr.c b/src/components/bluepad32/bt/uni_bt_bredr.c similarity index 99% rename from src/components/bluepad32/uni_bt_bredr.c rename to src/components/bluepad32/bt/uni_bt_bredr.c index 767e0930..0a105484 100644 --- a/src/components/bluepad32/uni_bt_bredr.c +++ b/src/components/bluepad32/bt/uni_bt_bredr.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_bt_bredr.h" +#include "bt/uni_bt_bredr.h" #include #include @@ -24,10 +24,11 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_bt_allowlist.h" -#include "uni_bt_defines.h" -#include "uni_bt_sdp.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_allowlist.h" +#include "bt/uni_bt_defines.h" +#include "bt/uni_bt_sdp.h" #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_bt_conn.c b/src/components/bluepad32/bt/uni_bt_conn.c similarity index 98% rename from src/components/bluepad32/uni_bt_conn.c rename to src/components/bluepad32/bt/uni_bt_conn.c index c32fda7a..d42ff359 100644 --- a/src/components/bluepad32/uni_bt_conn.c +++ b/src/components/bluepad32/bt/uni_bt_conn.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_bt_conn.h" +#include "bt/uni_bt_conn.h" #include diff --git a/src/components/bluepad32/uni_bt_le.c b/src/components/bluepad32/bt/uni_bt_le.c similarity index 99% rename from src/components/bluepad32/uni_bt_le.c rename to src/components/bluepad32/bt/uni_bt_le.c index 7072bc19..a5e242d6 100644 --- a/src/components/bluepad32/uni_bt_le.c +++ b/src/components/bluepad32/bt/uni_bt_le.c @@ -50,7 +50,7 @@ * uni_hid_device_set_ready() */ -#include "uni_bt_le.h" +#include "bt/uni_bt_le.h" #include #include @@ -61,13 +61,14 @@ #include #include "sdkconfig.h" -#include "uni_bt_allowlist.h" -#include "uni_bt_conn.h" -#include "uni_bt_defines.h" + +#include "bt/uni_bt_allowlist.h" +#include "bt/uni_bt_conn.h" +#include "bt/uni_bt_defines.h" +#include "parser/uni_hid_parser.h" #include "uni_common.h" #include "uni_config.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" #include "uni_property.h" diff --git a/src/components/bluepad32/uni_bt_sdp.c b/src/components/bluepad32/bt/uni_bt_sdp.c similarity index 99% rename from src/components/bluepad32/uni_bt_sdp.c rename to src/components/bluepad32/bt/uni_bt_sdp.c index c1b09c69..f8f219d9 100644 --- a/src/components/bluepad32/uni_bt_sdp.c +++ b/src/components/bluepad32/bt/uni_bt_sdp.c @@ -45,14 +45,15 @@ * - hid_device_test.c */ -#include "uni_bt_sdp.h" +#include "bt/uni_bt_sdp.h" #include #include #include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_bt_bredr.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_bredr.h" #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_bt_setup.c b/src/components/bluepad32/bt/uni_bt_setup.c similarity index 96% rename from src/components/bluepad32/uni_bt_setup.c rename to src/components/bluepad32/bt/uni_bt_setup.c index c19226f1..acc7a28f 100644 --- a/src/components/bluepad32/uni_bt_setup.c +++ b/src/components/bluepad32/bt/uni_bt_setup.c @@ -16,24 +16,25 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_bt_setup.h" +#include "bt/uni_bt_setup.h" #include #include #include "sdkconfig.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_bredr.h" +#include "bt/uni_bt_defines.h" +#include "bt/uni_bt_le.h" +#include "bt/uni_bt_sdp.h" +#include "platform/uni_platform.h" #include "uni_balance_board.h" -#include "uni_bt.h" -#include "uni_bt_bredr.h" -#include "uni_bt_defines.h" -#include "uni_bt_le.h" -#include "uni_bt_sdp.h" #include "uni_common.h" #include "uni_config.h" #include "uni_hci_cmd.h" #include "uni_log.h" -#include "uni_platform.h" #include "uni_property.h" typedef enum { diff --git a/src/components/bluepad32/include/uni_bt.h b/src/components/bluepad32/include/bt/uni_bt.h similarity index 100% rename from src/components/bluepad32/include/uni_bt.h rename to src/components/bluepad32/include/bt/uni_bt.h diff --git a/src/components/bluepad32/include/uni_bt_allowlist.h b/src/components/bluepad32/include/bt/uni_bt_allowlist.h similarity index 100% rename from src/components/bluepad32/include/uni_bt_allowlist.h rename to src/components/bluepad32/include/bt/uni_bt_allowlist.h diff --git a/src/components/bluepad32/include/uni_bt_bredr.h b/src/components/bluepad32/include/bt/uni_bt_bredr.h similarity index 98% rename from src/components/bluepad32/include/uni_bt_bredr.h rename to src/components/bluepad32/include/bt/uni_bt_bredr.h index 092a1cef..ade58847 100644 --- a/src/components/bluepad32/include/uni_bt_bredr.h +++ b/src/components/bluepad32/include/bt/uni_bt_bredr.h @@ -29,7 +29,7 @@ extern "C" { #include #include -#include "uni_bt_conn.h" +#include "bt/uni_bt_conn.h" #include "uni_hid_device.h" void uni_bt_bredr_scan_start(void); diff --git a/src/components/bluepad32/include/uni_bt_conn.h b/src/components/bluepad32/include/bt/uni_bt_conn.h similarity index 100% rename from src/components/bluepad32/include/uni_bt_conn.h rename to src/components/bluepad32/include/bt/uni_bt_conn.h diff --git a/src/components/bluepad32/include/uni_bt_defines.h b/src/components/bluepad32/include/bt/uni_bt_defines.h similarity index 100% rename from src/components/bluepad32/include/uni_bt_defines.h rename to src/components/bluepad32/include/bt/uni_bt_defines.h diff --git a/src/components/bluepad32/include/uni_bt_le.h b/src/components/bluepad32/include/bt/uni_bt_le.h similarity index 98% rename from src/components/bluepad32/include/uni_bt_le.h rename to src/components/bluepad32/include/bt/uni_bt_le.h index 361a39ce..384b3a9b 100644 --- a/src/components/bluepad32/include/uni_bt_le.h +++ b/src/components/bluepad32/include/bt/uni_bt_le.h @@ -29,7 +29,7 @@ extern "C" { #include #include -#include "uni_bt_conn.h" +#include "bt/uni_bt_conn.h" #include "uni_hid_device.h" void uni_bt_le_on_hci_event_le_meta(const uint8_t* packet, uint16_t size); diff --git a/src/components/bluepad32/include/uni_bt_sdp.h b/src/components/bluepad32/include/bt/uni_bt_sdp.h similarity index 100% rename from src/components/bluepad32/include/uni_bt_sdp.h rename to src/components/bluepad32/include/bt/uni_bt_sdp.h diff --git a/src/components/bluepad32/include/uni_bt_setup.h b/src/components/bluepad32/include/bt/uni_bt_setup.h similarity index 100% rename from src/components/bluepad32/include/uni_bt_setup.h rename to src/components/bluepad32/include/bt/uni_bt_setup.h diff --git a/src/components/bluepad32/include/uni_hid_parser.h b/src/components/bluepad32/include/parser/uni_hid_parser.h similarity index 99% rename from src/components/bluepad32/include/uni_hid_parser.h rename to src/components/bluepad32/include/parser/uni_hid_parser.h index 5e1671fb..17b8d921 100644 --- a/src/components/bluepad32/include/uni_hid_parser.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser.h @@ -21,8 +21,6 @@ limitations under the License. #include -#include "uni_gamepad.h" - // Forward declarations struct uni_hid_device_s; diff --git a/src/components/bluepad32/include/uni_hid_parser_8bitdo.h b/src/components/bluepad32/include/parser/uni_hid_parser_8bitdo.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_8bitdo.h rename to src/components/bluepad32/include/parser/uni_hid_parser_8bitdo.h index 1a10b3c4..bd82b3bb 100644 --- a/src/components/bluepad32/include/uni_hid_parser_8bitdo.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_8bitdo.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // 8Bitdo controllers void uni_hid_parser_8bitdo_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_android.h b/src/components/bluepad32/include/parser/uni_hid_parser_android.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_android.h rename to src/components/bluepad32/include/parser/uni_hid_parser_android.h index b07e45d1..5f42fcb6 100644 --- a/src/components/bluepad32/include/uni_hid_parser_android.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_android.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Android devices void uni_hid_parser_android_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_atari.h b/src/components/bluepad32/include/parser/uni_hid_parser_atari.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_atari.h rename to src/components/bluepad32/include/parser/uni_hid_parser_atari.h index 67cb5f45..ead77637 100644 --- a/src/components/bluepad32/include/uni_hid_parser_atari.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_atari.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Atari VCS Modern Wireless controller / joystick. void uni_hid_parser_atari_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_ds3.h b/src/components/bluepad32/include/parser/uni_hid_parser_ds3.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_ds3.h rename to src/components/bluepad32/include/parser/uni_hid_parser_ds3.h index 012d15fa..db432b1d 100644 --- a/src/components/bluepad32/include/uni_hid_parser_ds3.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_ds3.h @@ -22,7 +22,7 @@ limitations under the License. #include #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For DUALSHOCK 3 gamepads void uni_hid_parser_ds3_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_ds4.h b/src/components/bluepad32/include/parser/uni_hid_parser_ds4.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_ds4.h rename to src/components/bluepad32/include/parser/uni_hid_parser_ds4.h index 176ab618..8c19e1eb 100644 --- a/src/components/bluepad32/include/uni_hid_parser_ds4.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_ds4.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For DUALSHOCK 4 gamepads void uni_hid_parser_ds4_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_ds5.h b/src/components/bluepad32/include/parser/uni_hid_parser_ds5.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_ds5.h rename to src/components/bluepad32/include/parser/uni_hid_parser_ds5.h index 95fa1e1e..21096fba 100644 --- a/src/components/bluepad32/include/uni_hid_parser_ds5.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_ds5.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For DualSense gamepads void uni_hid_parser_ds5_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_generic.h b/src/components/bluepad32/include/parser/uni_hid_parser_generic.h similarity index 95% rename from src/components/bluepad32/include/uni_hid_parser_generic.h rename to src/components/bluepad32/include/parser/uni_hid_parser_generic.h index 9881bf16..f56e222b 100644 --- a/src/components/bluepad32/include/uni_hid_parser_generic.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_generic.h @@ -21,8 +21,7 @@ limitations under the License. #include -#include "uni_gamepad.h" -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Android devices void uni_hid_parser_generic_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_icade.h b/src/components/bluepad32/include/parser/uni_hid_parser_icade.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_icade.h rename to src/components/bluepad32/include/parser/uni_hid_parser_icade.h index 82987542..67c6d03a 100644 --- a/src/components/bluepad32/include/uni_hid_parser_icade.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_icade.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // ION iCade setup. void uni_hid_parser_icade_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_keyboard.h b/src/components/bluepad32/include/parser/uni_hid_parser_keyboard.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_keyboard.h rename to src/components/bluepad32/include/parser/uni_hid_parser_keyboard.h index 522b78f4..948f5f2b 100644 --- a/src/components/bluepad32/include/uni_hid_parser_keyboard.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_keyboard.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Mouse devices void uni_hid_parser_keyboard_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_mouse.h b/src/components/bluepad32/include/parser/uni_hid_parser_mouse.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_mouse.h rename to src/components/bluepad32/include/parser/uni_hid_parser_mouse.h index 77308f1e..dfc6df60 100644 --- a/src/components/bluepad32/include/uni_hid_parser_mouse.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_mouse.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Mouse devices void uni_hid_parser_mouse_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_nimbus.h b/src/components/bluepad32/include/parser/uni_hid_parser_nimbus.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_nimbus.h rename to src/components/bluepad32/include/parser/uni_hid_parser_nimbus.h index ca812b32..7feac042 100644 --- a/src/components/bluepad32/include/uni_hid_parser_nimbus.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_nimbus.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For the Nimbus gamepad. void uni_hid_parser_nimbus_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_ouya.h b/src/components/bluepad32/include/parser/uni_hid_parser_ouya.h similarity index 96% rename from src/components/bluepad32/include/uni_hid_parser_ouya.h rename to src/components/bluepad32/include/parser/uni_hid_parser_ouya.h index db7b7277..a477514c 100644 --- a/src/components/bluepad32/include/uni_hid_parser_ouya.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_ouya.h @@ -21,8 +21,7 @@ limitations under the License. #include -#include "uni_gamepad.h" -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // OUYA devices void uni_hid_parser_ouya_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_psmove.h b/src/components/bluepad32/include/parser/uni_hid_parser_psmove.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_psmove.h rename to src/components/bluepad32/include/parser/uni_hid_parser_psmove.h index 6408d9b8..b90dd99c 100644 --- a/src/components/bluepad32/include/uni_hid_parser_psmove.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_psmove.h @@ -22,7 +22,7 @@ limitations under the License. #include #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For PS Move controller void uni_hid_parser_psmove_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_smarttvremote.h b/src/components/bluepad32/include/parser/uni_hid_parser_smarttvremote.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_smarttvremote.h rename to src/components/bluepad32/include/parser/uni_hid_parser_smarttvremote.h index 3d2ecebc..b6e78626 100644 --- a/src/components/bluepad32/include/uni_hid_parser_smarttvremote.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_smarttvremote.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Android devices void uni_hid_parser_smarttvremote_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_steam.h b/src/components/bluepad32/include/parser/uni_hid_parser_steam.h similarity index 96% rename from src/components/bluepad32/include/uni_hid_parser_steam.h rename to src/components/bluepad32/include/parser/uni_hid_parser_steam.h index 45a5a3a0..e28fbb0b 100644 --- a/src/components/bluepad32/include/uni_hid_parser_steam.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_steam.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Steam devices void uni_hid_parser_steam_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_switch.h b/src/components/bluepad32/include/parser/uni_hid_parser_switch.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_switch.h rename to src/components/bluepad32/include/parser/uni_hid_parser_switch.h index b60b39dd..7f0272cc 100644 --- a/src/components/bluepad32/include/uni_hid_parser_switch.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_switch.h @@ -22,7 +22,7 @@ limitations under the License. #include #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // Nintendo Switch devices void uni_hid_parser_switch_setup(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_wii.h b/src/components/bluepad32/include/parser/uni_hid_parser_wii.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_wii.h rename to src/components/bluepad32/include/parser/uni_hid_parser_wii.h index df537b6a..6cc2dccf 100644 --- a/src/components/bluepad32/include/uni_hid_parser_wii.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_wii.h @@ -21,7 +21,7 @@ limitations under the License. #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" void uni_hid_parser_wii_setup(struct uni_hid_device_s* d); void uni_hid_parser_wii_init_report(struct uni_hid_device_s* d); diff --git a/src/components/bluepad32/include/uni_hid_parser_xboxone.h b/src/components/bluepad32/include/parser/uni_hid_parser_xboxone.h similarity index 97% rename from src/components/bluepad32/include/uni_hid_parser_xboxone.h rename to src/components/bluepad32/include/parser/uni_hid_parser_xboxone.h index 7f5195f7..687ec831 100644 --- a/src/components/bluepad32/include/uni_hid_parser_xboxone.h +++ b/src/components/bluepad32/include/parser/uni_hid_parser_xboxone.h @@ -22,7 +22,7 @@ limitations under the License. #include #include -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" // For Xbox Wireless Controllers bool uni_hid_parser_xboxone_does_name_match(struct uni_hid_device_s* d, const char* name); diff --git a/src/components/bluepad32/include/uni_platform.h b/src/components/bluepad32/include/platform/uni_platform.h similarity index 100% rename from src/components/bluepad32/include/uni_platform.h rename to src/components/bluepad32/include/platform/uni_platform.h diff --git a/src/components/bluepad32/include/uni_platform_arduino.h b/src/components/bluepad32/include/platform/uni_platform_arduino.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_arduino.h rename to src/components/bluepad32/include/platform/uni_platform_arduino.h diff --git a/src/components/bluepad32/include/uni_platform_arduino_bootstrap.h b/src/components/bluepad32/include/platform/uni_platform_arduino_bootstrap.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_arduino_bootstrap.h rename to src/components/bluepad32/include/platform/uni_platform_arduino_bootstrap.h diff --git a/src/components/bluepad32/include/uni_platform_custom.h b/src/components/bluepad32/include/platform/uni_platform_custom.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_custom.h rename to src/components/bluepad32/include/platform/uni_platform_custom.h diff --git a/src/components/bluepad32/include/uni_platform_mightymiggy.h b/src/components/bluepad32/include/platform/uni_platform_mightymiggy.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_mightymiggy.h rename to src/components/bluepad32/include/platform/uni_platform_mightymiggy.h diff --git a/src/components/bluepad32/include/uni_platform_nina.h b/src/components/bluepad32/include/platform/uni_platform_nina.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_nina.h rename to src/components/bluepad32/include/platform/uni_platform_nina.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle.h similarity index 99% rename from src/components/bluepad32/include/uni_platform_unijoysticle.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle.h index 1c0d70b7..ca252f7a 100644 --- a/src/components/bluepad32/include/uni_platform_unijoysticle.h +++ b/src/components/bluepad32/include/platform/uni_platform_unijoysticle.h @@ -23,9 +23,9 @@ limitations under the License. #include +#include "platform/uni_platform.h" #include "uni_gamepad.h" #include "uni_hid_device.h" -#include "uni_platform.h" // How many Balance Board entries to store #define UNI_PLATFORM_UNIJOYSTICLE_BB_VALUES_ARRAY_COUNT 8 diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_2.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_2.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_2.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_2.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_2plus.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_2plus.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_2plus.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_2plus.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_800xl.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_800xl.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_800xl.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_800xl.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_a500.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_a500.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_a500.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_a500.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_c64.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_c64.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_c64.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_c64.h diff --git a/src/components/bluepad32/include/uni_platform_unijoysticle_singleport.h b/src/components/bluepad32/include/platform/uni_platform_unijoysticle_singleport.h similarity index 100% rename from src/components/bluepad32/include/uni_platform_unijoysticle_singleport.h rename to src/components/bluepad32/include/platform/uni_platform_unijoysticle_singleport.h diff --git a/src/components/bluepad32/include/uni.h b/src/components/bluepad32/include/uni.h new file mode 100644 index 00000000..d71b498e --- /dev/null +++ b/src/components/bluepad32/include/uni.h @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2023 Ricardo Quesada +// http://retro.moe/unijoysticle2 + +#ifndef UNI_H +#define UNI_H + +#ifdef __cplusplus +extern "C" { +#endif + +// A include file that includes all files. +// Useful for 3rd party developers that only cares about including just one file. + +#include "sdkconfig.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_allowlist.h" +#include "bt/uni_bt_bredr.h" +#include "bt/uni_bt_conn.h" +#include "bt/uni_bt_le.h" +#include "bt/uni_bt_sdp.h" +#include "bt/uni_bt_setup.h" +#include "parser/uni_hid_parser.h" +#include "platform/uni_platform.h" +#include "uni_balance_board.h" +#include "uni_circular_buffer.h" +#include "uni_console.h" +#include "uni_controller.h" +#include "uni_esp32.h" +#include "uni_gamepad.h" +#include "uni_hci_cmd.h" +#include "uni_hid_device.h" +#include "uni_init.h" +#include "uni_joystick.h" +#include "uni_keyboard.h" +#include "uni_log.h" +#include "uni_mouse.h" +#include "uni_mouse_quadrature.h" +#include "uni_property.h" +#include "uni_property_mem.h" +#include "uni_property_nvs.h" +#include "uni_utils.h" +#include "uni_virtual_device.h" + +#ifdef __cplusplus +} +#endif + +#endif // UNI_H diff --git a/src/components/bluepad32/include/uni_hid_device.h b/src/components/bluepad32/include/uni_hid_device.h index 7b96790a..dc9c0d64 100644 --- a/src/components/bluepad32/include/uni_hid_device.h +++ b/src/components/bluepad32/include/uni_hid_device.h @@ -23,11 +23,10 @@ limitations under the License. #include #include -#include "uni_bt_conn.h" +#include "bt/uni_bt_conn.h" +#include "parser/uni_hid_parser.h" #include "uni_circular_buffer.h" #include "uni_controller.h" -#include "uni_gamepad.h" -#include "uni_hid_parser.h" #define HID_MAX_NAME_LEN 240 #define HID_MAX_DESCRIPTOR_LEN 512 diff --git a/src/components/bluepad32/uni_hid_parser.c b/src/components/bluepad32/parser/uni_hid_parser.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser.c rename to src/components/bluepad32/parser/uni_hid_parser.c index 0e5d88e3..52d1a7df 100644 --- a/src/components/bluepad32/uni_hid_parser.c +++ b/src/components/bluepad32/parser/uni_hid_parser.c @@ -16,10 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser.h" +#include "parser/uni_hid_parser.h" #include "hid_usage.h" -#include "uni_gamepad.h" #include "uni_hid_device.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_hid_parser_8bitdo.c b/src/components/bluepad32/parser/uni_hid_parser_8bitdo.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_8bitdo.c rename to src/components/bluepad32/parser/uni_hid_parser_8bitdo.c index be149f98..900ca66b 100644 --- a/src/components/bluepad32/uni_hid_parser_8bitdo.c +++ b/src/components/bluepad32/parser/uni_hid_parser_8bitdo.c @@ -16,12 +16,11 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_8bitdo.h" +#include "parser/uni_hid_parser_8bitdo.h" #include "hid_usage.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" // 8BitDo controllers support different "modes": diff --git a/src/components/bluepad32/uni_hid_parser_android.c b/src/components/bluepad32/parser/uni_hid_parser_android.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_android.c rename to src/components/bluepad32/parser/uni_hid_parser_android.c index 8eaf67d7..d59917af 100644 --- a/src/components/bluepad32/uni_hid_parser_android.c +++ b/src/components/bluepad32/parser/uni_hid_parser_android.c @@ -19,13 +19,12 @@ limitations under the License. // For more info about Android mappings see: // https://developer.android.com/training/game-controllers/controller-input -#include "uni_hid_parser_android.h" +#include "parser/uni_hid_parser_android.h" #include "hid_usage.h" #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" void uni_hid_parser_android_init_report(uni_hid_device_t* d) { diff --git a/src/components/bluepad32/uni_hid_parser_atari.c b/src/components/bluepad32/parser/uni_hid_parser_atari.c similarity index 98% rename from src/components/bluepad32/uni_hid_parser_atari.c rename to src/components/bluepad32/parser/uni_hid_parser_atari.c index f32025fb..8feebadc 100644 --- a/src/components/bluepad32/uni_hid_parser_atari.c +++ b/src/components/bluepad32/parser/uni_hid_parser_atari.c @@ -19,13 +19,12 @@ limitations under the License. // Supported controller: // https://atari.com/products/classic-joystick -#include "uni_hid_parser_atari.h" +#include "parser/uni_hid_parser_atari.h" #include "hid_usage.h" #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" typedef struct __attribute((packed)) { diff --git a/src/components/bluepad32/uni_hid_parser_ds3.c b/src/components/bluepad32/parser/uni_hid_parser_ds3.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_ds3.c rename to src/components/bluepad32/parser/uni_hid_parser_ds3.c index 7d835269..ae86568a 100644 --- a/src/components/bluepad32/uni_hid_parser_ds3.c +++ b/src/components/bluepad32/parser/uni_hid_parser_ds3.c @@ -23,7 +23,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_ds3.h" +#include "parser/uni_hid_parser_ds3.h" #include @@ -31,7 +31,6 @@ limitations under the License. #include "uni_config.h" #include "uni_gamepad.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" static const uint16_t DUALSHOCK3_VID = 0x054c; // Sony diff --git a/src/components/bluepad32/uni_hid_parser_ds4.c b/src/components/bluepad32/parser/uni_hid_parser_ds4.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_ds4.c rename to src/components/bluepad32/parser/uni_hid_parser_ds4.c index 3a9c2b7c..77e33e06 100644 --- a/src/components/bluepad32/uni_hid_parser_ds4.c +++ b/src/components/bluepad32/parser/uni_hid_parser_ds4.c @@ -23,15 +23,14 @@ limitations under the License. // https://github.com/torvalds/linux/blob/master/drivers/hid/hid-sony.c // https://github.com/chrippa/ds4drv/blob/master/ds4drv/device.py -#include "uni_hid_parser_ds4.h" +#include "parser/uni_hid_parser_ds4.h" #include +#include "bt/uni_bt_defines.h" #include "hid_usage.h" -#include "uni_bt_defines.h" #include "uni_config.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" #include "uni_utils.h" diff --git a/src/components/bluepad32/uni_hid_parser_ds5.c b/src/components/bluepad32/parser/uni_hid_parser_ds5.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_ds5.c rename to src/components/bluepad32/parser/uni_hid_parser_ds5.c index 04908667..073fb618 100644 --- a/src/components/bluepad32/uni_hid_parser_ds5.c +++ b/src/components/bluepad32/parser/uni_hid_parser_ds5.c @@ -19,16 +19,15 @@ limitations under the License. // Technical info taken from: // https://aur.archlinux.org/cgit/aur.git/tree/hid-playstation.c?h=hid-playstation-dkms -#include "uni_hid_parser_ds5.h" +#include "parser/uni_hid_parser_ds5.h" #include +#include "bt/uni_bt_defines.h" #include "hid_usage.h" -#include "uni_bt_defines.h" #include "uni_common.h" #include "uni_config.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" #include "uni_utils.h" diff --git a/src/components/bluepad32/uni_hid_parser_generic.c b/src/components/bluepad32/parser/uni_hid_parser_generic.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_generic.c rename to src/components/bluepad32/parser/uni_hid_parser_generic.c index b49bcea1..77c31b13 100644 --- a/src/components/bluepad32/uni_hid_parser_generic.c +++ b/src/components/bluepad32/parser/uni_hid_parser_generic.c @@ -20,11 +20,10 @@ limitations under the License. // might implemenet usages that are invalid for specific consoles. In order to // keep clean the pure-console implementations, add here the generic ones. -#include "uni_hid_parser_generic.h" +#include "parser/uni_hid_parser_generic.h" #include "hid_usage.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" void uni_hid_parser_generic_init_report(uni_hid_device_t* d) { diff --git a/src/components/bluepad32/uni_hid_parser_icade.c b/src/components/bluepad32/parser/uni_hid_parser_icade.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_icade.c rename to src/components/bluepad32/parser/uni_hid_parser_icade.c index 3a2a04bb..0f0e9d57 100644 --- a/src/components/bluepad32/uni_hid_parser_icade.c +++ b/src/components/bluepad32/parser/uni_hid_parser_icade.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_icade.h" +#include "parser/uni_hid_parser_icade.h" #include "hid_usage.h" #include "uni_common.h" diff --git a/src/components/bluepad32/uni_hid_parser_keyboard.c b/src/components/bluepad32/parser/uni_hid_parser_keyboard.c similarity index 98% rename from src/components/bluepad32/uni_hid_parser_keyboard.c rename to src/components/bluepad32/parser/uni_hid_parser_keyboard.c index 115a3af0..cc30e054 100644 --- a/src/components/bluepad32/uni_hid_parser_keyboard.c +++ b/src/components/bluepad32/parser/uni_hid_parser_keyboard.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_keyboard.h" +#include "parser/uni_hid_parser_keyboard.h" #include #include @@ -25,7 +25,6 @@ limitations under the License. #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" typedef struct { diff --git a/src/components/bluepad32/uni_hid_parser_mouse.c b/src/components/bluepad32/parser/uni_hid_parser_mouse.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_mouse.c rename to src/components/bluepad32/parser/uni_hid_parser_mouse.c index 9f72db86..07f386c8 100644 --- a/src/components/bluepad32/uni_hid_parser_mouse.c +++ b/src/components/bluepad32/parser/uni_hid_parser_mouse.c @@ -20,7 +20,7 @@ limitations under the License. // might implemenet usages that are invalid for specific consoles. In order to // keep clean the pure-console implementations, add here the generic ones. -#include "uni_hid_parser_mouse.h" +#include "parser/uni_hid_parser_mouse.h" #include #include @@ -29,7 +29,6 @@ limitations under the License. #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" #define TANK_MOUSE_VID 0x248a diff --git a/src/components/bluepad32/uni_hid_parser_nimbus.c b/src/components/bluepad32/parser/uni_hid_parser_nimbus.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_nimbus.c rename to src/components/bluepad32/parser/uni_hid_parser_nimbus.c index 018649ef..548b67ca 100644 --- a/src/components/bluepad32/uni_hid_parser_nimbus.c +++ b/src/components/bluepad32/parser/uni_hid_parser_nimbus.c @@ -16,12 +16,11 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_nimbus.h" +#include "parser/uni_hid_parser_nimbus.h" #include "hid_usage.h" #include "uni_common.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" void uni_hid_parser_nimbus_init_report(uni_hid_device_t* d) { diff --git a/src/components/bluepad32/uni_hid_parser_ouya.c b/src/components/bluepad32/parser/uni_hid_parser_ouya.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_ouya.c rename to src/components/bluepad32/parser/uni_hid_parser_ouya.c index 42ee4f54..871fbe05 100644 --- a/src/components/bluepad32/uni_hid_parser_ouya.c +++ b/src/components/bluepad32/parser/uni_hid_parser_ouya.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_hid_parser_ouya.h" +#include "parser/uni_hid_parser_ouya.h" #include "hid_usage.h" #include "uni_common.h" diff --git a/src/components/bluepad32/uni_hid_parser_psmove.c b/src/components/bluepad32/parser/uni_hid_parser_psmove.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_psmove.c rename to src/components/bluepad32/parser/uni_hid_parser_psmove.c index 62971934..69e76f1e 100644 --- a/src/components/bluepad32/uni_hid_parser_psmove.c +++ b/src/components/bluepad32/parser/uni_hid_parser_psmove.c @@ -21,7 +21,7 @@ limitations under the License. * https://github.com/thp/psmoveapi */ -#include "uni_hid_parser_psmove.h" +#include "parser/uni_hid_parser_psmove.h" #include @@ -29,7 +29,6 @@ limitations under the License. #include "uni_config.h" #include "uni_gamepad.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" // Required steps to determine what kind of extensions are supported. diff --git a/src/components/bluepad32/uni_hid_parser_smarttvremote.c b/src/components/bluepad32/parser/uni_hid_parser_smarttvremote.c similarity index 98% rename from src/components/bluepad32/uni_hid_parser_smarttvremote.c rename to src/components/bluepad32/parser/uni_hid_parser_smarttvremote.c index ed345acd..dbe964b9 100644 --- a/src/components/bluepad32/uni_hid_parser_smarttvremote.c +++ b/src/components/bluepad32/parser/uni_hid_parser_smarttvremote.c @@ -19,12 +19,11 @@ limitations under the License. // For more info about Android mappings see: // https://developer.android.com/training/game-controllers/controller-input -#include "uni_hid_parser_smarttvremote.h" +#include "parser/uni_hid_parser_smarttvremote.h" #include "hid_usage.h" #include "uni_common.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" void uni_hid_parser_smarttvremote_init_report(uni_hid_device_t* d) { diff --git a/src/components/bluepad32/uni_hid_parser_steam.c b/src/components/bluepad32/parser/uni_hid_parser_steam.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_steam.c rename to src/components/bluepad32/parser/uni_hid_parser_steam.c index ebc21bd7..95fd6a3f 100644 --- a/src/components/bluepad32/uni_hid_parser_steam.c +++ b/src/components/bluepad32/parser/uni_hid_parser_steam.c @@ -22,13 +22,12 @@ limitations under the License. // https://github.com/haxpor/sdl2-samples/blob/master/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java // https://github.com/g3gg0/LegoRemote -#include "uni_hid_parser_steam.h" +#include "parser/uni_hid_parser_steam.h" #include "hid_usage.h" #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" // clang-format off diff --git a/src/components/bluepad32/uni_hid_parser_switch.c b/src/components/bluepad32/parser/uni_hid_parser_switch.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_switch.c rename to src/components/bluepad32/parser/uni_hid_parser_switch.c index 2618414c..49a8e2ce 100644 --- a/src/components/bluepad32/uni_hid_parser_switch.c +++ b/src/components/bluepad32/parser/uni_hid_parser_switch.c @@ -20,7 +20,7 @@ limitations under the License. // https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering // https://github.com/DanielOgorchock/linux/blob/ogorchock/drivers/hid/hid-nintendo.c -#include "uni_hid_parser_switch.h" +#include "parser/uni_hid_parser_switch.h" #include #include "uni_controller.h" @@ -35,12 +35,11 @@ limitations under the License. #include #endif // ENABLE_SPI_FLASH_DUMP +#include "bt/uni_bt_conn.h" #include "hid_usage.h" -#include "uni_bt_conn.h" #include "uni_common.h" #include "uni_gamepad.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" // Support for Nintendo Switch Pro gamepad and JoyCons. diff --git a/src/components/bluepad32/uni_hid_parser_wii.c b/src/components/bluepad32/parser/uni_hid_parser_wii.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_wii.c rename to src/components/bluepad32/parser/uni_hid_parser_wii.c index c89c5711..0073e64a 100644 --- a/src/components/bluepad32/uni_hid_parser_wii.c +++ b/src/components/bluepad32/parser/uni_hid_parser_wii.c @@ -31,12 +31,12 @@ limitations under the License. #include #endif // ENABLE_EEPROM_DUMP +#include "parser/uni_hid_parser_wii.h" + #include "hid_usage.h" #include "uni_common.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" -#include "uni_hid_parser_wii.h" #include "uni_log.h" #if ENABLE_EEPROM_DUMP diff --git a/src/components/bluepad32/uni_hid_parser_xboxone.c b/src/components/bluepad32/parser/uni_hid_parser_xboxone.c similarity index 99% rename from src/components/bluepad32/uni_hid_parser_xboxone.c rename to src/components/bluepad32/parser/uni_hid_parser_xboxone.c index 2cd317d6..43293e0a 100644 --- a/src/components/bluepad32/uni_hid_parser_xboxone.c +++ b/src/components/bluepad32/parser/uni_hid_parser_xboxone.c @@ -22,12 +22,11 @@ limitations under the License. // Technical info taken from: // https://github.com/atar-axis/xpadneo/blob/master/hid-xpadneo/src/hid-xpadneo.c -#include "uni_hid_parser_xboxone.h" +#include "parser/uni_hid_parser_xboxone.h" #include "hid_usage.h" #include "uni_controller.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" // Xbox doesn't report trigger buttons. Instead it reports throttle/brake. diff --git a/src/components/bluepad32/uni_platform.c b/src/components/bluepad32/platform/uni_platform.c similarity index 90% rename from src/components/bluepad32/uni_platform.c rename to src/components/bluepad32/platform/uni_platform.c index 52a5d667..5de1b266 100644 --- a/src/components/bluepad32/uni_platform.c +++ b/src/components/bluepad32/platform/uni_platform.c @@ -16,17 +16,18 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform.h" +#include "platform/uni_platform.h" #include "sdkconfig.h" + +#include "platform/uni_platform_arduino.h" +#include "platform/uni_platform_custom.h" +#include "platform/uni_platform_mightymiggy.h" +#include "platform/uni_platform_nina.h" #include "uni_log.h" -#include "uni_platform_arduino.h" -#include "uni_platform_custom.h" -#include "uni_platform_mightymiggy.h" -#include "uni_platform_nina.h" #ifdef CONFIG_BLUEPAD32_PLATFORM_UNIJOYSTICLE -#include "uni_platform_unijoysticle.h" +#include "platform/uni_platform_unijoysticle.h" #endif // Platform "object" diff --git a/src/components/bluepad32/uni_platform_arduino.c b/src/components/bluepad32/platform/uni_platform_arduino.c similarity index 98% rename from src/components/bluepad32/uni_platform_arduino.c rename to src/components/bluepad32/platform/uni_platform_arduino.c index 9377395f..41b2bd53 100644 --- a/src/components/bluepad32/uni_platform_arduino.c +++ b/src/components/bluepad32/platform/uni_platform_arduino.c @@ -19,7 +19,7 @@ limitations under the License. #include "sdkconfig.h" #ifdef CONFIG_BLUEPAD32_PLATFORM_ARDUINO -#include "uni_platform_arduino.h" +#include "platform/uni_platform_arduino.h" #include #include @@ -31,16 +31,16 @@ limitations under the License. #include #include +#include "bt/uni_bt.h" #include "cmd_system.h" -#include "uni_bt.h" +#include "platform/uni_platform.h" +#include "platform/uni_platform_arduino_bootstrap.h" #include "uni_common.h" #include "uni_config.h" #include "uni_esp32.h" #include "uni_gamepad.h" #include "uni_hid_device.h" #include "uni_log.h" -#include "uni_platform.h" -#include "uni_platform_arduino_bootstrap.h" #include "uni_version.h" // diff --git a/src/components/bluepad32/uni_platform_arduino_bootstrap.cpp b/src/components/bluepad32/platform/uni_platform_arduino_bootstrap.cpp similarity index 97% rename from src/components/bluepad32/uni_platform_arduino_bootstrap.cpp rename to src/components/bluepad32/platform/uni_platform_arduino_bootstrap.cpp index 9edfb6e3..cfa56f5a 100644 --- a/src/components/bluepad32/uni_platform_arduino_bootstrap.cpp +++ b/src/components/bluepad32/platform/uni_platform_arduino_bootstrap.cpp @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform_arduino_bootstrap.h" +#include "platform/uni_platform_arduino_bootstrap.h" #include "sdkconfig.h" #ifndef CONFIG_BLUEPAD32_PLATFORM_ARDUINO diff --git a/src/components/bluepad32/uni_platform_mightymiggy.c b/src/components/bluepad32/platform/uni_platform_mightymiggy.c similarity index 99% rename from src/components/bluepad32/uni_platform_mightymiggy.c rename to src/components/bluepad32/platform/uni_platform_mightymiggy.c index 3cb437e7..906e4236 100644 --- a/src/components/bluepad32/uni_platform_mightymiggy.c +++ b/src/components/bluepad32/platform/uni_platform_mightymiggy.c @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform_mightymiggy.h" +#include "platform/uni_platform_mightymiggy.h" #include #include @@ -27,7 +27,8 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_bt.h" + +#include "bt/uni_bt.h" #include "uni_common.h" #include "uni_config.h" #include "uni_gamepad.h" diff --git a/src/components/bluepad32/uni_platform_nina.c b/src/components/bluepad32/platform/uni_platform_nina.c similarity index 99% rename from src/components/bluepad32/uni_platform_nina.c rename to src/components/bluepad32/platform/uni_platform_nina.c index 14292334..ea36a43a 100644 --- a/src/components/bluepad32/uni_platform_nina.c +++ b/src/components/bluepad32/platform/uni_platform_nina.c @@ -30,7 +30,7 @@ limitations under the License. // - Arduino Nano 33 IoT // - Arduino MKR WiFi 1010 -#include "uni_platform_nina.h" +#include "platform/uni_platform_nina.h" #include #include @@ -43,16 +43,16 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_bt.h" + +#include "bt/uni_bt.h" +#include "platform/uni_platform.h" #include "uni_common.h" #include "uni_config.h" #include "uni_esp32.h" #include "uni_gamepad.h" #include "uni_gpio.h" #include "uni_hid_device.h" -#include "uni_hid_parser.h" #include "uni_log.h" -#include "uni_platform.h" #include "uni_version.h" #ifndef CONFIG_IDF_TARGET_ESP32 diff --git a/src/components/bluepad32/uni_platform_unijoysticle.c b/src/components/bluepad32/platform/uni_platform_unijoysticle.c similarity index 99% rename from src/components/bluepad32/uni_platform_unijoysticle.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle.c index a16f8769..1d1e1906 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle.c @@ -18,7 +18,7 @@ limitations under the License. // Unijoysticle platform -#include "uni_platform_unijoysticle.h" +#include "platform/uni_platform_unijoysticle.h" #include #include @@ -37,11 +37,19 @@ limitations under the License. #include #include +#include "sdkconfig.h" + +#include "bt/uni_bt.h" #include "cmd_system.h" #include "hid_usage.h" -#include "sdkconfig.h" +#include "platform/uni_platform.h" +#include "platform/uni_platform_unijoysticle_2.h" +#include "platform/uni_platform_unijoysticle_2plus.h" +#include "platform/uni_platform_unijoysticle_800xl.h" +#include "platform/uni_platform_unijoysticle_a500.h" +#include "platform/uni_platform_unijoysticle_c64.h" +#include "platform/uni_platform_unijoysticle_singleport.h" #include "uni_balance_board.h" -#include "uni_bt.h" #include "uni_common.h" #include "uni_config.h" #include "uni_controller.h" @@ -53,13 +61,6 @@ limitations under the License. #include "uni_keyboard.h" #include "uni_log.h" #include "uni_mouse_quadrature.h" -#include "uni_platform.h" -#include "uni_platform_unijoysticle_2.h" -#include "uni_platform_unijoysticle_2plus.h" -#include "uni_platform_unijoysticle_800xl.h" -#include "uni_platform_unijoysticle_a500.h" -#include "uni_platform_unijoysticle_c64.h" -#include "uni_platform_unijoysticle_singleport.h" #include "uni_property.h" #include "uni_version.h" diff --git a/src/components/bluepad32/uni_platform_unijoysticle_2.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_2.c similarity index 97% rename from src/components/bluepad32/uni_platform_unijoysticle_2.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_2.c index a968942f..20aaa414 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_2.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_2.c @@ -16,9 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform_unijoysticle_2.h" +#include "platform/uni_platform_unijoysticle_2.h" #include "sdkconfig.h" + #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_platform_unijoysticle_2plus.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_2plus.c similarity index 97% rename from src/components/bluepad32/uni_platform_unijoysticle_2plus.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_2plus.c index 160df239..03d636d9 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_2plus.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_2plus.c @@ -16,9 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform_unijoysticle_2plus.h" +#include "platform/uni_platform_unijoysticle_2plus.h" #include "sdkconfig.h" + #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_platform_unijoysticle_800xl.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_800xl.c similarity index 97% rename from src/components/bluepad32/uni_platform_unijoysticle_800xl.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_800xl.c index b10f9705..9014d547 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_800xl.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_800xl.c @@ -18,9 +18,10 @@ limitations under the License. // Unijoysticle platform -#include "uni_platform_unijoysticle_800xl.h" +#include "platform/uni_platform_unijoysticle_800xl.h" #include "sdkconfig.h" + #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_platform_unijoysticle_a500.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_a500.c similarity index 96% rename from src/components/bluepad32/uni_platform_unijoysticle_a500.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_a500.c index ddd73de9..1849d615 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_a500.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_a500.c @@ -18,7 +18,7 @@ limitations under the License. // Unijoysticle platform -#include "uni_platform_unijoysticle_a500.h" +#include "platform/uni_platform_unijoysticle_a500.h" #include @@ -27,13 +27,14 @@ limitations under the License. #include #include "sdkconfig.h" + +#include "platform/uni_platform_unijoysticle.h" #include "uni_common.h" #include "uni_config.h" #include "uni_gamepad.h" #include "uni_hid_device.h" #include "uni_log.h" #include "uni_mouse_quadrature.h" -#include "uni_platform_unijoysticle.h" #include "uni_property.h" // --- Function declaration diff --git a/src/components/bluepad32/uni_platform_unijoysticle_c64.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_c64.c similarity index 99% rename from src/components/bluepad32/uni_platform_unijoysticle_c64.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_c64.c index a178e5a6..89f6c3ad 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_c64.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_c64.c @@ -20,7 +20,7 @@ limitations under the License. // Paddle code from: // https://github.com/LeifBloomquist/JoystickEmulator/blob/master/Arduino/PaddleEmulator/PaddleEmulator.ino -#include "uni_platform_unijoysticle_c64.h" +#include "platform/uni_platform_unijoysticle_c64.h" #include @@ -31,10 +31,11 @@ limitations under the License. #include #include "sdkconfig.h" + +#include "platform/uni_platform_unijoysticle.h" #include "uni_common.h" #include "uni_gpio.h" #include "uni_log.h" -#include "uni_platform_unijoysticle.h" #include "uni_property.h" #define TASK_SYNC_IRQ_PRIO (9) diff --git a/src/components/bluepad32/uni_platform_unijoysticle_singleport.c b/src/components/bluepad32/platform/uni_platform_unijoysticle_singleport.c similarity index 97% rename from src/components/bluepad32/uni_platform_unijoysticle_singleport.c rename to src/components/bluepad32/platform/uni_platform_unijoysticle_singleport.c index f879eea2..7153f255 100644 --- a/src/components/bluepad32/uni_platform_unijoysticle_singleport.c +++ b/src/components/bluepad32/platform/uni_platform_unijoysticle_singleport.c @@ -16,9 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. ****************************************************************************/ -#include "uni_platform_unijoysticle_singleport.h" +#include "platform/uni_platform_unijoysticle_singleport.h" #include "sdkconfig.h" + #include "uni_common.h" #include "uni_config.h" #include "uni_log.h" diff --git a/src/components/bluepad32/uni_console.c b/src/components/bluepad32/uni_console.c index d596130c..a167be31 100644 --- a/src/components/bluepad32/uni_console.c +++ b/src/components/bluepad32/uni_console.c @@ -29,15 +29,16 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_bt.h" -#include "uni_bt_allowlist.h" -#include "uni_bt_le.h" + +#include "bt/uni_bt.h" +#include "bt/uni_bt_allowlist.h" +#include "bt/uni_bt_le.h" +#include "platform/uni_platform.h" #include "uni_common.h" #include "uni_gpio.h" #include "uni_hid_device.h" #include "uni_log.h" #include "uni_mouse_quadrature.h" -#include "uni_platform.h" #include "uni_virtual_device.h" static const char* TAG = "console"; diff --git a/src/components/bluepad32/uni_hid_device.c b/src/components/bluepad32/uni_hid_device.c index b05d9fd2..ba076a13 100644 --- a/src/components/bluepad32/uni_hid_device.c +++ b/src/components/bluepad32/uni_hid_device.c @@ -22,35 +22,36 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_bt_bredr.h" -#include "uni_bt_defines.h" -#include "uni_bt_le.h" + +#include "bt/uni_bt_bredr.h" +#include "bt/uni_bt_defines.h" +#include "bt/uni_bt_le.h" +#include "parser/uni_hid_parser_8bitdo.h" +#include "parser/uni_hid_parser_android.h" +#include "parser/uni_hid_parser_atari.h" +#include "parser/uni_hid_parser_ds3.h" +#include "parser/uni_hid_parser_ds4.h" +#include "parser/uni_hid_parser_ds5.h" +#include "parser/uni_hid_parser_generic.h" +#include "parser/uni_hid_parser_icade.h" +#include "parser/uni_hid_parser_keyboard.h" +#include "parser/uni_hid_parser_mouse.h" +#include "parser/uni_hid_parser_nimbus.h" +#include "parser/uni_hid_parser_ouya.h" +#include "parser/uni_hid_parser_psmove.h" +#include "parser/uni_hid_parser_smarttvremote.h" +#include "parser/uni_hid_parser_steam.h" +#include "parser/uni_hid_parser_switch.h" +#include "parser/uni_hid_parser_wii.h" +#include "parser/uni_hid_parser_xboxone.h" +#include "platform/uni_platform.h" #include "uni_circular_buffer.h" #include "uni_common.h" #include "uni_config.h" #include "uni_controller.h" #include "uni_gamepad.h" #include "uni_hid_device_vendors.h" -#include "uni_hid_parser_8bitdo.h" -#include "uni_hid_parser_android.h" -#include "uni_hid_parser_atari.h" -#include "uni_hid_parser_ds3.h" -#include "uni_hid_parser_ds4.h" -#include "uni_hid_parser_ds5.h" -#include "uni_hid_parser_generic.h" -#include "uni_hid_parser_icade.h" -#include "uni_hid_parser_keyboard.h" -#include "uni_hid_parser_mouse.h" -#include "uni_hid_parser_nimbus.h" -#include "uni_hid_parser_ouya.h" -#include "uni_hid_parser_psmove.h" -#include "uni_hid_parser_smarttvremote.h" -#include "uni_hid_parser_steam.h" -#include "uni_hid_parser_switch.h" -#include "uni_hid_parser_wii.h" -#include "uni_hid_parser_xboxone.h" #include "uni_log.h" -#include "uni_platform.h" #include "uni_virtual_device.h" enum { diff --git a/src/components/bluepad32/uni_init.c b/src/components/bluepad32/uni_init.c index 05efe6d8..7bcf8f47 100644 --- a/src/components/bluepad32/uni_init.c +++ b/src/components/bluepad32/uni_init.c @@ -19,14 +19,15 @@ limitations under the License. #include "uni_init.h" #include "sdkconfig.h" -#include "uni_bt_allowlist.h" -#include "uni_bt_setup.h" + +#include "bt/uni_bt_allowlist.h" +#include "bt/uni_bt_setup.h" +#include "platform/uni_platform.h" #include "uni_config.h" #include "uni_console.h" #include "uni_esp32.h" #include "uni_hid_device.h" #include "uni_log.h" -#include "uni_platform.h" #include "uni_property.h" #include "uni_version.h" #include "uni_virtual_device.h" diff --git a/src/main/main.c b/src/main/main.c index cd2ebd45..de5c1de1 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -21,8 +21,7 @@ limitations under the License. #include #include "sdkconfig.h" -#include "uni_init.h" -#include "uni_platform.h" +#include #ifndef CONFIG_BLUEPAD32_PLATFORM_ARDUINO