diff --git a/Example/E01_gpio_demo/libraries/doc/version.txt b/Example/E01_gpio_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E01_gpio_demo/libraries/doc/version.txt +++ b/Example/E01_gpio_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E01_gpio_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E01_gpio_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E01_gpio_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E01_gpio_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E01_gpio_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E02_uart_demo/libraries/doc/version.txt b/Example/E02_uart_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E02_uart_demo/libraries/doc/version.txt +++ b/Example/E02_uart_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E02_uart_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E02_uart_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E02_uart_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E02_uart_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E02_uart_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E02_uart_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E03_adc_demo/libraries/doc/version.txt b/Example/E03_adc_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E03_adc_demo/libraries/doc/version.txt +++ b/Example/E03_adc_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E03_adc_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E03_adc_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E03_adc_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E03_adc_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E03_adc_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E03_adc_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E04_pwm_demo/libraries/doc/version.txt b/Example/E04_pwm_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E04_pwm_demo/libraries/doc/version.txt +++ b/Example/E04_pwm_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E04_pwm_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E04_pwm_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E04_pwm_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E04_pwm_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E04_pwm_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E05_pit_demo/libraries/doc/version.txt b/Example/E05_pit_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E05_pit_demo/libraries/doc/version.txt +++ b/Example/E05_pit_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E05_pit_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E05_pit_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E05_pit_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E05_pit_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E05_pit_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E05_pit_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E06_exit_demo/libraries/doc/version.txt b/Example/E06_exit_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E06_exit_demo/libraries/doc/version.txt +++ b/Example/E06_exit_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E06_exit_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E06_exit_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E06_exit_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E06_exit_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E06_exit_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E06_exit_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E07_encoder_demo/libraries/doc/version.txt b/Example/E07_encoder_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E07_encoder_demo/libraries/doc/version.txt +++ b/Example/E07_encoder_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E07_encoder_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E07_encoder_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E07_encoder_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E07_encoder_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E07_encoder_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E08_eeprom_demo/libraries/doc/version.txt b/Example/E08_eeprom_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E08_eeprom_demo/libraries/doc/version.txt +++ b/Example/E08_eeprom_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E08_eeprom_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E08_eeprom_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E08_eeprom_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E09_timer_demo/libraries/doc/version.txt b/Example/E09_timer_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E09_timer_demo/libraries/doc/version.txt +++ b/Example/E09_timer_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E09_timer_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E09_timer_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E09_timer_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E09_timer_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E09_timer_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E09_timer_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- 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 5cdfc9d..835d726 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,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E10_printf_debug_log_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E10_printf_debug_log_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- 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 5cdfc9d..835d726 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,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E11_interrupt_priority_set_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- 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 5cdfc9d..835d726 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,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E12_cpu1_handles_interrupts_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Example/E13_dual_core_demo/libraries/doc/version.txt b/Example/E13_dual_core_demo/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Example/E13_dual_core_demo/libraries/doc/version.txt +++ b/Example/E13_dual_core_demo/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E13_dual_core_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E13_dual_core_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E13_dual_core_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- 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 5cdfc9d..835d726 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,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_tsl1401.h b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_tsl1401.h +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_flash.c b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_flash.c +++ b/Example/E14_specifies_variable_or_code_location_demo/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //------------------------------------------------------------------------------------------------------------------- diff --git a/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt b/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt index 5cdfc9d..835d726 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt +++ b/Seekfree_TC264_Opensource_Library/libraries/doc/version.txt @@ -1,3 +1,5 @@ +V3.1.2 + 修复flash_check函数只检查第一个数据的bug V3.1.1 修复调用摄像头初始化后，RAM占用过大的问题 V3.1.0 diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_tsl1401.h b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_tsl1401.h index a8c1e12..1cc2ed0 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_tsl1401.h +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_device/zf_device_tsl1401.h @@ -51,7 +51,7 @@ //=================================================TSL1401 驱动配置==================================================== #define TSL1401_AO_PIN (ADC0_CH4_A4) // 对应第一个 TSL1401 的 AO 引脚 -#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第一个 TSL1401 的 AO 引脚 +#define TSL1401_AO_PIN1 (ADC0_CH5_A5) // 对应第二个 TSL1401 的 AO 引脚 // TSL1401 的控制引脚定义 多个 TSL1401 建议将控制引脚直接并联 #define TSL1401_CLK_PIN (P00_0) // TSL1401 的 CLK 引脚定义 #define TSL1401_SI_PIN (P00_1) // TSL1401 的 SI 引脚定义 diff --git a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_flash.c b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_flash.c index 2082066..94e306e 100644 --- a/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_flash.c +++ b/Seekfree_TC264_Opensource_Library/libraries/zf_driver/zf_driver_flash.c @@ -56,9 +56,11 @@ uint8 flash_check (uint32 sector_num, uint32 page_num) uint32 sector_addr = IfxFlash_dFlashTableEepLog[page_num].start; - uint32 temp = *(uint32 *)sector_addr; + uint32 num = 0; - return temp != 0 ? 1 : 0; + for(num = 0; num < EEPROM_PAGE_LENGTH && *(uint32 *)(sector_addr + num * FLASH_DATA_SIZE) == 0; num ++); + + return num == EEPROM_PAGE_LENGTH ? 0 : 1; } //-------------------------------------------------------------------------------------------------------------------