Skip to content

Commit c1b30ec

Browse files
authored
Merge pull request #8 from balanceTWK/master_temp
[update] infrared receive pin
2 parents 209d077 + b08c911 commit c1b30ec

File tree

7 files changed

+973
-268
lines changed

7 files changed

+973
-268
lines changed

examples/05_basic_ir/.config

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# RT-Thread Kernel
88
#
99
CONFIG_RT_NAME_MAX=8
10+
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
1011
# CONFIG_RT_USING_SMP is not set
1112
CONFIG_RT_ALIGN_SIZE=4
1213
# CONFIG_RT_THREAD_PRIORITY_8 is not set
@@ -109,6 +110,7 @@ CONFIG_FINSH_ARG_MAX=10
109110
#
110111
CONFIG_RT_USING_DEVICE_IPC=y
111112
CONFIG_RT_PIPE_BUFSZ=512
113+
# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
112114
CONFIG_RT_USING_SERIAL=y
113115
CONFIG_RT_SERIAL_USING_DMA=y
114116
CONFIG_RT_SERIAL_RB_BUFSZ=64
@@ -156,6 +158,11 @@ CONFIG_RT_USING_PWM=y
156158
#
157159
# CONFIG_RT_USING_SAL is not set
158160

161+
#
162+
# Network interface device
163+
#
164+
# CONFIG_RT_USING_NETDEV is not set
165+
159166
#
160167
# light weight TCP/IP stack
161168
#
@@ -179,7 +186,6 @@ CONFIG_RT_USING_PWM=y
179186
#
180187
# Utilities
181188
#
182-
# CONFIG_RT_USING_LOGTRACE is not set
183189
# CONFIG_RT_USING_RYM is not set
184190
# CONFIG_RT_USING_ULOG is not set
185191
# CONFIG_RT_USING_UTEST is not set
@@ -199,6 +205,7 @@ CONFIG_RT_USING_PWM=y
199205
# CONFIG_PKG_USING_CJSON is not set
200206
# CONFIG_PKG_USING_JSMN is not set
201207
# CONFIG_PKG_USING_LIBMODBUS is not set
208+
# CONFIG_PKG_USING_FREEMODBUS is not set
202209
# CONFIG_PKG_USING_LJSON is not set
203210
# CONFIG_PKG_USING_EZXML is not set
204211
# CONFIG_PKG_USING_NANOPB is not set
@@ -221,6 +228,7 @@ CONFIG_RT_USING_PWM=y
221228
# CONFIG_PKG_USING_NOPOLL is not set
222229
# CONFIG_PKG_USING_NETUTILS is not set
223230
# CONFIG_PKG_USING_AT_DEVICE is not set
231+
# CONFIG_PKG_USING_ATSRV_SOCKET is not set
224232
# CONFIG_PKG_USING_WIZNET is not set
225233

226234
#
@@ -230,9 +238,14 @@ CONFIG_RT_USING_PWM=y
230238
# CONFIG_PKG_USING_GAGENT_CLOUD is not set
231239
# CONFIG_PKG_USING_ALI_IOTKIT is not set
232240
# CONFIG_PKG_USING_AZURE is not set
233-
# CONFIG_PKG_USING_TENCENT_IOTKIT is not set
241+
# CONFIG_PKG_USING_TENCENT_IOTHUB is not set
234242
# CONFIG_PKG_USING_NIMBLE is not set
235243
# CONFIG_PKG_USING_OTA_DOWNLOADER is not set
244+
# CONFIG_PKG_USING_IPMSG is not set
245+
# CONFIG_PKG_USING_LSSDP is not set
246+
# CONFIG_PKG_USING_AIRKISS_OPEN is not set
247+
# CONFIG_PKG_USING_LIBRWS is not set
248+
# CONFIG_PKG_USING_TCPSERVER is not set
236249

237250
#
238251
# security packages
@@ -254,6 +267,7 @@ CONFIG_RT_USING_PWM=y
254267
# CONFIG_PKG_USING_OPENMV is not set
255268
# CONFIG_PKG_USING_MUPDF is not set
256269
# CONFIG_PKG_USING_STEMWIN is not set
270+
# CONFIG_PKG_USING_WAVPLAYER is not set
257271

258272
#
259273
# tools packages
@@ -282,23 +296,23 @@ CONFIG_RT_USING_PWM=y
282296
# CONFIG_PKG_USING_CMSIS is not set
283297
# CONFIG_PKG_USING_DFS_YAFFS is not set
284298
# CONFIG_PKG_USING_LITTLEFS is not set
299+
# CONFIG_PKG_USING_THREAD_POOL is not set
300+
# CONFIG_PKG_USING_ROBOTS is not set
285301

