diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/config.h b/config.h index 96a6095..6e24180 100644 --- a/config.h +++ b/config.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0,164,0} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/config.h b/config.h index 96a6095..6e24180 100644 --- a/config.h +++ b/config.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0,164,0} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/config_base.h b/config_base.h index 9f0bfcc..9748d49 100644 --- a/config_base.h +++ b/config_base.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x02,0x00} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/config.h b/config.h index 96a6095..6e24180 100644 --- a/config.h +++ b/config.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0,164,0} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/config_base.h b/config_base.h index 9f0bfcc..9748d49 100644 --- a/config_base.h +++ b/config_base.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x02,0x00} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/main.c b/main.c index 416f609..aaceafe 100644 --- a/main.c +++ b/main.c @@ -191,6 +191,8 @@ Boot_Mode_Flag = PeripheralInit(); //��ʼ������ ConfigData_Init(); //��FLASH��ȡ���ò��� +// DeviceConfig.CollectPeriod = 1; + /* Module_DS2781_Set_Register(); vTaskDelay(100); @@ -273,7 +275,7 @@ ACR = Get_DS2782_ACR(); //��ص��� printf("\r\n Get_DS2782_ACR() is : %d \r\n", ACR); - DeviceConfig.CollectPeriod = 1; + /*����Ѳɼ����ݴ��ڲɼ�����*/ if((businessData.DataCount >= DeviceConfig.CollectNum)) diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/config.h b/config.h index 96a6095..6e24180 100644 --- a/config.h +++ b/config.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0,164,0} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/config_base.h b/config_base.h index 9f0bfcc..9748d49 100644 --- a/config_base.h +++ b/config_base.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x02,0x00} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/main.c b/main.c index 416f609..aaceafe 100644 --- a/main.c +++ b/main.c @@ -191,6 +191,8 @@ Boot_Mode_Flag = PeripheralInit(); //��ʼ������ ConfigData_Init(); //��FLASH��ȡ���ò��� +// DeviceConfig.CollectPeriod = 1; + /* Module_DS2781_Set_Register(); vTaskDelay(100); @@ -273,7 +275,7 @@ ACR = Get_DS2782_ACR(); //��ص��� printf("\r\n Get_DS2782_ACR() is : %d \r\n", ACR); - DeviceConfig.CollectPeriod = 1; + /*����Ѳɼ����ݴ��ڲɼ�����*/ if((businessData.DataCount >= DeviceConfig.CollectNum)) diff --git a/rtc.c b/rtc.c index 450f4c7..49beb9c 100644 --- a/rtc.c +++ b/rtc.c @@ -226,7 +226,7 @@ /*configure alarm timer property*/ gsdk_alarm_config_t alarm_config; alarm_config.callback = rtc_alarm_cb;//timer callback - alarm_config.interval = SleepPara;//��λ��s + alarm_config.interval = SleepPara-30;//��λ��s alarm_config.periodic = 1;//timer perform periodically status = gsdk_alarm_open(&g_alarm_handle, &alarm_config);//open alarm timer if (status != GSDK_SUCCESS) diff --git a/API.c b/API.c index b271f51..a64d099 100644 --- a/API.c +++ b/API.c @@ -81,7 +81,7 @@ } else { - DeviceConfig.CollectPeriod = 1; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� + DeviceConfig.CollectPeriod = 60; //Ĭ�����ã�ÿ��60���Ӳɼ�һ�����ݡ� } printf("\r\n-CollectPeriod:-%2d---.\r\n", DeviceConfig.CollectPeriod ); //����ʹ�� ////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ } else { - DeviceConfig.UploadCycle = 1; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� + DeviceConfig.UploadCycle = 60; //Ĭ�����ã������ϱ�����Ϊ24Сʱ����ÿ���ϴ�1�����ݡ� } printf("\r\n-UploadCycle:-%2d---.\r\n", DeviceConfig.UploadCycle ); //����ʹ�� //////////////////////////////////////////////////////////////////////////////////////////// diff --git a/build.bat b/build.bat index f39d897..7087696 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,8 @@ @echo off & setlocal enabledelayedexpansion set PATH=C:\Program Files (x86)\GNU Tools ARM Embedded\7 2018-q2-update\bin;%CD%\..\tools;%PATH% -for /l %%i in (0,1,50) do ( +for /l %%i in (0,1,162) do ( -for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config_base.h') do ( +for /f "delims=" %%a in ('findstr /n .* C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config_base.h') do ( set "str=%%a" if not "!str:0x34,0x20=!"=="%%a" ( rem if not defined n ( @@ -55,7 +55,7 @@ echo,!str:*:=! )>>tmp -move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h +move tmp C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h echo -----------------------!highn_h!!highn_l!!lown_h!!lown_l!----------------------- :: echo !assembl_falg! rem if "%lown_l%"="A" echo good @@ -65,8 +65,8 @@ make - type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\config.h - ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.14\bin\user.bin BIRMM-GT200N-34202401!highn_h!!highn_l!!lown_h!!lown_l!.bin + type C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\config.h + ren C:\Users\think\Desktop\sdk3\examples\BIRMM-GT200N_V1.15\bin\user.bin BIRMM-GT200N-20240409-34202201!highn_h!!highn_l!!lown_h!!lown_l!.bin )>>assemble_log.txt ) diff --git a/config.h b/config.h index 96a6095..6e24180 100644 --- a/config.h +++ b/config.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0,164,0} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/config_base.h b/config_base.h index 9f0bfcc..9748d49 100644 --- a/config_base.h +++ b/config_base.h @@ -18,7 +18,7 @@ /*******************************************************************************/ /**************************�豸ID��*********************************************/ -#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x70,0x00} +#define DEVICE_ID {0x34,0x20,0x22,0x01,0x00,0x02,0x00} /*******************************************************************************/ /**************************����汾��*******************************************/ diff --git a/main.c b/main.c index 416f609..aaceafe 100644 --- a/main.c +++ b/main.c @@ -191,6 +191,8 @@ Boot_Mode_Flag = PeripheralInit(); //��ʼ������ ConfigData_Init(); //��FLASH��ȡ���ò��� +// DeviceConfig.CollectPeriod = 1; + /* Module_DS2781_Set_Register(); vTaskDelay(100); @@ -273,7 +275,7 @@ ACR = Get_DS2782_ACR(); //��ص��� printf("\r\n Get_DS2782_ACR() is : %d \r\n", ACR); - DeviceConfig.CollectPeriod = 1; + /*����Ѳɼ����ݴ��ڲɼ�����*/ if((businessData.DataCount >= DeviceConfig.CollectNum)) diff --git a/rtc.c b/rtc.c index 450f4c7..49beb9c 100644 --- a/rtc.c +++ b/rtc.c @@ -226,7 +226,7 @@ /*configure alarm timer property*/ gsdk_alarm_config_t alarm_config; alarm_config.callback = rtc_alarm_cb;//timer callback - alarm_config.interval = SleepPara;//��λ��s + alarm_config.interval = SleepPara-30;//��λ��s alarm_config.periodic = 1;//timer perform periodically status = gsdk_alarm_open(&g_alarm_handle, &alarm_config);//open alarm timer if (status != GSDK_SUCCESS) diff --git "a/\344\277\256\346\224\271\350\256\260\345\275\225.doc" "b/\344\277\256\346\224\271\350\256\260\345\275\225.doc" index 2497e5b..fd75826 100644 --- "a/\344\277\256\346\224\271\350\256\260\345\275\225.doc" +++ "b/\344\277\256\346\224\271\350\256\260\345\275\225.doc" Binary files differ