From 1eeb84f019f0c38ee15c567dc8c212e2e3b3a588 Mon Sep 17 00:00:00 2001 From: Liang Hao Date: Fri, 8 Dec 2023 15:01:13 +0800 Subject: [PATCH] update the README files in examples/esp_joystick --- .../CMakeLists.txt | 2 +- .../{joystick_controler => joystick_controller}/README.md | 2 +- .../README_cn.md | 8 ++++---- .../main/CMakeLists.txt | 2 +- .../main/app/app_ble_hid.c | 0 .../main/app/app_ble_hid.h | 0 .../main/app/app_button.c | 0 .../main/app/app_button.h | 0 .../main/app/app_nvs_flash.c | 0 .../main/app/app_nvs_flash.h | 0 .../main/app/app_rocker.c | 0 .../main/app/app_rocker.h | 0 .../main/app/app_touch.c | 0 .../main/app/app_touch.h | 0 .../main/app/app_usb_hid.c | 0 .../main/app/app_usb_hid.h | 0 .../main/app/esp_hid_gap.c | 0 .../main/app/esp_hid_gap.h | 0 .../main/app/espnow_ctrl.c | 0 .../main/app/espnow_ctrl.h | 0 .../main/app_ui_event.c | 0 .../main/app_ui_event.h | 0 .../main/idf_component.yml | 0 .../main/joystick_controller_main.c} | 0 .../main/ui/CMakeLists.txt | 0 .../main/ui/README.md | 0 .../main/ui/filelist.txt | 0 .../main/ui/fonts/ui_font_SourceHanSansCN14.c | 0 .../main/ui/fonts/ui_font_SourceHanSansCN20.c | 0 .../main/ui/images/ui_img_ble_28_png.c | 0 .../main/ui/images/ui_img_ble_icon_20px_png.c | 0 .../main/ui/images/ui_img_brilliance_28_png.c | 0 .../main/ui/images/ui_img_down_btn_png.c | 0 .../main/ui/images/ui_img_espnow_bind_png.c | 0 .../main/ui/images/ui_img_game_pad_app_png.c | 0 .../main/ui/images/ui_img_left_btn_png.c | 0 .../main/ui/images/ui_img_nes_app_png.c | 0 .../main/ui/images/ui_img_rc_app_png.c | 0 .../main/ui/images/ui_img_return_btn_16px_png.c | 0 .../main/ui/images/ui_img_right_btn_png.c | 0 .../main/ui/images/ui_img_setting_app_png.c | 0 .../main/ui/images/ui_img_setting_icon_20px_png.c | 0 .../main/ui/images/ui_img_up_btn_png.c | 0 .../main/ui/images/ui_img_usb_28_png.c | 0 .../main/ui/images/ui_img_usb_icon_20px_png.c | 0 .../main/ui/images/ui_img_vibration_28_png.c | 0 .../main/ui/images/ui_img_volume_ctrl_26_png.c | 0 .../main/ui/images/ui_img_wifi_28_png.c | 0 .../main/ui/images/ui_img_wifi_icon_18px_png.c | 0 .../main/ui/screens/ui_GamePadAppScreen.c | 0 .../main/ui/screens/ui_GamePadAppSettingScreen.c | 0 .../main/ui/screens/ui_RcAppScreen.c | 0 .../main/ui/screens/ui_mainScreen.c | 0 .../main/ui/ui.c | 0 .../main/ui/ui.h | 0 .../main/ui/ui_events.h | 0 .../main/ui/ui_helpers.c | 0 .../main/ui/ui_helpers.h | 0 .../partitions.csv | 0 .../sdkconfig.defaults | 0 examples/esp_joystick/joystick_rc_receiver/README.md | 2 +- examples/esp_joystick/joystick_rc_receiver/README_cn.md | 4 ++-- tools/ci/check_copyright_config.yaml | 8 ++++---- 63 files changed, 14 insertions(+), 14 deletions(-) rename examples/esp_joystick/{joystick_controler => joystick_controller}/CMakeLists.txt (94%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/README.md (99%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/README_cn.md (95%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/CMakeLists.txt (72%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_ble_hid.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_ble_hid.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_button.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_button.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_nvs_flash.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_nvs_flash.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_rocker.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_rocker.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_touch.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_touch.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_usb_hid.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/app_usb_hid.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/esp_hid_gap.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/esp_hid_gap.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/espnow_ctrl.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app/espnow_ctrl.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app_ui_event.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/app_ui_event.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/idf_component.yml (100%) rename examples/esp_joystick/{joystick_controler/main/joystick_controler_main.c => joystick_controller/main/joystick_controller_main.c} (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/CMakeLists.txt (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/README.md (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/filelist.txt (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/fonts/ui_font_SourceHanSansCN14.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/fonts/ui_font_SourceHanSansCN20.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_ble_28_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_ble_icon_20px_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_brilliance_28_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_down_btn_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_espnow_bind_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_game_pad_app_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_left_btn_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_nes_app_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_rc_app_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_return_btn_16px_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_right_btn_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_setting_app_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_setting_icon_20px_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_up_btn_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_usb_28_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_usb_icon_20px_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_vibration_28_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_volume_ctrl_26_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_wifi_28_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/images/ui_img_wifi_icon_18px_png.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/screens/ui_GamePadAppScreen.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/screens/ui_GamePadAppSettingScreen.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/screens/ui_RcAppScreen.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/screens/ui_mainScreen.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/ui.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/ui.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/ui_events.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/ui_helpers.c (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/main/ui/ui_helpers.h (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/partitions.csv (100%) rename examples/esp_joystick/{joystick_controler => joystick_controller}/sdkconfig.defaults (100%) diff --git a/examples/esp_joystick/joystick_controler/CMakeLists.txt b/examples/esp_joystick/joystick_controller/CMakeLists.txt similarity index 94% rename from examples/esp_joystick/joystick_controler/CMakeLists.txt rename to examples/esp_joystick/joystick_controller/CMakeLists.txt index 527b7d2..5931060 100644 --- a/examples/esp_joystick/joystick_controler/CMakeLists.txt +++ b/examples/esp_joystick/joystick_controller/CMakeLists.txt @@ -8,4 +8,4 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) add_compile_options("-Wno-format" "-Wno-deprecated-declarations" "-Wno-unused-variable") -project(joystick_controler) +project(joystick_controller) diff --git a/examples/esp_joystick/joystick_controler/README.md b/examples/esp_joystick/joystick_controller/README.md similarity index 99% rename from examples/esp_joystick/joystick_controler/README.md rename to examples/esp_joystick/joystick_controller/README.md index e8c18e3..3bbfae9 100644 --- a/examples/esp_joystick/joystick_controler/README.md +++ b/examples/esp_joystick/joystick_controller/README.md @@ -1,5 +1,5 @@ -# JoyStick-Controler Example +# JoyStick-Controller Example [[中文]](README_cn.md) diff --git a/examples/esp_joystick/joystick_controler/README_cn.md b/examples/esp_joystick/joystick_controller/README_cn.md similarity index 95% rename from examples/esp_joystick/joystick_controler/README_cn.md rename to examples/esp_joystick/joystick_controller/README_cn.md index 1b71752..270ec50 100644 --- a/examples/esp_joystick/joystick_controler/README_cn.md +++ b/examples/esp_joystick/joystick_controller/README_cn.md @@ -1,5 +1,5 @@ -# JoyStick-Controler Example +# JoyStick-Controller Example [[English]](README.md) @@ -21,7 +21,7 @@ ## 项目概述 -ESP-JoyStick 硬件系统由 ESP32-S3-BOX-3 开发板、 JoyStick 手柄和 ESP32-S3-USB-Bridge 接收机三部分组成。ESP32-S3-BOX-3 作为主控制器,通过 PCIe 接口与 JoyStick 手柄进行连接。系统在“游戏模式”和“遥控模式”下运行。在游戏模式下,它支持 USB-HID 和 BLE-HID 协议,用于控制计算机游戏,以及 NES 模拟器模式。在 RC 遥控模式下,它利用 ESP-NOW 无线通信协议与 [ESP32-S3-USB-Bridge](https://docs.espressif.com/projects/espressif-esp-dev-kits/zh_CN/latest/esp32s3/esp32-s3-usb-bridge/user_guide.html)(购买链接:[淘宝](https://item.taobao.com/item.htm?ft=t&id=753321694177)或[速卖通](https://www.aliexpress.us/item/3256806114330511.html?gatewayAdapt=glo2usa4itemAdapt))或其他 Expressif 开发板(这里的 ESP32-S3-USB-Bridge 或其他 Expressif 开发板作为航模接收机)进行配对,实现 [RC 遥控车](examples/esp_joystick/joystick_rc_receiver)和 [ESP-Drone](https://docs.espressif.com/projects/espressif-esp-drone/en/latest/gettingstarted.html) 四轴飞行器的无线控制。 +ESP-JoyStick 硬件系统由 ESP32-S3-BOX-3 开发板、 JoyStick 手柄和 ESP32-S3-USB-Bridge 接收机三部分组成。ESP32-S3-BOX-3 作为主控制器,通过 PCIe 接口与 JoyStick 手柄进行连接。系统在“游戏模式”和“遥控模式”下运行。在游戏模式下,它支持 USB-HID 和 BLE-HID 协议,用于控制计算机游戏,以及 NES 模拟器模式。在 RC 遥控模式下,它利用 ESP-NOW 无线通信协议与 [ESP32-S3-USB-Bridge](https://docs.espressif.com/projects/espressif-esp-dev-kits/zh_CN/latest/esp32s3/esp32-s3-usb-bridge/user_guide.html)(购买链接:[淘宝](https://item.taobao.com/item.htm?ft=t&id=753321694177)或[速卖通](https://www.aliexpress.us/item/3256806114330511.html?gatewayAdapt=glo2usa4itemAdapt))或其他 Espressif 开发板(这里的 ESP32-S3-USB-Bridge 或其他 Espressif 开发板作为航模接收机)进行配对,实现 [RC 遥控车](examples/esp_joystick/joystick_rc_receiver)和 [ESP-Drone](https://docs.espressif.com/projects/espressif-esp-drone/en/latest/gettingstarted.html) 四轴飞行器的无线控制。
@@ -42,12 +42,12 @@ ESP-JoyStick 硬件系统由 ESP32-S3-BOX-3 开发板、 JoyStick 手柄和 ESP3
-

ESP-JoyStick 遥控ESP-Droneo小飞机

+

ESP-JoyStick 遥控 ESP-Drone 小飞机

-

ESP-JoyStick 控制RC遥控车

+

ESP-JoyStick 控制 RC 遥控车

## 硬件参考 diff --git a/examples/esp_joystick/joystick_controler/main/CMakeLists.txt b/examples/esp_joystick/joystick_controller/main/CMakeLists.txt similarity index 72% rename from examples/esp_joystick/joystick_controler/main/CMakeLists.txt rename to examples/esp_joystick/joystick_controller/main/CMakeLists.txt index 39ac67e..769ac7d 100644 --- a/examples/esp_joystick/joystick_controler/main/CMakeLists.txt +++ b/examples/esp_joystick/joystick_controller/main/CMakeLists.txt @@ -1,7 +1,7 @@ #Add sources from ui directory file(GLOB_RECURSE SRC_UI ${CMAKE_SOURCE_DIR} "ui/*.c" "app/*.c") -idf_component_register(SRCS "joystick_controler_main.c" "app_ui_event.c" ${SRC_UI} +idf_component_register(SRCS "joystick_controller_main.c" "app_ui_event.c" ${SRC_UI} INCLUDE_DIRS "." "ui" "app") target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-const-variable) diff --git a/examples/esp_joystick/joystick_controler/main/app/app_ble_hid.c b/examples/esp_joystick/joystick_controller/main/app/app_ble_hid.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_ble_hid.c rename to examples/esp_joystick/joystick_controller/main/app/app_ble_hid.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_ble_hid.h b/examples/esp_joystick/joystick_controller/main/app/app_ble_hid.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_ble_hid.h rename to examples/esp_joystick/joystick_controller/main/app/app_ble_hid.h diff --git a/examples/esp_joystick/joystick_controler/main/app/app_button.c b/examples/esp_joystick/joystick_controller/main/app/app_button.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_button.c rename to examples/esp_joystick/joystick_controller/main/app/app_button.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_button.h b/examples/esp_joystick/joystick_controller/main/app/app_button.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_button.h rename to examples/esp_joystick/joystick_controller/main/app/app_button.h diff --git a/examples/esp_joystick/joystick_controler/main/app/app_nvs_flash.c b/examples/esp_joystick/joystick_controller/main/app/app_nvs_flash.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_nvs_flash.c rename to examples/esp_joystick/joystick_controller/main/app/app_nvs_flash.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_nvs_flash.h b/examples/esp_joystick/joystick_controller/main/app/app_nvs_flash.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_nvs_flash.h rename to examples/esp_joystick/joystick_controller/main/app/app_nvs_flash.h diff --git a/examples/esp_joystick/joystick_controler/main/app/app_rocker.c b/examples/esp_joystick/joystick_controller/main/app/app_rocker.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_rocker.c rename to examples/esp_joystick/joystick_controller/main/app/app_rocker.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_rocker.h b/examples/esp_joystick/joystick_controller/main/app/app_rocker.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_rocker.h rename to examples/esp_joystick/joystick_controller/main/app/app_rocker.h diff --git a/examples/esp_joystick/joystick_controler/main/app/app_touch.c b/examples/esp_joystick/joystick_controller/main/app/app_touch.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_touch.c rename to examples/esp_joystick/joystick_controller/main/app/app_touch.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_touch.h b/examples/esp_joystick/joystick_controller/main/app/app_touch.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_touch.h rename to examples/esp_joystick/joystick_controller/main/app/app_touch.h diff --git a/examples/esp_joystick/joystick_controler/main/app/app_usb_hid.c b/examples/esp_joystick/joystick_controller/main/app/app_usb_hid.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_usb_hid.c rename to examples/esp_joystick/joystick_controller/main/app/app_usb_hid.c diff --git a/examples/esp_joystick/joystick_controler/main/app/app_usb_hid.h b/examples/esp_joystick/joystick_controller/main/app/app_usb_hid.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/app_usb_hid.h rename to examples/esp_joystick/joystick_controller/main/app/app_usb_hid.h diff --git a/examples/esp_joystick/joystick_controler/main/app/esp_hid_gap.c b/examples/esp_joystick/joystick_controller/main/app/esp_hid_gap.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/esp_hid_gap.c rename to examples/esp_joystick/joystick_controller/main/app/esp_hid_gap.c diff --git a/examples/esp_joystick/joystick_controler/main/app/esp_hid_gap.h b/examples/esp_joystick/joystick_controller/main/app/esp_hid_gap.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/esp_hid_gap.h rename to examples/esp_joystick/joystick_controller/main/app/esp_hid_gap.h diff --git a/examples/esp_joystick/joystick_controler/main/app/espnow_ctrl.c b/examples/esp_joystick/joystick_controller/main/app/espnow_ctrl.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/espnow_ctrl.c rename to examples/esp_joystick/joystick_controller/main/app/espnow_ctrl.c diff --git a/examples/esp_joystick/joystick_controler/main/app/espnow_ctrl.h b/examples/esp_joystick/joystick_controller/main/app/espnow_ctrl.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app/espnow_ctrl.h rename to examples/esp_joystick/joystick_controller/main/app/espnow_ctrl.h diff --git a/examples/esp_joystick/joystick_controler/main/app_ui_event.c b/examples/esp_joystick/joystick_controller/main/app_ui_event.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app_ui_event.c rename to examples/esp_joystick/joystick_controller/main/app_ui_event.c diff --git a/examples/esp_joystick/joystick_controler/main/app_ui_event.h b/examples/esp_joystick/joystick_controller/main/app_ui_event.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/app_ui_event.h rename to examples/esp_joystick/joystick_controller/main/app_ui_event.h diff --git a/examples/esp_joystick/joystick_controler/main/idf_component.yml b/examples/esp_joystick/joystick_controller/main/idf_component.yml similarity index 100% rename from examples/esp_joystick/joystick_controler/main/idf_component.yml rename to examples/esp_joystick/joystick_controller/main/idf_component.yml diff --git a/examples/esp_joystick/joystick_controler/main/joystick_controler_main.c b/examples/esp_joystick/joystick_controller/main/joystick_controller_main.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/joystick_controler_main.c rename to examples/esp_joystick/joystick_controller/main/joystick_controller_main.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/CMakeLists.txt b/examples/esp_joystick/joystick_controller/main/ui/CMakeLists.txt similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/CMakeLists.txt rename to examples/esp_joystick/joystick_controller/main/ui/CMakeLists.txt diff --git a/examples/esp_joystick/joystick_controler/main/ui/README.md b/examples/esp_joystick/joystick_controller/main/ui/README.md similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/README.md rename to examples/esp_joystick/joystick_controller/main/ui/README.md diff --git a/examples/esp_joystick/joystick_controler/main/ui/filelist.txt b/examples/esp_joystick/joystick_controller/main/ui/filelist.txt similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/filelist.txt rename to examples/esp_joystick/joystick_controller/main/ui/filelist.txt diff --git a/examples/esp_joystick/joystick_controler/main/ui/fonts/ui_font_SourceHanSansCN14.c b/examples/esp_joystick/joystick_controller/main/ui/fonts/ui_font_SourceHanSansCN14.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/fonts/ui_font_SourceHanSansCN14.c rename to examples/esp_joystick/joystick_controller/main/ui/fonts/ui_font_SourceHanSansCN14.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/fonts/ui_font_SourceHanSansCN20.c b/examples/esp_joystick/joystick_controller/main/ui/fonts/ui_font_SourceHanSansCN20.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/fonts/ui_font_SourceHanSansCN20.c rename to examples/esp_joystick/joystick_controller/main/ui/fonts/ui_font_SourceHanSansCN20.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_ble_28_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_ble_28_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_ble_28_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_ble_28_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_ble_icon_20px_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_ble_icon_20px_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_ble_icon_20px_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_ble_icon_20px_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_brilliance_28_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_brilliance_28_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_brilliance_28_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_brilliance_28_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_down_btn_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_down_btn_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_down_btn_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_down_btn_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_espnow_bind_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_espnow_bind_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_espnow_bind_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_espnow_bind_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_game_pad_app_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_game_pad_app_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_game_pad_app_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_game_pad_app_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_left_btn_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_left_btn_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_left_btn_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_left_btn_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_nes_app_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_nes_app_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_nes_app_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_nes_app_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_rc_app_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_rc_app_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_rc_app_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_rc_app_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_return_btn_16px_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_return_btn_16px_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_return_btn_16px_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_return_btn_16px_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_right_btn_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_right_btn_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_right_btn_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_right_btn_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_setting_app_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_setting_app_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_setting_app_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_setting_app_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_setting_icon_20px_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_setting_icon_20px_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_setting_icon_20px_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_setting_icon_20px_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_up_btn_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_up_btn_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_up_btn_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_up_btn_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_usb_28_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_usb_28_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_usb_28_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_usb_28_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_usb_icon_20px_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_usb_icon_20px_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_usb_icon_20px_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_usb_icon_20px_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_vibration_28_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_vibration_28_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_vibration_28_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_vibration_28_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_volume_ctrl_26_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_volume_ctrl_26_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_volume_ctrl_26_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_volume_ctrl_26_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_wifi_28_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_wifi_28_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_wifi_28_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_wifi_28_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/images/ui_img_wifi_icon_18px_png.c b/examples/esp_joystick/joystick_controller/main/ui/images/ui_img_wifi_icon_18px_png.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/images/ui_img_wifi_icon_18px_png.c rename to examples/esp_joystick/joystick_controller/main/ui/images/ui_img_wifi_icon_18px_png.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/screens/ui_GamePadAppScreen.c b/examples/esp_joystick/joystick_controller/main/ui/screens/ui_GamePadAppScreen.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/screens/ui_GamePadAppScreen.c rename to examples/esp_joystick/joystick_controller/main/ui/screens/ui_GamePadAppScreen.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/screens/ui_GamePadAppSettingScreen.c b/examples/esp_joystick/joystick_controller/main/ui/screens/ui_GamePadAppSettingScreen.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/screens/ui_GamePadAppSettingScreen.c rename to examples/esp_joystick/joystick_controller/main/ui/screens/ui_GamePadAppSettingScreen.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/screens/ui_RcAppScreen.c b/examples/esp_joystick/joystick_controller/main/ui/screens/ui_RcAppScreen.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/screens/ui_RcAppScreen.c rename to examples/esp_joystick/joystick_controller/main/ui/screens/ui_RcAppScreen.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/screens/ui_mainScreen.c b/examples/esp_joystick/joystick_controller/main/ui/screens/ui_mainScreen.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/screens/ui_mainScreen.c rename to examples/esp_joystick/joystick_controller/main/ui/screens/ui_mainScreen.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/ui.c b/examples/esp_joystick/joystick_controller/main/ui/ui.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/ui.c rename to examples/esp_joystick/joystick_controller/main/ui/ui.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/ui.h b/examples/esp_joystick/joystick_controller/main/ui/ui.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/ui.h rename to examples/esp_joystick/joystick_controller/main/ui/ui.h diff --git a/examples/esp_joystick/joystick_controler/main/ui/ui_events.h b/examples/esp_joystick/joystick_controller/main/ui/ui_events.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/ui_events.h rename to examples/esp_joystick/joystick_controller/main/ui/ui_events.h diff --git a/examples/esp_joystick/joystick_controler/main/ui/ui_helpers.c b/examples/esp_joystick/joystick_controller/main/ui/ui_helpers.c similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/ui_helpers.c rename to examples/esp_joystick/joystick_controller/main/ui/ui_helpers.c diff --git a/examples/esp_joystick/joystick_controler/main/ui/ui_helpers.h b/examples/esp_joystick/joystick_controller/main/ui/ui_helpers.h similarity index 100% rename from examples/esp_joystick/joystick_controler/main/ui/ui_helpers.h rename to examples/esp_joystick/joystick_controller/main/ui/ui_helpers.h diff --git a/examples/esp_joystick/joystick_controler/partitions.csv b/examples/esp_joystick/joystick_controller/partitions.csv similarity index 100% rename from examples/esp_joystick/joystick_controler/partitions.csv rename to examples/esp_joystick/joystick_controller/partitions.csv diff --git a/examples/esp_joystick/joystick_controler/sdkconfig.defaults b/examples/esp_joystick/joystick_controller/sdkconfig.defaults similarity index 100% rename from examples/esp_joystick/joystick_controler/sdkconfig.defaults rename to examples/esp_joystick/joystick_controller/sdkconfig.defaults diff --git a/examples/esp_joystick/joystick_rc_receiver/README.md b/examples/esp_joystick/joystick_rc_receiver/README.md index c853c66..41f5252 100644 --- a/examples/esp_joystick/joystick_rc_receiver/README.md +++ b/examples/esp_joystick/joystick_rc_receiver/README.md @@ -2,7 +2,7 @@ [[中文]](README_cn.md) -This example represents the model aircraft receiver functionality module for the [ESP-JoyStick](examples/esp_joystick/joystick_controler) project. Using this sample program, you can control an RC remote control car with the following effects: +This example represents the model aircraft receiver functionality module for the [ESP-JoyStick](examples/esp_joystick/joystick_controller) project. Using this sample program, you can control an RC remote control car with the following effects: * Upon successful pairing and connection with ESP-JoyStick through ESP-NOW, the RGB indicator light turns green for 1 second and then turns off. When not paired, the RGB indicator light remains solid red. * Pushing the left joystick up/down makes the car move forward/backward. diff --git a/examples/esp_joystick/joystick_rc_receiver/README_cn.md b/examples/esp_joystick/joystick_rc_receiver/README_cn.md index 1a4ede1..94deca1 100644 --- a/examples/esp_joystick/joystick_rc_receiver/README_cn.md +++ b/examples/esp_joystick/joystick_rc_receiver/README_cn.md @@ -2,7 +2,7 @@ [[English]](README.md) -该示例为 [ESP-JoyStick](examples/esp_joystick/joystick_controler) 项目的航模接收机功能模块,使用该示例程序可实现对 RC 遥控车的控制,控制效果如下: +该示例为 [ESP-JoyStick](examples/esp_joystick/joystick_controller) 项目的航模接收机功能模块,使用该示例程序可实现对 RC 遥控车的控制,控制效果如下: * 通过 ESP-NOW 与 ESP-JoyStick 配对连接成功后,RGB 指示灯亮绿灯;未配对连接时,RGB指示灯红灯常亮。 * 左侧摇杆向上/向下推,小车前进/后退。 @@ -13,7 +13,7 @@
-

ESP-JoyStick 控制RC遥控车

+

ESP-JoyStick 控制 RC 遥控车

## 硬件说明 diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index 4dd2ad0..fefe72e 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -56,7 +56,7 @@ ignore: # You can also select ignoring files here - examples/usb_camera_lcd_display/components/esp_jpeg/ - examples/watering_demo/main/gui/font/ - examples/watering_demo/main/gui/image/ - - examples/esp_joystick/joystick_controler/main/ui/fonts - - examples/esp_joystick/joystick_controler/main/ui/images - - examples/esp_joystick/joystick_controler/main/ui - - examples/esp_joystick/joystick_controler/pictures + - examples/esp_joystick/joystick_controller/main/ui/fonts + - examples/esp_joystick/joystick_controller/main/ui/images + - examples/esp_joystick/joystick_controller/main/ui + - examples/esp_joystick/joystick_controller/pictures