Commit 5378071d by Jeffrey Redondo

“timestamp”

parent a736a6c4
......@@ -53,6 +53,7 @@
#define BG96_ID "157033"//(157033) 18\n\n201,-10,-75,157030"; 18= Lenght of the packets, 201=ID in middleware, -10 data, -75, data, 57030 ID.
#define BG96_Distance "148"//meters
#define BG96_AT_PING "AT+QPING=1,\"node.iot.ttu.ee\"\r\n"
#define BG96_AT_CLOCK "AT+CCLK=?"
extern uint8_t EVB_Buffer[200];
......@@ -127,5 +128,6 @@ void BG96_Context_Activation(void);
// Output: none
void BG96_Cumulocity(void);
//#endif /* BG96_H_ */
void BG96_Clock(void);
......@@ -15,6 +15,7 @@
extern uint8_t EVB_Buffer[200],EVB_indx;
char rssi2[4]="", mode2[7]="",rsrp2[4]="", snr2[3]="", rsrq2[3]="";
char timestamp[12]="";
//int nameSize = 10; //this could come from an input or any other source
// char *name = malloc(nameSize * sizeof(char));
......@@ -25,6 +26,7 @@ void BG96_Context_Activation(void);
void BG96_Send_Clean(void);
int BG96_Context_Check();
void BG96_PING(void);
void BG96_Clock(void);
int BG96_Check_Internet();
/**
* @brief enable and disable airplane mode
......@@ -563,7 +565,8 @@ void BG96_Cumulocity(){
char length[2]="";
volatile int length_rssi=0;
strcat(data2, "\n\n202,"); //id of middleware or cumulocity
strcat(data2, BG96_Distance);
//strcat(data2, BG96_Distance);
strcat(data2, timestamp); //replacing distance for timestamp.
strcat(data2, ",-");
strcat(data2, rssi2);
strcat(data2, ",");
......@@ -659,8 +662,24 @@ int BG96_Check_Internet(){
return cont;
}
void BG96_PING(){
//check connectivity
HAL_UART_Transmit(&huart1,(uint8_t *)&BG96_AT_PING,sizeof(BG96_AT_PING),1000);
HAL_Delay(10000); // waiting 10 sec to received the ping responses.
BG96_Send_Clean();
}
void BG96_Clock(){
BG96_clean_EVB_Buffer(); // think about filling only a dedicated buffer for the signal.
HAL_UART_Transmit(&huart1,(uint8_t *)&BG96_AT_CLOCK,sizeof(BG96_AT_CLOCK),1500);
HAL_Delay(1000);
//AT+CCLK? //Query the local time
//+CCLK: “08/01/04,00:19:43+00”
int i=0, k=9;
for (i=0;i<6;i++) {
timestamp[i] = EVB_Buffer[k]+EVB_Buffer[k+1];
k=k+3;
}
BG96_Send_Clean();
}
\ No newline at end of file
......@@ -146,7 +146,24 @@
<Name>-U-O142 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32L4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32L476RGTx$CMSIS\Flash\STM32L4xx_1024.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>568</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>.\BG96.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
......@@ -220,7 +237,7 @@
<Group>
<GroupName>Application/MDK-ARM</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
......@@ -488,7 +505,7 @@
<Group>
<GroupName>Application/User</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
......
......@@ -27,63 +27,51 @@ Project File Date: 07/11/2018
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 5 (build 528)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'Low_Power_mode'
compiling main.c...
../Src/main.c(252): warning: #177-D: function "MX_TIM2_Init" was declared but never referenced
static void MX_TIM2_Init(void)
../Src/main.c: 1 warning, 0 errors
compiling BG96.c...
BG96.c(26): warning: #1295-D: Deprecated declaration BG96_Context_Check - give arg types
BG96.c(27): warning: #1295-D: Deprecated declaration BG96_Context_Check - give arg types
int BG96_Context_Check();
BG96.c(28): warning: #1295-D: Deprecated declaration BG96_Check_Internet - give arg types
BG96.c(30): warning: #1295-D: Deprecated declaration BG96_Check_Internet - give arg types
int BG96_Check_Internet();
BG96.c(53): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(55): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"Telia"); //here is Carrier/operator name
BG96.c(214): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,temp,sizeof(temp),1000);
BG96.c(220): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,temp,sizeof(temp),1000);
BG96.c(244): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,rssichar,strlen(rssichar),1000);
BG96.c(248): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,rssichar,sizeof(rssichar),1000);
BG96.c(265): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(297): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"BG96");
BG96.c(295): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"BG96");
BG96.c(399): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(401): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"OK");
BG96.c(390): warning: #177-D: variable "ap" was declared but never referenced
BG96.c(392): warning: #177-D: variable "ap" was declared but never referenced
char sw=0,ap=0;
BG96.c(432): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(434): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"+QIACT:");
BG96.c(426): warning: #177-D: variable "sw" was declared but never referenced
BG96.c(428): warning: #177-D: variable "sw" was declared but never referenced
char sw=0,ap=0;
BG96.c(426): warning: #177-D: variable "ap" was declared but never referenced
BG96.c(428): warning: #177-D: variable "ap" was declared but never referenced
char sw=0,ap=0;
BG96.c(461): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(463): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,rsrpchar,strlen(rsrpchar),1000); // or sizeof
BG96.c(465): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(467): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,rsrpchar,sizeof(rsrpchar),1000);
BG96.c(489): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(491): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,rsrqchar,sizeof(rsrqchar),1000);
BG96.c(493): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(495): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,rsrqchar,sizeof(rsrqchar),1000);
BG96.c(518): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,snrchar,sizeof(snrchar),1000);
BG96.c(522): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,snrchar,sizeof(snrchar),1000);
BG96.c(583): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(546): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,techchar,sizeof(techchar),1000);
BG96.c(550): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,techchar,sizeof(techchar),1000);
BG96.c(586): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart2,data,strlen(data),1000);
BG96.c(607): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(610): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"+QIOPEN: 0,0");
BG96.c(635): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
BG96.c(638): warning: #167-D: argument of type "char *" is incompatible with parameter of type "uint8_t *"
HAL_UART_Transmit(&huart1,data,strlen(data),1000);
BG96.c(652): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
BG96.c(655): warning: #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
char *c = strstr(EVB_Buffer,"+QPING: 0,"); // ping received
BG96.c: 31 warnings, 0 errors
BG96.c(685): warning: #1-D: last line of file ends without a newline
}
BG96.c: 32 warnings, 0 errors
linking...
Program Size: Code=14888 RO-data=880 RW-data=52 ZI-data=1764
"Low_Power_mode\Low_Power_mode.axf" - 0 Error(s), 25 Warning(s).
Program Size: Code=14980 RO-data=880 RW-data=52 ZI-data=1780
"Low_Power_mode\Low_Power_mode.axf" - 0 Error(s), 20 Warning(s).
<h2>Software Packages used:</h2>
......@@ -106,7 +94,7 @@ Package Vendor: Keil
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.1.1
Build Time Elapsed: 00:00:34
Build Time Elapsed: 00:00:28
</pre>
</body>
</html>
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -792,7 +792,7 @@ I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h)(0x5B16C8CC)
F (../Src/main.c)(0x5B473000)(-c --cpu Cortex-M4.fp -D__EVAL -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I ../Drivers/CMSIS/Include --C99 -I.\RTE\_Low_Power_mode -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L4xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L4xx\Include -D__UVISION_VERSION="524" -D_RTE_ -DSTM32L476xx -DUSE_HAL_DRIVER -DSTM32L476xx -o low_power_mode\main.o --omf_browse low_power_mode\main.crf --depend low_power_mode\main.d)
F (../Src/main.c)(0x5BD6164D)(-c --cpu Cortex-M4.fp -D__EVAL -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I ../Drivers/CMSIS/Include --C99 -I.\RTE\_Low_Power_mode -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L4xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L4xx\Include -D__UVISION_VERSION="524" -D_RTE_ -DSTM32L476xx -DUSE_HAL_DRIVER -DSTM32L476xx -o low_power_mode\main.o --omf_browse low_power_mode\main.crf --depend low_power_mode\main.d)
I (../Inc/main.h)(0x5B45BBE5)
I (../Inc/UART.h)(0x5B45DA4A)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h)(0x5B16C8CA)
......@@ -830,7 +830,7 @@ I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h)(0x5B16C8CC)
I (../Inc/RTC.h)(0x5B4EF1D8)
I (../Inc/BG96.h)(0x5B4EF2E0)
I (../Inc/BG96.h)(0x5BD611B5)
F (../Src/stm32l4xx_it.c)(0x5B45BBE3)(-c --cpu Cortex-M4.fp -D__EVAL -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I ../Drivers/CMSIS/Include --C99 -I.\RTE\_Low_Power_mode -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L4xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L4xx\Include -D__UVISION_VERSION="524" -D_RTE_ -DSTM32L476xx -DUSE_HAL_DRIVER -DSTM32L476xx -o low_power_mode\stm32l4xx_it.o --omf_browse low_power_mode\stm32l4xx_it.crf --depend low_power_mode\stm32l4xx_it.d)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h)(0x5B16C8CA)
I (../Inc/stm32l4xx_hal_conf.h)(0x5B45BBE4)
......@@ -868,8 +868,8 @@ I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h)(0x5B16C8CC)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h)(0x5B16C8CC)
I (../Inc/stm32l4xx_it.h)(0x5B45BBE4)
F (.\BG96.c)(0x5B4EF020)(-c --cpu Cortex-M4.fp -D__EVAL -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I ../Drivers/CMSIS/Include --C99 -I.\RTE\_Low_Power_mode -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L4xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L4xx\Include -D__UVISION_VERSION="524" -D_RTE_ -DSTM32L476xx -DUSE_HAL_DRIVER -DSTM32L476xx -o low_power_mode\bg96.o --omf_browse low_power_mode\bg96.crf --depend low_power_mode\bg96.d)
I (../Inc/bg96.h)(0x5B4EF2E0)
F (.\BG96.c)(0x5BD61815)(-c --cpu Cortex-M4.fp -D__EVAL -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc -I ../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I ../Drivers/CMSIS/Include --C99 -I.\RTE\_Low_Power_mode -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32L4xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L4xx\Include -D__UVISION_VERSION="524" -D_RTE_ -DSTM32L476xx -DUSE_HAL_DRIVER -DSTM32L476xx -o low_power_mode\bg96.o --omf_browse low_power_mode\bg96.crf --depend low_power_mode\bg96.d)
I (../Inc/bg96.h)(0x5BD611B5)
I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x588BD7A4)
I (../Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h)(0x5B16C8CA)
I (../Inc/stm32l4xx_hal_conf.h)(0x5B45BBE4)
......
......@@ -153,6 +153,7 @@ int main(void)
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
//HAL_PWREx_EnableLowPowerRunMode();
BG96_Clock();
BG96_Signal();
BG96_Cumulocity();
HAL_UART_Transmit(&huart2,"Time and Alarm values.\r\n",sizeof("Time and Alarm values.\r\n"),1000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment