diff --git a/.config b/.config index 85bf121..c571cd0 100644 --- a/.config +++ b/.config @@ -776,33 +776,7 @@ CONFIG_PKG_CJSON_VER="v1.7.17" # # LVGL: powerful and easy-to-use embedded GUI library # -CONFIG_PKG_USING_LVGL=y -CONFIG_PKG_LVGL_PATH="/packages/multimedia/LVGL/LVGL" -CONFIG_PKG_LVGL_THREAD_PRIO=20 -CONFIG_PKG_LVGL_THREAD_STACK_SIZE=4096 -CONFIG_PKG_LVGL_DISP_REFR_PERIOD=5 -# CONFIG_PKG_USING_LVGL_SQUARELINE is not set -# CONFIG_PKG_LVGL_USING_EXAMPLES is not set -CONFIG_PKG_LVGL_USING_DEMOS=y -CONFIG_PKG_LVGL_USING_V080311=y -# CONFIG_PKG_LVGL_USING_V080310 is not set -# CONFIG_PKG_LVGL_USING_V08039 is not set -# CONFIG_PKG_LVGL_USING_V08038 is not set -# CONFIG_PKG_LVGL_USING_V08037 is not set -# CONFIG_PKG_LVGL_USING_V08036 is not set -# CONFIG_PKG_LVGL_USING_V08035 is not set -# CONFIG_PKG_LVGL_USING_V08034 is not set -# CONFIG_PKG_LVGL_USING_V08033 is not set -# CONFIG_PKG_LVGL_USING_V08032 is not set -# CONFIG_PKG_LVGL_USING_V08031 is not set -# CONFIG_PKG_LVGL_USING_V08030 is not set -# CONFIG_PKG_LVGL_USING_V08020 is not set -# CONFIG_PKG_LVGL_USING_V8_3_LATEST_VERSION is not set -# CONFIG_PKG_LVGL_USING_V09000 is not set -# CONFIG_PKG_LVGL_USING_V09010 is not set -# CONFIG_PKG_LVGL_USING_LATEST_VERSION is not set -CONFIG_PKG_LVGL_VER_NUM=0x080311 -CONFIG_PKG_LVGL_VER="v8.3.11" +# CONFIG_PKG_USING_LVGL is not set # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set # CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set # end of LVGL: powerful and easy-to-use embedded GUI library @@ -1161,7 +1135,29 @@ CONFIG_PKG_ICM20608_VER="latest" # CONFIG_PKG_USING_LEDBLINK is not set # CONFIG_PKG_USING_LITTLED is not set # CONFIG_PKG_USING_LKDGUI is not set -# CONFIG_PKG_USING_INFRARED is not set +CONFIG_PKG_USING_INFRARED=y +CONFIG_PKG_INFRARED_PATH="/packages/peripherals/infrared" + +# +# Select infrared decoder +# +CONFIG_INFRARED_NEC_DECODER=y +CONFIG_NEC_DEVIATION=100 +# end of Select infrared decoder + +CONFIG_PKG_USING_DRV_INFRARED=y +CONFIG_INFRARED_SEND=y +CONFIG_INFRARED_SEND_PWM="pwm4" +CONFIG_INFRARED_PWM_DEV_CHANNEL=3 +CONFIG_INFRARED_SEND_HWTIMER="timer15" +CONFIG_INFRARED_MAX_SEND_SIZE=1000 +CONFIG_INFRARED_RECEIVE=y +CONFIG_INFRARED_RECEIVE_PIN=17 +CONFIG_INFRARED_RECEIVE_HWTIMER="timer16" +# CONFIG_PKG_USING_INFRARED_V010 is not set +# CONFIG_PKG_USING_INFRARED_V011 is not set +CONFIG_PKG_USING_INFRARED_LATEST_VERSION=y +CONFIG_PKG_INFRARED_VER="latest" # CONFIG_PKG_USING_MULTI_INFRARED is not set # CONFIG_PKG_USING_AGILE_BUTTON is not set # CONFIG_PKG_USING_AGILE_LED is not set diff --git a/my_error/README.md b/my_error/README.md index b0f6eb8..f80a2d0 100644 --- a/my_error/README.md +++ b/my_error/README.md @@ -1,2 +1,7 @@ ![语法错误图](syntax_env1.5.png) -换了env2就可以? \ No newline at end of file +换了env2就可以? + +![alt text](image-1.png) +移出来+头文件可以编译 +但 +![alt text](image.png) \ No newline at end of file diff --git a/my_error/image-1.png b/my_error/image-1.png new file mode 100644 index 0000000..c69c136 Binary files /dev/null and b/my_error/image-1.png differ diff --git a/my_error/image.png b/my_error/image.png new file mode 100644 index 0000000..f687dba Binary files /dev/null and b/my_error/image.png differ diff --git a/rt-thread/components/drivers/include/drivers/hwtimer.h b/rt-thread/components/drivers/include/hwtimer.h similarity index 100% rename from rt-thread/components/drivers/include/drivers/hwtimer.h rename to rt-thread/components/drivers/include/hwtimer.h diff --git a/rtconfig.h b/rtconfig.h index 132389b..4a4edc0 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -417,13 +417,6 @@ /* LVGL: powerful and easy-to-use embedded GUI library */ -#define PKG_USING_LVGL -#define PKG_LVGL_THREAD_PRIO 20 -#define PKG_LVGL_THREAD_STACK_SIZE 4096 -#define PKG_LVGL_DISP_REFR_PERIOD 5 -#define PKG_LVGL_USING_DEMOS -#define PKG_LVGL_USING_V080311 -#define PKG_LVGL_VER_NUM 0x080311 /* end of LVGL: powerful and easy-to-use embedded GUI library */ /* u8g2: a monochrome graphic library */ @@ -497,6 +490,23 @@ /* touch drivers */ /* end of touch drivers */ +#define PKG_USING_INFRARED + +/* Select infrared decoder */ + +#define INFRARED_NEC_DECODER +#define NEC_DEVIATION 100 +/* end of Select infrared decoder */ +#define PKG_USING_DRV_INFRARED +#define INFRARED_SEND +#define INFRARED_SEND_PWM "pwm4" +#define INFRARED_PWM_DEV_CHANNEL 3 +#define INFRARED_SEND_HWTIMER "timer15" +#define INFRARED_MAX_SEND_SIZE 1000 +#define INFRARED_RECEIVE +#define INFRARED_RECEIVE_PIN 17 +#define INFRARED_RECEIVE_HWTIMER "timer16" +#define PKG_USING_INFRARED_LATEST_VERSION /* end of peripheral libraries and drivers */ /* AI packages */