Skip to content

Commit 53db869

Browse files
uv-softwareuv-software
committed
Apply some minor changes
Relates to [CANAPI-25]
1 parent d62cf6f commit 53db869

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎Examples/C++/can_send.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ int main(int argc, const char * argv[]) {
6161
end:
6262
if ((result = can_exit(handle)) < 0)
6363
std::cerr << "+++ error: interface could not be shutdown" << std::endl;
64+
std::cerr << "Cheers!" << std::endl;
6465
return result;
6566
}

‎Sources/Wrapper/can_api.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,6 @@ static int string2bitrate(const TPCANBitrateFD string, can_bitrate_t *bitrate, i
10821082
static int lib_parameter(uint16_t param, void *value, size_t nbyte)
10831083
{
10841084
int rc = CANERR_ILLPARA; // suppose an invalid parameter
1085-
int i = 0; // one always needs an i
10861085

10871086
static int idx_board = EOF; // actual index in the interface list
10881087
TPCANStatus sts; // status or error code

‎Trial/Sources/main.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ int main(int argc, const char * argv[]) {
7070
CANAPI_Bitrate_t bitrate = {};
7171
bitrate.index = CANBTR_INDEX_250K;
7272
can_message_t message = {};
73-
message.id = 0x55AU,
74-
message.xtd = 0,
75-
message.rtr = 0,
76-
message.dlc = CAN_MAX_DLC,
73+
message.id = 0x55AU;
74+
message.xtd = 0;
75+
message.rtr = 0;
76+
message.dlc = CAN_MAX_DLC;
7777
message.data[0] = 0x11;
7878
message.data[1] = 0x22;
7979
message.data[2] = 0x33;
@@ -85,7 +85,7 @@ int main(int argc, const char * argv[]) {
8585
message.timestamp.tv_sec = 0;
8686
message.timestamp.tv_nsec = 0;
8787
CANAPI_Return_t retVal = 0;
88-
int32_t channel = PCAN_USB1;
88+
int32_t channel = (int32_t)PCAN_USB1;
8989
uint16_t timeout = CANREAD_INFINITE;
9090
unsigned int delay = 0U;
9191
CCANAPI::EChannelState state;
@@ -106,22 +106,22 @@ int main(int argc, const char * argv[]) {
106106
int option_transmit = OPTION_NO;
107107
for (int i = 1, opt = 0; i < argc; i++) {
108108
/* PCAN-USB channel */
109-
if (!strcmp(argv[i], "PCAN-USB1")) channel = PCAN_USB1;
110-
if (!strcmp(argv[i], "PCAN-USB2")) channel = PCAN_USB2;
111-
if (!strcmp(argv[i], "PCAN-USB3")) channel = PCAN_USB3;
112-
if (!strcmp(argv[i], "PCAN-USB4")) channel = PCAN_USB4;
113-
if (!strcmp(argv[i], "PCAN-USB5")) channel = PCAN_USB5;
114-
if (!strcmp(argv[i], "PCAN-USB6")) channel = PCAN_USB6;
115-
if (!strcmp(argv[i], "PCAN-USB7")) channel = PCAN_USB7;
116-
if (!strcmp(argv[i], "PCAN-USB8")) channel = PCAN_USB8;
117-
if (!strcmp(argv[i], "PCAN-USB9")) channel = PCAN_USB9;
118-
if (!strcmp(argv[i], "PCAN-USB10")) channel = PCAN_USB10;
119-
if (!strcmp(argv[i], "PCAN-USB11")) channel = PCAN_USB11;
120-
if (!strcmp(argv[i], "PCAN-USB12")) channel = PCAN_USB12;
121-
if (!strcmp(argv[i], "PCAN-USB13")) channel = PCAN_USB13;
122-
if (!strcmp(argv[i], "PCAN-USB14")) channel = PCAN_USB14;
123-
if (!strcmp(argv[i], "PCAN-USB15")) channel = PCAN_USB15;
124-
if (!strcmp(argv[i], "PCAN-USB16")) channel = PCAN_USB16;
109+
if (!strcmp(argv[i], "PCAN-USB1")) channel = (int32_t)PCAN_USB1;
110+
if (!strcmp(argv[i], "PCAN-USB2")) channel = (int32_t)PCAN_USB2;
111+
if (!strcmp(argv[i], "PCAN-USB3")) channel = (int32_t)PCAN_USB3;
112+
if (!strcmp(argv[i], "PCAN-USB4")) channel = (int32_t)PCAN_USB4;
113+
if (!strcmp(argv[i], "PCAN-USB5")) channel = (int32_t)PCAN_USB5;
114+
if (!strcmp(argv[i], "PCAN-USB6")) channel = (int32_t)PCAN_USB6;
115+
if (!strcmp(argv[i], "PCAN-USB7")) channel = (int32_t)PCAN_USB7;
116+
if (!strcmp(argv[i], "PCAN-USB8")) channel = (int32_t)PCAN_USB8;
117+
if (!strcmp(argv[i], "PCAN-USB9")) channel = (int32_t)PCAN_USB9;
118+
if (!strcmp(argv[i], "PCAN-USB10")) channel = (int32_t)PCAN_USB10;
119+
if (!strcmp(argv[i], "PCAN-USB11")) channel = (int32_t)PCAN_USB11;
120+
if (!strcmp(argv[i], "PCAN-USB12")) channel = (int32_t)PCAN_USB12;
121+
if (!strcmp(argv[i], "PCAN-USB13")) channel = (int32_t)PCAN_USB13;
122+
if (!strcmp(argv[i], "PCAN-USB14")) channel = (int32_t)PCAN_USB14;
123+
if (!strcmp(argv[i], "PCAN-USB15")) channel = (int32_t)PCAN_USB15;
124+
if (!strcmp(argv[i], "PCAN-USB16")) channel = (int32_t)PCAN_USB16;
125125
/* baud rate (CAN 2.0) */
126126
if (!strcmp(argv[i], "BD:0") || !strcmp(argv[i], "BD:1000")) bitrate.index = CANBTR_INDEX_1M;
127127
if (!strcmp(argv[i], "BD:1") || !strcmp(argv[i], "BD:800")) bitrate.index = CANBTR_INDEX_800K;
@@ -396,7 +396,7 @@ int main(int argc, const char * argv[]) {
396396
#ifdef SECOND_CHANNEL
397397
if ((retVal = mySecond.ReadMessage(message, 0U)) == CCANAPI::NoError) {
398398
if (option_echo) {
399-
fprintf(stdout, ">>> %i\t", frames++);
399+
fprintf(stdout, ">2> %i\t", frames++);
400400
fprintf(stdout, "%7li.%04li\t", (long)message.timestamp.tv_sec, message.timestamp.tv_nsec / 100000);
401401
if (!opMode.fdoe)
402402
fprintf(stdout, "%03x\t%c%c [%i]", message.id, message.xtd ? 'X' : 'S', message.rtr ? 'R' : ' ', message.dlc);

‎Utilities/can_moni/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Options:
4444
data_tseg2=<value> Time segment 2 (FD data)
4545
data_sjw=<value> Sync. jump width (FD data).
4646
Hazard note:
47-
Do not connect your CAN device to a real CAN network when using this program.
48-
This can damage your application.
47+
If you connect your CAN device to a real CAN network when using this program,
48+
you might damage your application.
4949
```
5050

5151
This program is free software: you can redistribute it and/or modify

‎Utilities/can_moni/Sources/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,8 +980,8 @@ static void usage(FILE *stream, const char *program)
980980
fprintf(stream, " data_tseg2=<value> Time segment 2 (FD data)\n");
981981
fprintf(stream, " data_sjw=<value> Sync. jump width (FD data).\n");
982982
fprintf(stream, "Hazard note:\n");
983-
fprintf(stream, " Do not connect your CAN device to a real CAN network when using this program.\n");
984-
fprintf(stream, " This can damage your application.\n");
983+
fprintf(stream, " If you connect your CAN device to a real CAN network when using this program,\n");
984+
fprintf(stream, " you might damage your application.\n");
985985
}
986986

987987
/** @brief shows version information of the program.

‎Utilities/can_test/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Options:
5252
data_tseg2=<value> Time segment 2 (FD data)
5353
data_sjw=<value> Sync. jump width (FD data).
5454
Hazard note:
55-
Do not connect your CAN device to a real CAN network when using this program.
56-
This can damage your application.
55+
If you connect your CAN device to a real CAN network when using this program,
56+
you might damage your application.
5757
```
5858

5959
This program is free software: you can redistribute it and/or modify

‎Utilities/can_test/Sources/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,8 +1193,8 @@ static void usage(FILE *stream, const char *program)
11931193
fprintf(stream, " data_tseg2=<value> Time segment 2 (FD data)\n");
11941194
fprintf(stream, " data_sjw=<value> Sync. jump width (FD data).\n");
11951195
fprintf(stream, "Hazard note:\n");
1196-
fprintf(stream, " Do not connect your CAN device to a real CAN network when using this program.\n");
1197-
fprintf(stream, " This can damage your application.\n");
1196+
fprintf(stream, " If you connect your CAN device to a real CAN network when using this program,\n");
1197+
fprintf(stream, " you might damage your application.\n");
11981198
}
11991199

12001200
/** @brief shows version information of the program.

0 commit comments

Comments
 (0)