diff --git a/.config b/.config index 7424769..e75c088 100644 --- a/.config +++ b/.config @@ -270,7 +270,7 @@ CONFIG_RT_WLAN_WORKQUEUE_THREAD_PRIO=15 # CONFIG_RT_USING_VIRTIO is not set CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_KTIME is not set -# CONFIG_RT_USING_HWTIMER is not set +CONFIG_RT_USING_HWTIMER=y # CONFIG_RT_USING_CHERRYUSB is not set # end of Device Drivers @@ -1146,10 +1146,14 @@ CONFIG_NEC_DEVIATION=100 # end of Select infrared decoder CONFIG_PKG_USING_DRV_INFRARED=y -# CONFIG_INFRARED_SEND is not set +CONFIG_INFRARED_SEND=y +CONFIG_INFRARED_SEND_PWM="pwm3" +CONFIG_INFRARED_PWM_DEV_CHANNEL=4 +CONFIG_INFRARED_SEND_HWTIMER="timer13" +CONFIG_INFRARED_MAX_SEND_SIZE=1000 CONFIG_INFRARED_RECEIVE=y -CONFIG_INFRARED_RECEIVE_PIN=17 -CONFIG_INFRARED_RECEIVE_HWTIMER="timer16" +CONFIG_INFRARED_RECEIVE_PIN=88 +CONFIG_INFRARED_RECEIVE_HWTIMER="timer14" # CONFIG_PKG_USING_INFRARED_V010 is not set CONFIG_PKG_USING_INFRARED_V011=y # CONFIG_PKG_USING_INFRARED_LATEST_VERSION is not set @@ -1641,7 +1645,10 @@ CONFIG_BSP_USING_UART1=y CONFIG_BSP_USING_UART6=y # CONFIG_BSP_UART6_RX_USING_DMA is not set # CONFIG_BSP_UART6_TX_USING_DMA is not set -# CONFIG_BSP_USING_TIM is not set +CONFIG_BSP_USING_TIM=y +# CONFIG_BSP_USING_TIM11 is not set +CONFIG_BSP_USING_TIM13=y +CONFIG_BSP_USING_TIM14=y CONFIG_BSP_USING_PWM=y # CONFIG_BSP_USING_PWM1 is not set # CONFIG_BSP_USING_PWM2 is not set diff --git a/my_error/README.md b/my_error/README.md index f44ae2a..1731d45 100644 --- a/my_error/README.md +++ b/my_error/README.md @@ -8,7 +8,14 @@ 但 ![alt text](image.png) 对照示例0.1.1版什么都不用做,也不会报错什么没定义 -.config/rtconfig.h +对比.config/rtconfig.h +但发了红外线也没反应…… +再加回接收、发送 +又是没定义 +对比.config/rtconfig.h +调整好pin,timer,#define ***timer +总算可以了 + ### GET_PIN(F, 11) 的头文件 ``` c diff --git a/my_pro/myirfrared.c b/my_pro/myinfrared.c similarity index 100% rename from my_pro/myirfrared.c rename to my_pro/myinfrared.c diff --git a/rtconfig.h b/rtconfig.h index 27d9fe0..1945822 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -173,6 +173,7 @@ #define RT_WLAN_WORKQUEUE_THREAD_SIZE 2048 #define RT_WLAN_WORKQUEUE_THREAD_PRIO 15 #define RT_USING_PIN +#define RT_USING_HWTIMER /* end of Device Drivers */ /* C/C++ and POSIX layer */ @@ -498,9 +499,14 @@ #define NEC_DEVIATION 100 /* end of Select infrared decoder */ #define PKG_USING_DRV_INFRARED +#define INFRARED_SEND +#define INFRARED_SEND_PWM "pwm3" +#define INFRARED_PWM_DEV_CHANNEL 4 +#define INFRARED_SEND_HWTIMER "timer13" +#define INFRARED_MAX_SEND_SIZE 1000 #define INFRARED_RECEIVE -#define INFRARED_RECEIVE_PIN 17 -#define INFRARED_RECEIVE_HWTIMER "timer16" +#define INFRARED_RECEIVE_PIN 88 +#define INFRARED_RECEIVE_HWTIMER "timer14" #define PKG_USING_INFRARED_V011 /* end of peripheral libraries and drivers */ @@ -617,6 +623,9 @@ #define BSP_USING_UART #define BSP_USING_UART1 #define BSP_USING_UART6 +#define BSP_USING_TIM +#define BSP_USING_TIM13 +#define BSP_USING_TIM14 #define BSP_USING_PWM #define BSP_USING_PWM3 #define BSP_USING_PWM3_CH2