diff --git a/project/example/ble/ble_peripheral/app/src/RF433.h b/project/example/ble/ble_peripheral/app/src/RF433.h index a49d9ee..6366932 100644 --- a/project/example/ble/ble_peripheral/app/src/RF433.h +++ b/project/example/ble/ble_peripheral/app/src/RF433.h @@ -100,7 +100,7 @@ #define RF_DATA xc_gpio_read_pin(RF433_PIN) //RF433接收引脚,根据具体单片机定义引脚 -#define RF433_PIN GPIO_18 //RF433接收引脚,与DWM11硬件配置一致 +#define RF433_PIN GPIO_5 //RF433接收引脚,根据具体单片机定义引脚 #define RF_dd GPIO_0 // diff --git a/project/example/ble/ble_peripheral/app/src/arch_main.c b/project/example/ble/ble_peripheral/app/src/arch_main.c index 73fcdb1..66635e3 100644 --- a/project/example/ble/ble_peripheral/app/src/arch_main.c +++ b/project/example/ble/ble_peripheral/app/src/arch_main.c @@ -453,9 +453,9 @@ int main(void) // gpio_pullup_input_inter_test(); adc_Init(); external_key_init(); - /* Keep GPIO18 RF433 initialization last, after debug UART setup. */ + /* Keep RF433 GPIO initialization after the other input setup. */ rf433_gpio_init(); - /* Clear UART-to-GPIO transition pulses after GPIO18 is stable. */ + /* Clear any startup transition pulses after RF433 GPIO is stable. */ rf433_decoder_init(); while (1){ //DEBUG("222\r\n"); diff --git a/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.axf b/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.axf index 35f23a1..64b6cf8 100644 Binary files a/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.axf and b/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.axf differ diff --git a/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.build_log.htm b/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.build_log.htm index 7321d9d..2019162 100644 --- a/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.build_log.htm +++ b/project/example/ble/ble_peripheral/mdk/Objects/Xinc_ble_sdk.build_log.htm @@ -60,44 +60,6 @@ compiling external_key.c... ..\app\src\RF433.h(190): warning: #1295-D: Deprecated declaration Encoder_key - give arg types void Encoder_key(); ..\app\src\external_key.c: 15 warnings, 0 errors -compiling uart.c... -..\app\src\RF433.h(185): warning: #1295-D: Deprecated declaration rf433_receive - give arg types - void rf433_receive(); -..\app\src\RF433.h(186): warning: #1295-D: Deprecated declaration rf433_gpio_init - give arg types - void rf433_gpio_init(); -..\app\src\RF433.h(187): warning: #1295-D: Deprecated declaration scan_433 - give arg types - void scan_433(); -..\app\src\RF433.h(188): warning: #1295-D: Deprecated declaration Lock_Pwm7xd - give arg types - void Lock_Pwm7xd(); -..\app\src\RF433.h(189): warning: #1295-D: Deprecated declaration Delay_50us - give arg types - void Delay_50us(); -..\app\src\RF433.h(190): warning: #1295-D: Deprecated declaration Encoder_key - give arg types - void Encoder_key(); -..\app\src\pwm.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types - void _PWM_INIT(); -..\app\src\pwm.h(143): warning: #1295-D: Deprecated declaration adc_Init - give arg types - void adc_Init(); -..\app\src\pwm.h(144): warning: #1295-D: Deprecated declaration My_ADC_Get_Value - give arg types - void My_ADC_Get_Value(); -..\app\src\pwm.h(145): warning: #1295-D: Deprecated declaration gpio_pullup_input_inter_test - give arg types - void gpio_pullup_input_inter_test(); -..\app\src\mode.h(43): warning: #1295-D: Deprecated declaration choice_mode - give arg types - void choice_mode(); -..\app\src\mode.h(44): warning: #1295-D: Deprecated declaration set_mode - give arg types - void set_mode(); -..\app\src\mode.h(45): warning: #1295-D: Deprecated declaration Start_PWM - give arg types - void Start_PWM(); -..\app\src\mode.h(46): warning: #1295-D: Deprecated declaration Stop_PWM - give arg types - void Stop_PWM(); -..\app\src\mode.h(47): warning: #1295-D: Deprecated declaration Set_timing - give arg types - void Set_timing(); -..\app\src\uart.c(153): warning: #223-D: function "temperature" declared implicitly - temperature(user_rx_buf[1]); -..\app\src\uart.c(90): warning: #177-D: variable "uart_handle" was declared but never referenced - uint8_t uart_handle = UART0_IDX; -..\app\src\uart.c(211): warning: #1-D: last line of file ends without a newline - -..\app\src\uart.c: 18 warnings, 0 errors compiling timer.c... ..\app\src\PWM.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types void _PWM_INIT(); @@ -172,30 +134,19 @@ compiling fmc_spi.c... ..\app\src\fmc_spi.c(234): warning: #167-D: argument of type "uint8_t (*)[256]" is incompatible with parameter of type "uint8_t *" xc_fmc_spi_flash_read_page(0x1E000,&r_data, FLASH_PAGE_SIZE); ..\app\src\fmc_spi.c: 20 warnings, 0 errors -compiling usr_server.c... -..\app\src\Mode.h(43): warning: #1295-D: Deprecated declaration choice_mode - give arg types - void choice_mode(); -..\app\src\Mode.h(44): warning: #1295-D: Deprecated declaration set_mode - give arg types - void set_mode(); -..\app\src\Mode.h(45): warning: #1295-D: Deprecated declaration Start_PWM - give arg types - void Start_PWM(); -..\app\src\Mode.h(46): warning: #1295-D: Deprecated declaration Stop_PWM - give arg types - void Stop_PWM(); -..\app\src\Mode.h(47): warning: #1295-D: Deprecated declaration Set_timing - give arg types - void Set_timing(); -..\app\src\PWM.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types - void _PWM_INIT(); -..\app\src\PWM.h(143): warning: #1295-D: Deprecated declaration adc_Init - give arg types - void adc_Init(); -..\app\src\PWM.h(144): warning: #1295-D: Deprecated declaration My_ADC_Get_Value - give arg types - void My_ADC_Get_Value(); -..\app\src\PWM.h(145): warning: #1295-D: Deprecated declaration gpio_pullup_input_inter_test - give arg types - void gpio_pullup_input_inter_test(); -..\app\src\usr_server.c(275): warning: #223-D: function "ble_callback" declared implicitly - ble_callback(co_buf_data(p_data)[0],co_buf_data(p_data)[1],co_buf_data(p_data)[2],co_buf_data(p_data)[3]); -..\app\src\usr_server.c: 10 warnings, 0 errors -compiling rgblight.c... -compiling Mode.c... +compiling uart.c... +..\app\src\RF433.h(185): warning: #1295-D: Deprecated declaration rf433_receive - give arg types + void rf433_receive(); +..\app\src\RF433.h(186): warning: #1295-D: Deprecated declaration rf433_gpio_init - give arg types + void rf433_gpio_init(); +..\app\src\RF433.h(187): warning: #1295-D: Deprecated declaration scan_433 - give arg types + void scan_433(); +..\app\src\RF433.h(188): warning: #1295-D: Deprecated declaration Lock_Pwm7xd - give arg types + void Lock_Pwm7xd(); +..\app\src\RF433.h(189): warning: #1295-D: Deprecated declaration Delay_50us - give arg types + void Delay_50us(); +..\app\src\RF433.h(190): warning: #1295-D: Deprecated declaration Encoder_key - give arg types + void Encoder_key(); ..\app\src\pwm.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types void _PWM_INIT(); ..\app\src\pwm.h(143): warning: #1295-D: Deprecated declaration adc_Init - give arg types @@ -214,19 +165,13 @@ compiling Mode.c... void Stop_PWM(); ..\app\src\mode.h(47): warning: #1295-D: Deprecated declaration Set_timing - give arg types void Set_timing(); -..\app\src\RF433.h(185): warning: #1295-D: Deprecated declaration rf433_receive - give arg types - void rf433_receive(); -..\app\src\RF433.h(186): warning: #1295-D: Deprecated declaration rf433_gpio_init - give arg types - void rf433_gpio_init(); -..\app\src\RF433.h(187): warning: #1295-D: Deprecated declaration scan_433 - give arg types - void scan_433(); -..\app\src\RF433.h(188): warning: #1295-D: Deprecated declaration Lock_Pwm7xd - give arg types - void Lock_Pwm7xd(); -..\app\src\RF433.h(189): warning: #1295-D: Deprecated declaration Delay_50us - give arg types - void Delay_50us(); -..\app\src\RF433.h(190): warning: #1295-D: Deprecated declaration Encoder_key - give arg types - void Encoder_key(); -..\app\src\Mode.c: 15 warnings, 0 errors +..\app\src\uart.c(153): warning: #223-D: function "temperature" declared implicitly + temperature(user_rx_buf[1]); +..\app\src\uart.c(90): warning: #177-D: variable "uart_handle" was declared but never referenced + uint8_t uart_handle = UART0_IDX; +..\app\src\uart.c(211): warning: #1-D: last line of file ends without a newline + +..\app\src\uart.c: 18 warnings, 0 errors compiling arch_main.c... ..\app\src\pwm.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types void _PWM_INIT(); @@ -351,6 +296,38 @@ compiling Rf433.c... ..\app\src\Rf433.c(24): warning: #177-D: variable "POWER_flag" was declared but never referenced static uint8_t POWER_flag; ..\app\src\Rf433.c: 17 warnings, 0 errors +compiling Mode.c... +..\app\src\pwm.h(137): warning: #1295-D: Deprecated declaration _PWM_INIT - give arg types + void _PWM_INIT(); +..\app\src\pwm.h(143): warning: #1295-D: Deprecated declaration adc_Init - give arg types + void adc_Init(); +..\app\src\pwm.h(144): warning: #1295-D: Deprecated declaration My_ADC_Get_Value - give arg types + void My_ADC_Get_Value(); +..\app\src\pwm.h(145): warning: #1295-D: Deprecated declaration gpio_pullup_input_inter_test - give arg types + void gpio_pullup_input_inter_test(); +..\app\src\mode.h(43): warning: #1295-D: Deprecated declaration choice_mode - give arg types + void choice_mode(); +..\app\src\mode.h(44): warning: #1295-D: Deprecated declaration set_mode - give arg types + void set_mode(); +..\app\src\mode.h(45): warning: #1295-D: Deprecated declaration Start_PWM - give arg types + void Start_PWM(); +..\app\src\mode.h(46): warning: #1295-D: Deprecated declaration Stop_PWM - give arg types + void Stop_PWM(); +..\app\src\mode.h(47): warning: #1295-D: Deprecated declaration Set_timing - give arg types + void Set_timing(); +..\app\src\RF433.h(185): warning: #1295-D: Deprecated declaration rf433_receive - give arg types + void rf433_receive(); +..\app\src\RF433.h(186): warning: #1295-D: Deprecated declaration rf433_gpio_init - give arg types + void rf433_gpio_init(); +..\app\src\RF433.h(187): warning: #1295-D: Deprecated declaration scan_433 - give arg types + void scan_433(); +..\app\src\RF433.h(188): warning: #1295-D: Deprecated declaration Lock_Pwm7xd - give arg types + void Lock_Pwm7xd(); +..\app\src\RF433.h(189): warning: #1295-D: Deprecated declaration Delay_50us - give arg types + void Delay_50us(); +..\app\src\RF433.h(190): warning: #1295-D: Deprecated declaration Encoder_key - give arg types + void Encoder_key(); +..\app\src\Mode.c: 15 warnings, 0 errors linking... Program Size: Code=32588 RO-data=2208 RW-data=2828 ZI-data=3856 FromELF: creating hex file... @@ -362,7 +339,7 @@ dual_xip Addr:13000 Size:0x88f8 BAddr:0x40000 - Acheck:0xfc8e6c80 + Acheck:0xf227e680 SoftVer:0x10 RomVer:0x20 LoadAddr:0x11013000 @@ -390,7 +367,7 @@ status2=1 updata file success ! 已复制 1 个文件。 已复制 1 个文件。 -".\Objects\Xinc_ble_sdk.axf" - 0 Error(s), 152 Warning(s). +".\Objects\Xinc_ble_sdk.axf" - 0 Error(s), 142 Warning(s).