Skip to content

Commit e1e6fed

Browse files
committed
Minor changes
- CAN API V3 Utility sources to rev. 1481 Relates to [CANAPI-114]
1 parent 0f79a31 commit e1e6fed

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Utilities/can_moni/Sources/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ bool CCanDevice::IsBlacklisted(int32_t library, int32_t blacklist[]) {
505505
#endif
506506

507507
/* List standard CAN bit-rate settings (only a choise):
508-
* - CAN 2.0 (Classical CAN)
509-
* - CAN FD w/0 Bit-rate Switching (BRS)
508+
* - CAN CC (Classical CAN)
509+
* - CAN FD w/o Bit-rate Switching (BRS)
510510
* - CAN FD with Bit-rate Switching (BRS)
511511
* return the number of standard CAN bit-rate settings
512512
*/
@@ -544,7 +544,7 @@ int CCanDevice::ListCanBitrates(CANAPI_OpMode_t opMode) {
544544
#else
545545
{
546546
#endif
547-
fprintf(stdout, "Bitrates - CAN 2.0 (Classical CAN):\n");
547+
fprintf(stdout, "Bitrates - CAN CC (Classical CAN):\n");
548548
BITRATE_1M(bitrate[n]); n += 1;
549549
#if (BITRATE_800K_UNSUPPORTED == 0)
550550
BITRATE_800K(bitrate[n]); n += 1;

Utilities/can_send/Sources/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ bool CCanDevice::IsBlacklisted(int32_t library, int32_t blacklist[]) {
564564
#endif
565565

566566
/* List standard CAN bit-rate settings (only a choise):
567-
* - CAN 2.0 (Classical CAN)
568-
* - CAN FD w/0 Bit-rate Switching (BRS)
567+
* - CAN CC (Classical CAN)
568+
* - CAN FD w/o Bit-rate Switching (BRS)
569569
* - CAN FD with Bit-rate Switching (BRS)
570570
* return the number of standard CAN bit-rate settings
571571
*/
@@ -603,7 +603,7 @@ int CCanDevice::ListCanBitrates(CANAPI_OpMode_t opMode) {
603603
#else
604604
{
605605
#endif
606-
fprintf(stdout, "Bitrates - CAN 2.0 (Classical CAN):\n");
606+
fprintf(stdout, "Bitrates - CAN CC (Classical CAN):\n");
607607
BITRATE_1M(bitrate[n]); n += 1;
608608
#if (BITRATE_800K_UNSUPPORTED == 0)
609609
BITRATE_800K(bitrate[n]); n += 1;

Utilities/can_test/Sources/Options_p.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ void SOptions::ShowUsage(FILE* stream, bool args) {
911911
#if (CAN_FD_SUPPORTED != 0)
912912
fprintf(stream, " -m, --mode=(CCF|FDF[+BRS]) CAN operation mode: CAN CC or CAN FD mode\n");
913913
#else
914-
fprintf(stream, " -m, --mode=CCF CAN operation mode: CAN 2.0\n");
914+
fprintf(stream, " -m, --mode=CCF CAN operation mode: CAN CC mode\n");
915915
#endif
916916
#if (CAN_SHARED_SUPPORTED != 0)
917917
fprintf(stream, " --shared shared CAN controller access (if supported)\n");
@@ -953,7 +953,7 @@ void SOptions::ShowUsage(FILE* stream, bool args) {
953953
#if (CAN_FD_SUPPORTED != 0)
954954
fprintf(stream, " -m, --mode=(CCF|FDF[+BRS]) CAN operation mode: CAN CC or CAN FD mode\n");
955955
#else
956-
fprintf(stream, " -m, --mode=CCF CAN operation mode: CAN 2.0\n");
956+
fprintf(stream, " -m, --mode=CCF CAN operation mode: CAN CC mode\n");
957957
#endif
958958
#if (CAN_SHARED_SUPPORTED != 0)
959959
fprintf(stream, " --shared shared CAN controller access (if supported)\n");

Utilities/can_test/Sources/Options_w.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ void SOptions::ShowUsage(FILE* stream, bool args) {
10691069
#if (CAN_FD_SUPPORTED != 0)
10701070
fprintf(stream, " /Mode:(CCf|FDf[+BRS]) CAN operation mode: CAN CC or CAN FD mode\n");
10711071
#else
1072-
fprintf(stream, " /Mode:CCf CAN operation mode: CAN 2.0\n");
1072+
fprintf(stream, " /Mode:CCf CAN operation mode: CAN CC mode\n");
10731073
#endif
10741074
#if (CAN_SHARED_SUPPORTED != 0)
10751075
fprintf(stream, " /SHARED shared CAN controller access (if supported)\n");

Utilities/can_test/Sources/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ bool CCanDevice::IsBlacklisted(int32_t library, int32_t blacklist[]) {
505505
#endif
506506

507507
/* List standard CAN bit-rate settings (only a choise):
508-
* - CAN 2.0 (Classical CAN)
509-
* - CAN FD w/0 Bit-rate Switching (BRS)
508+
* - CAN CC (Classical CAN)
509+
* - CAN FD w/o Bit-rate Switching (BRS)
510510
* - CAN FD with Bit-rate Switching (BRS)
511511
* return the number of standard CAN bit-rate settings
512512
*/
@@ -544,7 +544,7 @@ int CCanDevice::ListCanBitrates(CANAPI_OpMode_t opMode) {
544544
#else
545545
{
546546
#endif
547-
fprintf(stdout, "Bitrates - CAN 2.0 (Classical CAN):\n");
547+
fprintf(stdout, "Bitrates - CAN CC (Classical CAN):\n");
548548
BITRATE_1M(bitrate[n]); n += 1;
549549
#if (BITRATE_800K_UNSUPPORTED == 0)
550550
BITRATE_800K(bitrate[n]); n += 1;

0 commit comments

Comments
 (0)