diff --git a/Example/ADC_Demo/Libraries/doc/version.txt b/Example/ADC_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/ADC_Demo/Libraries/doc/version.txt +++ b/Example/ADC_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/ADC_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/ADC_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/ADC_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/ADC_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/ADC_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/ADC_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/ADC_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/ADC_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/doc/version.txt b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/doc/version.txt +++ b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Cpu1_Handles_Interrupts_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Dual_Core_Demo/Libraries/doc/version.txt b/Example/Dual_Core_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Dual_Core_Demo/Libraries/doc/version.txt +++ b/Example/Dual_Core_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Dual_Core_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Dual_Core_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Dual_Core_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Dual_Core_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Dual_Core_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Dual_Core_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Dual_Core_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Dual_Core_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/EEPROM_Demo/Libraries/doc/version.txt b/Example/EEPROM_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/EEPROM_Demo/Libraries/doc/version.txt +++ b/Example/EEPROM_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/EEPROM_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/EEPROM_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/EEPROM_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/EEPROM_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/EEPROM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/EEPROM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/EEPROM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/EEPROM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Encoder_Demo/Libraries/doc/version.txt b/Example/Encoder_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Encoder_Demo/Libraries/doc/version.txt +++ b/Example/Encoder_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Encoder_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Encoder_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Encoder_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Encoder_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Encoder_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Encoder_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Encoder_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Encoder_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/FFT_Demo/Libraries/doc/version.txt b/Example/FFT_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/FFT_Demo/Libraries/doc/version.txt +++ b/Example/FFT_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/FFT_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/FFT_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/FFT_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/FFT_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/FFT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/FFT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/FFT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/FFT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/GPIO_Interrupt_Demo/Libraries/doc/version.txt b/Example/GPIO_Interrupt_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/GPIO_Interrupt_Demo/Libraries/doc/version.txt +++ b/Example/GPIO_Interrupt_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/GPIO_Interrupt_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/GPIO_Interrupt_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/GPIO_Interrupt_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/GPIO_Interrupt_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/GPIO_Interrupt_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/GPIO_Interrupt_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/GPIO_Interrupt_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/GPIO_Interrupt_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Interrupt_Priority_Set_Demo/Libraries/doc/version.txt b/Example/Interrupt_Priority_Set_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Interrupt_Priority_Set_Demo/Libraries/doc/version.txt +++ b/Example/Interrupt_Priority_Set_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Interrupt_Priority_Set_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/LED_Blink_Demo/Libraries/doc/version.txt b/Example/LED_Blink_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/LED_Blink_Demo/Libraries/doc/version.txt +++ b/Example/LED_Blink_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/LED_Blink_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/LED_Blink_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/LED_Blink_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/LED_Blink_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/LED_Blink_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/LED_Blink_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/LED_Blink_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/LED_Blink_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/PIT_Demo/Libraries/doc/version.txt b/Example/PIT_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/PIT_Demo/Libraries/doc/version.txt +++ b/Example/PIT_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/PIT_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/PIT_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/PIT_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/PIT_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/PIT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/PIT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/PIT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/PIT_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/PWM_Demo/Libraries/doc/version.txt b/Example/PWM_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/PWM_Demo/Libraries/doc/version.txt +++ b/Example/PWM_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/PWM_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/PWM_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/PWM_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/PWM_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/PWM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/PWM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/PWM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/PWM_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Printf_Demo/Libraries/doc/version.txt b/Example/Printf_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Printf_Demo/Libraries/doc/version.txt +++ b/Example/Printf_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Printf_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Printf_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Printf_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Printf_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Printf_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Printf_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Printf_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Printf_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/doc/version.txt b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/doc/version.txt +++ b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Specifies_Variable_Or_Code_Location_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/Systick_Demo/Libraries/doc/version.txt b/Example/Systick_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/Systick_Demo/Libraries/doc/version.txt +++ b/Example/Systick_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/Systick_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/Systick_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/Systick_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/Systick_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/Systick_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/Systick_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/Systick_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/Systick_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Example/UART_Demo/Libraries/doc/version.txt b/Example/UART_Demo/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Example/UART_Demo/Libraries/doc/version.txt +++ b/Example/UART_Demo/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Example/UART_Demo/Libraries/seekfree_libraries/zf_uart.c b/Example/UART_Demo/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Example/UART_Demo/Libraries/seekfree_libraries/zf_uart.c +++ b/Example/UART_Demo/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Example/UART_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Example/UART_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Example/UART_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Example/UART_Demo/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void); diff --git a/Seekfree_TC264_Opensource_Library/Libraries/doc/version.txt b/Seekfree_TC264_Opensource_Library/Libraries/doc/version.txt index 11ab82e..9d395a4 100644 --- a/Seekfree_TC264_Opensource_Library/Libraries/doc/version.txt +++ b/Seekfree_TC264_Opensource_Library/Libraries/doc/version.txt @@ -1,3 +1,6 @@ +V1.2.1 + 解决printf关闭的时候,编译报错的问题 + V1.2.0 增加CH9141蓝牙转串口模块的驱动 添加无线类型的枚举变量 diff --git a/Seekfree_TC264_Opensource_Library/Libraries/seekfree_libraries/zf_uart.c b/Seekfree_TC264_Opensource_Library/Libraries/seekfree_libraries/zf_uart.c index 0e0162e..271b5b0 100644 --- a/Seekfree_TC264_Opensource_Library/Libraries/seekfree_libraries/zf_uart.c +++ b/Seekfree_TC264_Opensource_Library/Libraries/seekfree_libraries/zf_uart.c @@ -351,6 +351,7 @@ uint8 uart_query(UARTN_enum uartn, uint8 *dat) return 0; } +#if(1 == PRINTF_ENABLE) //------------------------------------------------------------------------------------------------------------------- // @brief 重定义printf 到串口 // @param ch 需要打印的字节 @@ -362,4 +363,5 @@ int fputc(int ch, FILE *stream) uart_putchar(DEBUG_UART, (char)ch); return(ch); } +#endif diff --git a/Seekfree_TC264_Opensource_Library/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h b/Seekfree_TC264_Opensource_Library/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h index 2961771..b5559e4 100644 --- a/Seekfree_TC264_Opensource_Library/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h +++ b/Seekfree_TC264_Opensource_Library/Libraries/seekfree_peripheral/SEEKFREE_BLUETOOTH_CH9141.h @@ -78,6 +78,7 @@ typedef enum extern uint8 uart_flag; extern uint8 uart_data; +extern uint8 mac_address[17]; //本机mac地址 void bluetooth_ch9141_uart_callback(void); void bluetooth_ch9141_enter_at_mode(void);