From 3e96cc9105caeefd603bfbd671ea3297a1e7a368 Mon Sep 17 00:00:00 2001
From: Kyle Schwarz <kschwarz@intrepidcs.com>
Date: Fri, 5 May 2023 00:26:52 -0400
Subject: [PATCH] 3.1.0

Update libicsneo & copyright
---
 CHANGELOG             | 7 +++++++
 LICENSE               | 2 +-
 README.md             | 2 +-
 src/main.cpp          | 6 +++---
 third-party/libicsneo | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6fda214..4940c16 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
diff --git a/LICENSE b/LICENSE
index 2553c95..fbde150 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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
diff --git a/README.md b/README.md
index 660035f..bcc38bb 100644
--- a/README.md
+++ b/README.md
@@ -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.
 
diff --git a/src/main.cpp b/src/main.cpp
index aa730d3..5f5de68 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;
diff --git a/third-party/libicsneo b/third-party/libicsneo
index 0ff1230..b6d9ef4 160000
--- a/third-party/libicsneo
+++ b/third-party/libicsneo
@@ -1 +1 @@
-Subproject commit 0ff12300f34be54ec7d3380a4ab6693a7d7c3fb1
+Subproject commit b6d9ef4c7ec48a8f6cf4aaf6c3ab74bea5a77d6b