Compare commits

..

No commits in common. "52db71754dfcceef1e80c893b9d78d163467248c" and "154c58792e8f069de80be95bd01144c8701673a1" have entirely different histories.

6 changed files with 6 additions and 11 deletions

View File

@ -1,8 +1,3 @@
v3.1.2
Update libicsneo
Update copyright
Add scan-interval-ms parameter (Jorge Alejandro <jorge.a.alejandro@gmail.com>)
v3.1.1 v3.1.1
Update libicsneo Update libicsneo

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
project(libicsneo-socketcan-daemon VERSION 3.1.2) project(libicsneo-socketcan-daemon VERSION 3.1.1)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)

View File

@ -1,4 +1,4 @@
Copyright (c) 2016-2024 Intrepid Control Systems, Inc. Copyright (c) 2016-2023 Intrepid Control Systems, Inc.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

View File

@ -1,4 +1,4 @@
Version 3.1.2 Version 3.1.1
This is the usermode daemon for the Intrepid Control Systems SocketCAN support. This daemon requires that ```intrepid.ko``` is loaded on your system. This is the usermode daemon for the Intrepid Control Systems SocketCAN support. This daemon requires that ```intrepid.ko``` is loaded on your system.

View File

@ -202,7 +202,7 @@ std::string sanitizeInterfaceName(std::string str) {
void header() { void header() {
std::cout << "The libicsneo SocketCAN Usermode Daemon\n"; std::cout << "The libicsneo SocketCAN Usermode Daemon\n";
std::cout << "Copyright Intrepid Control Systems, Inc. 2024\n\n"; std::cout << "Copyright Intrepid Control Systems, Inc. 2023\n\n";
std::cout << "Daemon v"; std::cout << "Daemon v";
std::cout << (int)ICSNEO_SOCKETCAN_BUILD_MAJOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_MINOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_PATCH; std::cout << (int)ICSNEO_SOCKETCAN_BUILD_MAJOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_MINOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_PATCH;
if(ICSNEO_SOCKETCAN_BUILD_METADATA[0] != '\0') if(ICSNEO_SOCKETCAN_BUILD_METADATA[0] != '\0')
@ -219,7 +219,7 @@ void header() {
void usage(std::string executableName) { void usage(std::string executableName) {
std::cerr << "The libicsneo SocketCAN Usermode Daemon\n"; std::cerr << "The libicsneo SocketCAN Usermode Daemon\n";
std::cerr << "Copyright 2019-2024 Intrepid Control Systems, Inc.\n\n"; std::cerr << "Copyright 2019-2023 Intrepid Control Systems, Inc.\n\n";
std::cerr << "Usage: " << executableName << " [option]\n\n"; std::cerr << "Usage: " << executableName << " [option]\n\n";
std::cerr << "Options:\n"; std::cerr << "Options:\n";
std::cerr << "\t-d, --daemon\t\t\tRun as a daemon in the background\n"; std::cerr << "\t-d, --daemon\t\t\tRun as a daemon in the background\n";

@ -1 +1 @@
Subproject commit d56e66afd3ed1d154ad9dd7cafe537bb8ff9156e Subproject commit 9ef93eb73e1ada72ccc7a571744b9db1a564f18b