diff --git a/Example/E01_gpio_demo/libraries/doc/version.txt b/Example/E01_gpio_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E01_gpio_demo/libraries/doc/version.txt +++ b/Example/E01_gpio_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E01_gpio_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E02_uart_demo/libraries/doc/version.txt b/Example/E02_uart_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E02_uart_demo/libraries/doc/version.txt +++ b/Example/E02_uart_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E02_uart_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E03_adc_demo/libraries/doc/version.txt b/Example/E03_adc_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E03_adc_demo/libraries/doc/version.txt +++ b/Example/E03_adc_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E03_adc_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E04_pwm_demo/libraries/doc/version.txt b/Example/E04_pwm_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E04_pwm_demo/libraries/doc/version.txt +++ b/Example/E04_pwm_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E04_pwm_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E05_pit_demo/libraries/doc/version.txt b/Example/E05_pit_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E05_pit_demo/libraries/doc/version.txt +++ b/Example/E05_pit_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E05_pit_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E06_exit_demo/libraries/doc/version.txt b/Example/E06_exit_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E06_exit_demo/libraries/doc/version.txt +++ b/Example/E06_exit_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E06_exit_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E07_encoder_demo/libraries/doc/version.txt b/Example/E07_encoder_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E07_encoder_demo/libraries/doc/version.txt +++ b/Example/E07_encoder_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E07_encoder_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E08_eeprom_demo/libraries/doc/version.txt b/Example/E08_eeprom_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E08_eeprom_demo/libraries/doc/version.txt +++ b/Example/E08_eeprom_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E09_timer_demo/libraries/doc/version.txt b/Example/E09_timer_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E09_timer_demo/libraries/doc/version.txt +++ b/Example/E09_timer_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E09_timer_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E10_printf_debug_log_demo/libraries/doc/version.txt b/Example/E10_printf_debug_log_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E10_printf_debug_log_demo/libraries/doc/version.txt +++ b/Example/E10_printf_debug_log_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E11_interrupt_priority_set_demo/libraries/doc/version.txt b/Example/E11_interrupt_priority_set_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/doc/version.txt +++ b/Example/E11_interrupt_priority_set_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/doc/version.txt b/Example/E12_cpu1_handles_interrupts_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/doc/version.txt +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E13_dual_core_demo/libraries/doc/version.txt b/Example/E13_dual_core_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E13_dual_core_demo/libraries/doc/version.txt +++ b/Example/E13_dual_core_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/doc/version.txt b/Example/E14_specifies_variable_or_code_location_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/doc/version.txt +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Example/E15_fft_demo/libraries/doc/version.txt b/Example/E15_fft_demo/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Example/E15_fft_demo/libraries/doc/version.txt +++ b/Example/E15_fft_demo/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.c b/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.c +++ b/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.h b/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.h +++ b/Example/E15_fft_demo/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用 diff --git a/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt b/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt index c254222..0cd6063 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt +++ b/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt @@ -1,3 +1,6 @@ +V3.2.10 + 修复spi-wifi初始化失败的问题 + 修复spi-wifi获取配置信息错误的问题 V3.2.9 新增完整正交采集 仅TIM2 TIM3 TIM4支持 V3.2.8 diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.c b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.c index f9e51ca..15c3b9d 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.c +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.c @@ -612,7 +612,7 @@ uint8 wifi_spi_init (char *wifi_ssid, char *pass_word) uint8 return_state = 0; fifo_init(&wifi_spi_fifo, FIFO_DATA_8BIT, wifi_spi_buffer, WIFI_SPI_RECVIVE_FIFO_SIZE); - spi_init(WIFI_SPI_INDEX, SPI_MODE3, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 + spi_init(WIFI_SPI_INDEX, SPI_MODE0, WIFI_SPI_SPEED, WIFI_SPI_SCK_PIN, WIFI_SPI_MOSI_PIN, WIFI_SPI_MISO_PIN, SPI_CS_NULL);//硬件SPI初始化 gpio_init(WIFI_SPI_CS_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_RST_PIN, GPO, 1, GPO_PUSH_PULL); gpio_init(WIFI_SPI_INT_PIN, GPI, 0, GPI_PULL_DOWN); diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.h b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.h index 24e7eb1..c6ab1fb 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.h +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_wifi_spi.h @@ -55,7 +55,7 @@ #define WIFI_SPI_INDEX (SPI_3 ) // 定义使用的SPI号 -#define WIFI_SPI_SPEED (50 * 1000 * 1000 ) // 硬件 SPI 速率 +#define WIFI_SPI_SPEED (30 * 1000 * 1000 ) // 硬件 SPI 速率 #define WIFI_SPI_SCK_PIN (SPI3_SCLK_P22_3 ) // 定义SPI_SCK引脚 #define WIFI_SPI_MOSI_PIN (SPI3_MOSI_P22_0 ) // 定义SPI_MOSI引脚 #define WIFI_SPI_MISO_PIN (SPI3_MISO_P22_1 ) // 定义SPI_MISO引脚 IPS没有MISO引脚，但是这里任然需要定义，在spi的初始化时需要使用