sven
/
icsscand
mirror of https://github.com/intrepidcs/icsscand.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

3.1.0 

Update libicsneo & copyright
pull/13/head
Kyle Schwarz 2023-05-05 00:26:52 -04:00
parent eca0ec0c25
commit 3e96cc9105
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
v3.1.0
Update libicsneo
Update copyright
v3.0.0
Added Functionality for Ethernet
v2.1.0
Update copyright date
Update to libicsneo v0.3.0

2
LICENSE
View File

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

2
README.md
View File

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

6
src/main.cpp
View File

@ -199,7 +199,7 @@ std::string sanitizeInterfaceName(std::string str) {
void header() {
std::cout << "The libicsneo SocketCAN Usermode Daemon\n";
std::cout << "Copyright Intrepid Control Systems, Inc. 2019\n\n";
std::cout << "Copyright Intrepid Control Systems, Inc. 2023\n\n";
std::cout << "Daemon v";
std::cout << (int)ICSNEO_SOCKETCAN_BUILD_MAJOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_MINOR << '.' << (int)ICSNEO_SOCKETCAN_BUILD_PATCH;
if(ICSNEO_SOCKETCAN_BUILD_METADATA[0] != '\0')
@ -216,7 +216,7 @@ void header() {
void usage(std::string executableName) {
std::cerr << "The libicsneo SocketCAN Usermode Daemon\n";
std::cerr << "Copyright 2019-2022 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 << "Options:\n";
std::cerr << "\t-d, --daemon\t\tRun as a daemon in the background\n";
@ -305,7 +305,7 @@ void searchForDevices() {
}
// Create rx listener
newDevice.device->addMessageCallback(icsneo::MessageCallback([serial](std::shared_ptr<icsneo::Message> message) {
newDevice.device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([serial](std::shared_ptr<icsneo::Message> message) {
const auto frame = std::static_pointer_cast<icsneo::Frame>(message);
const auto messageType = frame->network.getType();
const OpenDevice* openDevice = nullptr;

2
third-party/libicsneo vendored

@ -1 +1 @@
Subproject commit 0ff12300f34be54ec7d3380a4ab6693a7d7c3fb1
Subproject commit b6d9ef4c7ec48a8f6cf4aaf6c3ab74bea5a77d6b