286302
#
287303
# peripheral libraries and drivers
288304
#
289305
# CONFIG_PKG_USING_SENSORS_DRIVERS is not set
290306
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
291307
# CONFIG_PKG_USING_SHT2X is not set
292-
# CONFIG_PKG_USING_AHT10 is not set
293-
# CONFIG_PKG_USING_AP3216C is not set
294308
# CONFIG_PKG_USING_STM32_SDIO is not set
295309
# CONFIG_PKG_USING_ICM20608 is not set
296310
# CONFIG_PKG_USING_U8G2 is not set
297311
# CONFIG_PKG_USING_BUTTON is not set
298-
# CONFIG_PKG_USING_MPU6XXX is not set
299312
# CONFIG_PKG_USING_PCF8574 is not set
300313
# CONFIG_PKG_USING_SX12XX is not set
301314
# CONFIG_PKG_USING_SIGNAL_LED is not set
315+
# CONFIG_PKG_USING_LEDBLINK is not set
302316
# CONFIG_PKG_USING_WM_LIBRARIES is not set
303317
# CONFIG_PKG_USING_KENDRYTE_SDK is not set
304318
CONFIG_PKG_USING_INFRARED=y
@@ -308,17 +322,29 @@ CONFIG_PKG_INFRARED_PATH="/packages/peripherals/infrared"
308322
# Select infrared decoder
309323
#
310324
CONFIG_INFRARED_NEC_DECODER=y
325+
CONFIG_NEC_DEVIATION=100
326+
CONFIG_PKG_USING_DRV_INFRARED=y
311327
CONFIG_INFRARED_SEND=y
312328
CONFIG_INFRARED_SEND_PWM="pwm3"
313329
CONFIG_INFRARED_PWM_DEV_CHANNEL=3
314330
CONFIG_INFRARED_SEND_HWTIMER="timer15"
315331
CONFIG_INFRARED_MAX_SEND_SIZE=1000
316332
CONFIG_INFRARED_RECEIVE=y
317-
CONFIG_INFRARED_RECEIVE_PIN=36
333+
CONFIG_INFRARED_RECEIVE_PIN=17
318334
CONFIG_INFRARED_RECEIVE_HWTIMER="timer16"
319-
CONFIG_PKG_USING_INFRARED_V010=y
335+
# CONFIG_PKG_USING_INFRARED_V010 is not set
336+
CONFIG_PKG_USING_INFRARED_V011=y
320337
# CONFIG_PKG_USING_INFRARED_LATEST_VERSION is not set
321-
CONFIG_PKG_INFRARED_VER="v0.1.0"
338+
CONFIG_PKG_INFRARED_VER="v0.1.1"
339+
# CONFIG_PKG_USING_ROSSERIAL is not set
340+
# CONFIG_PKG_USING_AT24CXX is not set
341+
# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set
342+
# CONFIG_PKG_USING_AD7746 is not set
343+
# CONFIG_PKG_USING_PCA9685 is not set
344+
# CONFIG_PKG_USING_I2C_TOOLS is not set
345+
# CONFIG_PKG_USING_NRF24L01 is not set
346+
# CONFIG_PKG_USING_TOUCH_DRIVERS is not set
347+
# CONFIG_PKG_USING_LCD_DRIVERS is not set
322348

323349
#
324350
# miscellaneous packages
@@ -334,6 +360,7 @@ CONFIG_PKG_INFRARED_VER="v0.1.0"
334360
# CONFIG_PKG_USING_DSTR is not set
335361
# CONFIG_PKG_USING_TINYFRAME is not set
336362
# CONFIG_PKG_USING_KENDRYTE_DEMO is not set
363+
# CONFIG_PKG_USING_DIGITALCTRL is not set
337364

338365
#
339366
# samples: kernel and components samples
@@ -345,34 +372,7 @@ CONFIG_PKG_INFRARED_VER="v0.1.0"
345372
# CONFIG_PKG_USING_HELLO is not set
346373
# CONFIG_PKG_USING_VI is not set
347374
# CONFIG_PKG_USING_NNOM is not set
348-
349-
#
350-
# Privated Packages of RealThread
351-
#
352-
# CONFIG_PKG_USING_CODEC is not set
353-
# CONFIG_PKG_USING_PLAYER is not set
354-
# CONFIG_PKG_USING_MPLAYER is not set
355-
# CONFIG_PKG_USING_PERSIMMON_SRC is not set
356-
# CONFIG_PKG_USING_JS_PERSIMMON is not set
357-
# CONFIG_PKG_USING_JERRYSCRIPT_WIN32 is not set
358-
359-
#
360-
# Network Utilities
361-
#
362-
# CONFIG_PKG_USING_WICED is not set
363-
# CONFIG_PKG_USING_CLOUDSDK is not set
364-
# CONFIG_PKG_USING_COREMARK is not set
365-
# CONFIG_PKG_USING_POWER_MANAGER is not set
366-
# CONFIG_PKG_USING_RT_OTA is not set
367-
# CONFIG_PKG_USING_RDBD_SRC is not set
368-
# CONFIG_PKG_USING_RTINSIGHT is not set
369-
# CONFIG_PKG_USING_SMARTCONFIG is not set
370-
# CONFIG_PKG_USING_RTX is not set
371-
# CONFIG_RT_USING_TESTCASE is not set
372-
# CONFIG_PKG_USING_NGHTTP2 is not set
373-
# CONFIG_PKG_USING_AVS is not set
374-
# CONFIG_PKG_USING_STS is not set
375-
# CONFIG_PKG_USING_DLMS is not set
375+
# CONFIG_PKG_USING_LIBANN is not set
376376

