Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix too many arguments log #67

Merged
merged 12 commits into from
Dec 1, 2021
Merged

Fix too many arguments log #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
210a55c
Update cellular library to MIT license
chinglee-iot Mar 29, 2021
298ae4c
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jun 30, 2021
21ea9bc
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jul 16, 2021
6690f3b
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jul 23, 2021
4a58d89
Merge branch 'FreeRTOS:main' into main
chinglee-iot Aug 24, 2021
955ebc0
Merge branch 'FreeRTOS:main' into main
chinglee-iot Oct 25, 2021
bba8adf
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 4, 2021
440bec9
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 9, 2021
a0fb7c7
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 16, 2021
b28ed63
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 24, 2021
b40cb10
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 1, 2021
69c7422
Fix log with more than 6 arguments
chinglee-iot Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions source/cellular_3gpp_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,10 +485,14 @@ static CellularPktStatus_t _parseTimeZoneInfo( char * pTimeZoneResp,

if( pktStatus == CELLULAR_PKT_STATUS_OK )
{
LogDebug( ( "\n TimeZoneInfo: Timezone %d Year %d Month %d day %d Hour %d Minute %d Second %d ",
pTimeInfo->timeZone, pTimeInfo->year,
pTimeInfo->month, pTimeInfo->day,
pTimeInfo->hour, pTimeInfo->minute,
LogDebug( ( "TimeZoneInfo: Timezone %d Year %d Month %d day %d,", pTimeInfo->timeZone,
pTimeInfo->year,
pTimeInfo->month,
pTimeInfo->day ) );

LogDebug( ( "Hour %d Minute %d Second %d",
pTimeInfo->hour,
pTimeInfo->minute,
pTimeInfo->second ) );
}

Expand Down Expand Up @@ -1792,13 +1796,19 @@ CellularError_t Cellular_CommonGetServiceStatus( CellularHandle_t cellularHandle
( void ) strncpy( pServiceStatus->operatorName, operatorInfo.operatorName, CELLULAR_NETWORK_NAME_MAX_SIZE );
pServiceStatus->operatorNameFormat = operatorInfo.operatorNameFormat;

LogDebug( ( "SrvStatus: rat %d cs %d, ps %d, mode %d, csRejType %d, csRej %d, psRejType %d, psRej %d, plmn %s%s",
LogDebug( ( "SrvStatus: rat %d cs %d, ps %d, mode %d, csRejType %d,",
pServiceStatus->rat,
pServiceStatus->csRegistrationStatus, pServiceStatus->psRegistrationStatus,
pServiceStatus->csRegistrationStatus,
pServiceStatus->psRegistrationStatus,
pServiceStatus->networkRegistrationMode,
pServiceStatus->csRejectionType, pServiceStatus->csRejectionCause,
pServiceStatus->psRejectionType, pServiceStatus->psRejectionCause,
pServiceStatus->plmnInfo.mcc, pServiceStatus->plmnInfo.mnc ) );
pServiceStatus->csRejectionType ) );

LogDebug( ( "csRej %d, psRejType %d, psRej %d, plmn %s%s",
pServiceStatus->csRejectionCause,
pServiceStatus->psRejectionType,
pServiceStatus->psRejectionCause,
pServiceStatus->plmnInfo.mcc,
pServiceStatus->plmnInfo.mnc ) );
}

return cellularStatus;
Expand Down Expand Up @@ -2711,7 +2721,7 @@ static uint32_t appendBinaryPattern( char * cmdBuf,
* The max length of the string is fixed and checked offline. */
/* coverity[misra_c_2012_rule_21_6_violation]. */
( void ) snprintf( cmdBuf, cmdLen, "\"" PRINTF_BINARY_PATTERN_INT8 "\"%c",
( uint32_t ) PRINTF_BYTE_TO_BINARY_INT8( value ), endOfString ? '\0' : ',' );
PRINTF_BYTE_TO_BINARY_INT8( value ), endOfString ? '\0' : ',' );
}
else
{
Expand Down
4 changes: 3 additions & 1 deletion source/cellular_pkthandler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@

/*-----------------------------------------------------------*/

#define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
#ifndef MIN
#define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
#endif

/* Windows simulator implementation. */
#if defined( _WIN32 ) || defined( _WIN64 )
Expand Down