Skip to content

Commit

Permalink
fix(Examples): Fix double-type subseconds calculation for MAX32655, M…
Browse files Browse the repository at this point in the history 
…AX78000, and MAX78002 (#650)

Co-authored-by: sihyung-maxim <[email protected]>
  • Loading branch information
@sihyung-maxim
sihyung-maxim and sihyung-maxim authored Jul 12, 2023
1 parent f1848be commit 36279e5
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 91 deletions.
11 changes: 6 additions & 5 deletions Examples/MAX32572/Barcode_Decoder/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ void utils_delay_ms(unsigned int ms)

unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/CameraIF/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ void utils_delay_ms(unsigned int ms)

unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/MAX32572_Demo_BareMetal/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/MAX32572_Demo_FreeRTOS/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/TFT_Demo/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/lwIP_Ping/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,16 @@ static void link_callback_func(struct netif *netif)

static unsigned int sys_get_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/lwIP_TCP/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,16 @@ static void link_callback_func(struct netif *netif)

static unsigned int sys_get_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
6 changes: 3 additions & 3 deletions Examples/MAX32655/TFT_Demo/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ unsigned int utils_get_time_ms(void)
{
uint32_t sec, ssec;
double subsec;
unsigned int ms;
uint32_t ms;

MXC_RTC_GetSubSeconds(&ssec);
subsec = ssec / 4096.0;
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
16 changes: 11 additions & 5 deletions Examples/MAX78000/CNN/faceid_evkit-riscv/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,23 @@

/************************ PUBLIC FUNCTIONS *******************************/

void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX78000/CNN/faceid_evkit/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
16 changes: 11 additions & 5 deletions Examples/MAX78000/CNN/facial_recognition/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,23 @@

/************************ PUBLIC FUNCTIONS *******************************/

void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
19 changes: 10 additions & 9 deletions Examples/MAX78000/CameraIF/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,23 @@
/***************************** VARIABLES *************************************/

/************************ PUBLIC FUNCTIONS *******************************/
//void utils_delay_ms(uint32_t ms)
//{
// MXC_Delay(ms * 1000UL);
//}
void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX78000/TFT_Demo/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)4096.0;

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
15 changes: 10 additions & 5 deletions Examples/MAX78002/CNN/faceid_evkit/src/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,23 @@
/***************************** VARIABLES *************************************/

/************************ PUBLIC FUNCTIONS *******************************/
void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
16 changes: 11 additions & 5 deletions Examples/MAX78002/CNN/pascalvoc-retinanetv7_3/src/cnn/nms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,23 @@ void reset_arrays(void)
memset(nms_removed, 0, sizeof(nms_removed));
}

void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
15 changes: 10 additions & 5 deletions Examples/MAX78002/CSI2/utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,23 @@
/***************************** VARIABLES *************************************/

/************************ PUBLIC FUNCTIONS *******************************/
void utils_delay_ms(uint32_t ms)
{
MXC_Delay(ms * 1000UL);
}

uint32_t utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
Loading

0 comments on commit 36279e5

Please sign in to comment.