377377
#
378378
# Hardware Drivers Config
@@ -409,10 +409,12 @@ CONFIG_BSP_UART_USING_DMA_RX=y
409409
# CONFIG_BSP_USING_SDIO is not set
410410
CONFIG_BSP_USING_GPIO=y
411411
# CONFIG_BSP_USING_PM is not set
412+
# CONFIG_BSP_USING_ADC1_CH13 is not set
412413
CONFIG_BSP_USING_PWM3_CH3=y
413414
CONFIG_BSP_USING_TIM15=y
414415
CONFIG_BSP_USING_TIM16=y
415416
# CONFIG_BSP_USING_USBD is not set
417+
# CONFIG_BSP_USING_WDT is not set
416418

417419
#
418420
# External Libraries

examples/05_basic_ir/project.ewp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -342,15 +342,15 @@
342342
<name>CCIncludePath2</name>
343343
<state />
344344
<state>$PROJ_DIR$\..\..\drivers</state>
345-
<state>$PROJ_DIR$\packages\infrared-v0.1.0\inc</state>
345+
<state>$PROJ_DIR$\..\..\rt-thread\include</state>
346346
<state>$PROJ_DIR$\..\..\libraries\CMSIS\Device\ST\STM32L4xx\Include</state>
347347
<state>$PROJ_DIR$\..\..\rt-thread\libcpu\arm\cortex-m4</state>
348348
<state>$PROJ_DIR$\.</state>
349349
<state>$PROJ_DIR$\..\..\rt-thread\libcpu\arm\common</state>
350350
<state>$PROJ_DIR$\applications</state>
351351
<state>$PROJ_DIR$\..\..\libraries\STM32L4xx_HAL_Driver\inc</state>
352352
<state>$PROJ_DIR$\..\..\rt-thread\components\finsh</state>
353-
<state>$PROJ_DIR$\..\..\rt-thread\include</state>
353+
<state>$PROJ_DIR$\packages\infrared-v0.1.1\inc</state>
354354
<state>$PROJ_DIR$\..\..\rt-thread\components\drivers\include</state>
355355
<state>$PROJ_DIR$\..\..\libraries\CMSIS\Include</state>
356356
</option>
@@ -1369,15 +1369,15 @@
13691369
<name>CCIncludePath2</name>
13701370
<state />
13711371
<state>$PROJ_DIR$\..\..\drivers</state>
1372-
<state>$PROJ_DIR$\packages\infrared-v0.1.0\inc</state>
1372+
<state>$PROJ_DIR$\..\..\rt-thread\include</state>
13731373
<state>$PROJ_DIR$\..\..\libraries\CMSIS\Device\ST\STM32L4xx\Include</state>
13741374
<state>$PROJ_DIR$\..\..\rt-thread\libcpu\arm\cortex-m4</state>
13751375
<state>$PROJ_DIR$\.</state>
13761376
<state>$PROJ_DIR$\..\..\rt-thread\libcpu\arm\common</state>
13771377
<state>$PROJ_DIR$\applications</state>
13781378
<state>$PROJ_DIR$\..\..\libraries\STM32L4xx_HAL_Driver\inc</state>
13791379
<state>$PROJ_DIR$\..\..\rt-thread\components\finsh</state>
1380-
<state>$PROJ_DIR$\..\..\rt-thread\include</state>
1380+
<state>$PROJ_DIR$\packages\infrared-v0.1.1\inc</state>
13811381
<state>$PROJ_DIR$\..\..\rt-thread\components\drivers\include</state>
13821382
<state>$PROJ_DIR$\..\..\libraries\CMSIS\Include</state>
13831383
</option>
@@ -2114,13 +2114,13 @@
21142114
<group>
21152115
<name>Infrared_frame</name>
21162116
<file>
2117-
<name>$PROJ_DIR$\packages\infrared-v0.1.0\src\infrared.c</name>
2117+
<name>$PROJ_DIR$\packages\infrared-v0.1.1\src\infrared.c</name>
21182118
</file>
21192119
<file>
2120-
<name>$PROJ_DIR$\packages\infrared-v0.1.0\src\drv_infrared.c</name>
2120+
<name>$PROJ_DIR$\packages\infrared-v0.1.1\src\nec_decoder.c</name>
21212121
</file>
21222122
<file>
2123-
<name>$PROJ_DIR$\packages\infrared-v0.1.0\src\nec_decoder.c</name>
2123+
<name>$PROJ_DIR$\packages\infrared-v0.1.1\src\drv_infrared.c</name>
21242124
</file>
21252125
</group>
21262126
<group>

0 commit comments

Comments
 (0)