diff --git a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.c b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.c +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.h b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.h +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.c b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.c +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.h b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.h +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数==================================================== diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.c b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.c index 1b445e5..47a6f17 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.c +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.c @@ -1188,7 +1188,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 2 - if(wifi_uart_connect_udp_transfer(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_MINE_PORT, WIFI_UART_SERIANET)) // 建立UDP连接 + if(wifi_uart_connect_udp_client(WIFI_UART_TARGET_IP, WIFI_UART_TARGET_PORT, WIFI_UART_LOCAL_PORT, WIFI_UART_COMMAND)) // 建立UDP连接 { zf_log(0, "connect UDP server failed"); return_state = 1; @@ -1196,7 +1196,7 @@ uint8 wifi_uart_init (char *wifi_ssid, char *pass_word, wifi_uart_mode_enum wifi } #endif #if WIFI_UART_AUTO_CONNECT == 3 - if(wifi_uart_creat_tcp_servers(WIFI_UART_MINE_PORT)) // 建立TCP服务器 + if(wifi_uart_entry_tcp_servers(WIFI_UART_LOCAL_PORT)) // 建立TCP服务器 { zf_log(0, "build TCP server failed"); return_state = 1; diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.h b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.h index 2291c88..a898b4b 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.h +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_uart.h @@ -59,7 +59,7 @@ #define WIFI_UART_RTS_PIN (P10_2) // 定义流控位引脚 指示当前模块是否可以接受数据 0-可以继续接收 1-不可以继续接收 #define WIFI_UART_HARDWARE_RST (1) // 定义是否使用硬件复位引脚 0-使用软件复位 1-使用硬件 RST #if WIFI_UART_HARDWARE_RST // 建议使用硬件复位引脚 否则容易出现单片机复位后无法正常初始化模块 -#define WIFI_UART_RST_PIN (P02_8) // 定义硬件复位引脚 +#define WIFI_UART_RST_PIN (P11_6) // 定义硬件复位引脚 #endif //=================================================WIFI_UART 驱动配置==================================================== @@ -71,7 +71,7 @@ #if (WIFI_UART_AUTO_CONNECT > 3) #error "WIFI_UART_AUTO_CONNECT 的值只能为 [0,1,2,3]" #else -#define WIFI_UART_TARGET_IP "192.168.2.152" // 连接目标的 IP +#define WIFI_UART_TARGET_IP "192.168.137.1" // 连接目标的 IP #define WIFI_UART_TARGET_PORT "8080" // 连接目标的端口 #define WIFI_UART_LOCAL_PORT "8080" // 本机端口 #endif diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.c b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.c index 87d503a..8ac76d5 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.c +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.c @@ -53,54 +53,54 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { - if (TIM2_ENCOEDER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; - else if (TIM2_ENCOEDER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; + if (TIM2_ENCODER_CH1_P00_7 == ch1_pin) ch1 = &IfxGpt120_T2INA_P00_7_IN; + else if (TIM2_ENCODER_CH1_P33_7 == ch1_pin) ch1 = &IfxGpt120_T2INB_P33_7_IN; else zf_assert(FALSE); - if (TIM2_ENCOEDER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; - else if (TIM2_ENCOEDER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; + if (TIM2_ENCODER_CH2_P00_8 == ch2_pin) ch2 = &IfxGpt120_T2EUDA_P00_8_IN; + else if (TIM2_ENCODER_CH2_P33_6 == ch2_pin) ch2 = &IfxGpt120_T2EUDB_P33_6_IN; else zf_assert(FALSE); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { - if (TIM3_ENCOEDER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; + if (TIM3_ENCODER_CH1_P02_6 == ch1_pin) ch1 = &IfxGpt120_T3INA_P02_6_IN; else zf_assert(FALSE); - if (TIM3_ENCOEDER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; + if (TIM3_ENCODER_CH2_P02_7 == ch2_pin) ch2 = &IfxGpt120_T3EUDA_P02_7_IN; else zf_assert(FALSE); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { - if (TIM4_ENCOEDER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; + if (TIM4_ENCODER_CH1_P02_8 == ch1_pin) ch1 = &IfxGpt120_T4INA_P02_8_IN; else zf_assert(FALSE); - if (TIM4_ENCOEDER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; - else if (TIM4_ENCOEDER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; + if (TIM4_ENCODER_CH2_P00_9 == ch2_pin) ch2 = &IfxGpt120_T4EUDA_P00_9_IN; + else if (TIM4_ENCODER_CH2_P33_5 == ch2_pin) ch2 = &IfxGpt120_T4EUDB_P33_5_IN; else zf_assert(FALSE); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { - if (TIM5_ENCOEDER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; - else if (TIM5_ENCOEDER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; + if (TIM5_ENCODER_CH1_P21_7 == ch1_pin) ch1 = &IfxGpt120_T5INA_P21_7_IN; + else if (TIM5_ENCODER_CH1_P10_3 == ch1_pin) ch1 = &IfxGpt120_T5INB_P10_3_IN; else zf_assert(FALSE); - if (TIM5_ENCOEDER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; - else if (TIM5_ENCOEDER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; + if (TIM5_ENCODER_CH2_P21_6 == ch2_pin) ch2 = &IfxGpt120_T5EUDA_P21_6_IN; + else if (TIM5_ENCODER_CH2_P10_1 == ch2_pin) ch2 = &IfxGpt120_T5EUDB_P10_1_IN; else zf_assert(FALSE); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { - if (TIM6_ENCOEDER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; - else if (TIM6_ENCOEDER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; + if (TIM6_ENCODER_CH1_P20_3 == ch1_pin) ch1 = &IfxGpt120_T6INA_P20_3_IN; + else if (TIM6_ENCODER_CH1_P10_2 == ch1_pin) ch1 = &IfxGpt120_T6INB_P10_2_IN; else zf_assert(FALSE); - if (TIM6_ENCOEDER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; + if (TIM6_ENCODER_CH2_P20_0 == ch2_pin) ch2 = &IfxGpt120_T6EUDA_P20_0_IN; else zf_assert(FALSE); }break; } @@ -116,7 +116,7 @@ static void encoder_mapping_set (encoder_index_enum encoder_n, encoder_channel1_ // 函数简介 编码器数据采集 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCOEDER); // 使用T2定时器 +// 使用示例 int16 speed; speed = encoder_get_count(TIM2_ENCODER); // 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- int16 encoder_get_count (encoder_index_enum encoder_n) @@ -124,11 +124,11 @@ int16 encoder_get_count (encoder_index_enum encoder_n) int16 encoder_data = 0; switch(encoder_n) { - case TIM2_ENCOEDER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; - case TIM3_ENCOEDER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; - case TIM4_ENCOEDER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; - case TIM5_ENCOEDER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; - case TIM6_ENCOEDER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; + case TIM2_ENCODER: encoder_data = (int16)IfxGpt12_T2_getTimerValue(&MODULE_GPT120); break; + case TIM3_ENCODER: encoder_data = (int16)IfxGpt12_T3_getTimerValue(&MODULE_GPT120); break; + case TIM4_ENCODER: encoder_data = (int16)IfxGpt12_T4_getTimerValue(&MODULE_GPT120); break; + case TIM5_ENCODER: encoder_data = (int16)IfxGpt12_T5_getTimerValue(&MODULE_GPT120); break; + case TIM6_ENCODER: encoder_data = (int16)IfxGpt12_T6_getTimerValue(&MODULE_GPT120); break; default: encoder_data = 0; } return encoder_data; @@ -137,18 +137,18 @@ int16 encoder_get_count (encoder_index_enum encoder_n) // 函数简介 编码器计数清除 // 参数说明 gptn 选择所使用的定时器 // 返回参数 void -// 使用示例 encoder_clear_count(TIM2_ENCOEDER);// 使用T2定时器 +// 使用示例 encoder_clear_count(TIM2_ENCODER);// 使用T2定时器 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_clear_count (encoder_index_enum encoder_n) { switch(encoder_n) { - case TIM2_ENCOEDER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; - case TIM3_ENCOEDER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; - case TIM4_ENCOEDER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; - case TIM5_ENCOEDER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; - case TIM6_ENCOEDER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; + case TIM2_ENCODER: IfxGpt12_T2_setTimerValue(&MODULE_GPT120, 0); break; + case TIM3_ENCODER: IfxGpt12_T3_setTimerValue(&MODULE_GPT120, 0); break; + case TIM4_ENCODER: IfxGpt12_T4_setTimerValue(&MODULE_GPT120, 0); break; + case TIM5_ENCODER: IfxGpt12_T5_setTimerValue(&MODULE_GPT120, 0); break; + case TIM6_ENCODER: IfxGpt12_T6_setTimerValue(&MODULE_GPT120, 0); break; } } @@ -158,7 +158,7 @@ void encoder_clear_count (encoder_index_enum encoder_n) // 参数说明 ch1_pin ENCODER 通道 1 // 参数说明 ch2_pin ENCODER 通道 2 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚为A通道 P00_8引脚为B通道 // 备注信息 //------------------------------------------------------------------------------------------------------------------- void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum count_pin, encoder_channel2_enum dir_pin) @@ -170,7 +170,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun switch(encoder_n) { - case TIM2_ENCOEDER: + case TIM2_ENCODER: { IfxGpt12_T2_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T2_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -178,7 +178,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T2_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM3_ENCOEDER: + case TIM3_ENCODER: { IfxGpt12_T3_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T3_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -186,7 +186,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T3_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM4_ENCOEDER: + case TIM4_ENCODER: { IfxGpt12_T4_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T4_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -194,7 +194,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T4_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM5_ENCOEDER: + case TIM5_ENCODER: { IfxGpt12_T5_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T5_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -202,7 +202,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun IfxGpt12_T5_run (&MODULE_GPT120, IfxGpt12_TimerRun_start); }break; - case TIM6_ENCOEDER: + case TIM6_ENCODER: { IfxGpt12_T6_setCounterInputMode(&MODULE_GPT120, IfxGpt12_CounterInputMode_risingEdgeTxIN); IfxGpt12_T6_setDirectionSource (&MODULE_GPT120, IfxGpt12_TimerDirectionSource_external); @@ -218,7 +218,7 @@ void encoder_quad_init (encoder_index_enum encoder_n, encoder_channel1_enum coun // 参数说明 ch1_pin 设置计数引脚 // 参数说明 ch2_pin 设置方向引脚 // 返回参数 void -// 使用示例 encoder_quad_init(TIM2_ENCOEDER, TIM2_ENCOEDER_CH1_P00_7, TIM2_ENCOEDER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 +// 使用示例 encoder_quad_init(TIM2_ENCODER, TIM2_ENCODER_CH1_P00_7, TIM2_ENCODER_CH2_P00_8);// 使用T2定时器 P00_7引脚进行计数 计数方向使用P00_8引脚 // 备注信息 英飞凌系列单片机无需区分正交和方向编码器，此处仅保留接口方便用户使用 //------------------------------------------------------------------------------------------------------------------- void encoder_dir_init (encoder_index_enum encoder_n, encoder_channel1_enum ch1_pin, encoder_channel2_enum ch2_pin) diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.h b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.h index 3c24ec8..451e142 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.h +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_encoder.h @@ -41,44 +41,44 @@ // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH1_P00_7, // T2定时器 计数引脚可选范围 - TIM2_ENCOEDER_CH1_P33_7, + TIM2_ENCODER_CH1_P00_7, // T2定时器 计数引脚可选范围 + TIM2_ENCODER_CH1_P33_7, - TIM3_ENCOEDER_CH1_P02_6, // T3定时器 计数引脚可选范围 + TIM3_ENCODER_CH1_P02_6, // T3定时器 计数引脚可选范围 - TIM4_ENCOEDER_CH1_P02_8, // T4定时器 计数引脚可选范围 + TIM4_ENCODER_CH1_P02_8, // T4定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P21_7, // T5定时器 计数引脚可选范围 - TIM5_ENCOEDER_CH1_P10_3, + TIM5_ENCODER_CH1_P21_7, // T5定时器 计数引脚可选范围 + TIM5_ENCODER_CH1_P10_3, - TIM6_ENCOEDER_CH1_P20_3, // T6定时器 计数引脚可选范围 - TIM6_ENCOEDER_CH1_P10_2, + TIM6_ENCODER_CH1_P20_3, // T6定时器 计数引脚可选范围 + TIM6_ENCODER_CH1_P10_2, }encoder_channel1_enum; // 此枚举定义不允许用户修改 typedef enum // 枚举编码器引脚 { - TIM2_ENCOEDER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 - TIM2_ENCOEDER_CH2_P33_6, + TIM2_ENCODER_CH2_P00_8, // T2定时器 计数方向引脚可选范围 + TIM2_ENCODER_CH2_P33_6, - TIM3_ENCOEDER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 + TIM3_ENCODER_CH2_P02_7, // T3定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 - TIM4_ENCOEDER_CH2_P33_5, + TIM4_ENCODER_CH2_P00_9, // T4定时器 计数方向引脚可选范围 + TIM4_ENCODER_CH2_P33_5, - TIM5_ENCOEDER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 - TIM5_ENCOEDER_CH2_P10_1, + TIM5_ENCODER_CH2_P21_6, // T5定时器 计数方向引脚可选范围 + TIM5_ENCODER_CH2_P10_1, - TIM6_ENCOEDER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 + TIM6_ENCODER_CH2_P20_0, // T6定时器 计数方向引脚可选范围 }encoder_channel2_enum; typedef enum // 枚举 定时器编号 { - TIM2_ENCOEDER, - TIM3_ENCOEDER, - TIM4_ENCOEDER, - TIM5_ENCOEDER, - TIM6_ENCOEDER, + TIM2_ENCODER, + TIM3_ENCODER, + TIM4_ENCODER, + TIM5_ENCODER, + TIM6_ENCODER, }encoder_index_enum; //====================================================编码器 基础函数====================================================