Revert "refactor(core): move the control function' create and destroy…

… functions to the network manager"

This reverts commit 6146f1e.

examples/diagnostic_protocol/main.cpp

@@ -66,7 +66,7 @@ int main()
 	TestDeviceNAME.set_device_class_instance(0);
 	TestDeviceNAME.set_manufacturer_code(1407);
 
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
 	// Make sure address claiming is done before we continue
 	auto addressClaimedFuture = std::async(std::launch::async, [&TestInternalECU]() {

examples/nmea2000/fast_packet_protocol/main.cpp

@@ -86,7 +86,7 @@ int main()
 	TestDeviceNAME.set_device_class_instance(0);
 	TestDeviceNAME.set_manufacturer_code(1407);
 
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
 	isobus::CANNetworkManager::CANNetwork.get_fast_packet_protocol(0)->register_multipacket_message_callback(0x1F001, nmea2k_callback, nullptr);
 

examples/nmea2000/nmea2000_generator/main.cpp

@@ -64,7 +64,7 @@ int main()
 	TestDeviceNAME.set_device_class_instance(0);
 	TestDeviceNAME.set_manufacturer_code(1407);
 
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
 	// Make sure address claiming is done before we continue
 	auto addressClaimedFuture = std::async(std::launch::async, [&TestInternalECU]() {

examples/nmea2000/nmea2000_parser/main.cpp

@@ -139,7 +139,7 @@ int main()
 	TestDeviceNAME.set_device_class_instance(0);
 	TestDeviceNAME.set_manufacturer_code(1407);
 
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1D, 0);
 
 	// Make sure address claiming is done before we continue
 	auto addressClaimedFuture = std::async(std::launch::async, [&TestInternalECU]() {

examples/pgn_requests/main.cpp

@@ -128,7 +128,7 @@ int main()
 	TestDeviceNAME.set_device_class_instance(0);
 	TestDeviceNAME.set_manufacturer_code(1407);
 
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 	std::signal(SIGINT, signal_handler);
 
 	// Make sure address claiming is done before we continue

examples/seeder_example/seeder.cpp

@@ -11,7 +11,6 @@
 #include "isobus/hardware_integration/available_can_drivers.hpp"
 #include "isobus/hardware_integration/can_hardware_interface.hpp"
 #include "isobus/isobus/isobus_diagnostic_protocol.hpp"
-#include "isobus/isobus/isobus_preferred_addresses.hpp"
 #include "isobus/isobus/isobus_standard_data_description_indices.hpp"
 #include "isobus/isobus/isobus_task_controller_client.hpp"
 
@@ -77,9 +76,9 @@ bool Seeder::initialize()
 		                                                      filterTaskControllerIndustryGroup,
 		                                                      filterTaskControllerDeviceClass };
 	const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
-	auto InternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto PartnerVT = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, vtNameFilters);
-	auto PartnerTC = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, tcNameFilters);
+	auto InternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x81, 0);
+	auto PartnerVT = isobus::PartneredControlFunction::create(0, vtNameFilters);
+	auto PartnerTC = isobus::PartneredControlFunction::create(0, tcNameFilters);
 
 	diagnosticProtocol = std::make_unique<isobus::DiagnosticProtocol>(InternalECU);
 	diagnosticProtocol->initialize();

examples/task_controller_client/main.cpp

@@ -83,8 +83,8 @@ int main()
 		                                                      filterTaskControllerInstance,
 		                                                      filterTaskControllerIndustryGroup,
 		                                                      filterTaskControllerDeviceClass };
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto TestPartnerTC = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, tcNameFilters);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
+	auto TestPartnerTC = isobus::PartneredControlFunction::create(0, tcNameFilters);
 
 	TestTCClient = std::make_shared<isobus::TaskControllerClient>(TestPartnerTC, TestInternalECU, nullptr);
 

examples/transport_layer/main.cpp

@@ -77,10 +77,10 @@ int main()
 	const NAMEFilter filterOriginator(NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(NAME::Function::SteeringControl));
 	const NAMEFilter filterRecipient(NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(NAME::Function::VirtualTerminal));
 
-	auto originatorECU = CANNetworkManager::CANNetwork.create_internal_control_function(originatorNAME, 0, 0x1C);
-	auto originatorPartner = CANNetworkManager::CANNetwork.create_partnered_control_function(1, { filterOriginator });
-	auto recipientECU = CANNetworkManager::CANNetwork.create_internal_control_function(recipientNAME, 1, 0x1D);
-	auto recipientPartner = CANNetworkManager::CANNetwork.create_partnered_control_function(0, { filterRecipient });
+	auto originatorECU = InternalControlFunction::create(originatorNAME, 0x1C, 0);
+	auto originatorPartner = PartneredControlFunction::create(1, { filterOriginator });
+	auto recipientECU = InternalControlFunction::create(recipientNAME, 0x1D, 1);
+	auto recipientPartner = PartneredControlFunction::create(0, { filterRecipient });
 
 	// We want to make sure address claiming is successful before continuing
 	auto addressClaimedFuture = std::async(std::launch::async, [&originatorECU, &recipientECU, &originatorPartner, &recipientPartner]() {

examples/virtual_terminal/aux_functions/main.cpp

@@ -96,8 +96,8 @@ int main()
 
 	const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 	const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto TestPartnerVT = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, vtNameFilters);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1D, 0);
+	auto TestPartnerVT = isobus::PartneredControlFunction::create(0, vtNameFilters);
 
 	TestVirtualTerminalClient = std::make_shared<isobus::VirtualTerminalClient>(TestPartnerVT, TestInternalECU);
 	TestVirtualTerminalClient->set_object_pool(0, testPool.data(), testPool.size(), objectPoolHash);

examples/virtual_terminal/aux_inputs/main.cpp

@@ -159,8 +159,8 @@ int main()
 
 	const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 	const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto TestPartnerVT = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, vtNameFilters);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1E, 0);
+	auto TestPartnerVT = isobus::PartneredControlFunction::create(0, vtNameFilters);
 
 	TestVirtualTerminalClient = std::make_shared<isobus::VirtualTerminalClient>(TestPartnerVT, TestInternalECU);
 	TestVirtualTerminalClient->set_object_pool(0, testPool.data(), testPool.size(), objectPoolHash);

examples/virtual_terminal/esp32_platformio_object_pool/src/main.cpp

@@ -131,8 +131,8 @@ extern "C" void app_main()
 
 	const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 	const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto TestPartnerVT = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, vtNameFilters);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
+	auto TestPartnerVT = isobus::PartneredControlFunction::create(0, vtNameFilters);
 
 	virtualTerminalClient = std::make_shared<isobus::VirtualTerminalClient>(TestPartnerVT, TestInternalECU);
 	virtualTerminalClient->set_object_pool(0, testPool, (object_pool_end - object_pool_start) - 1, "ais1");

examples/virtual_terminal/version3_object_pool/main.cpp

@@ -159,8 +159,8 @@ int main()
 
 	const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 	const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
-	auto TestInternalECU = isobus::CANNetworkManager::CANNetwork.create_internal_control_function(TestDeviceNAME, 0);
-	auto TestPartnerVT = isobus::CANNetworkManager::CANNetwork.create_partnered_control_function(0, vtNameFilters);
+	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
+	auto TestPartnerVT = isobus::PartneredControlFunction::create(0, vtNameFilters);
 
 	virtualTerminalClient = std::make_shared<isobus::VirtualTerminalClient>(TestPartnerVT, TestInternalECU);
 	virtualTerminalClient->set_object_pool(0, testPool.data(), testPool.size(), objectPoolHash);

isobus/include/isobus/isobus/can_control_function.hpp

@@ -5,7 +5,7 @@
 /// @author Adrian Del Grosso
 /// @author Daan Steenbergen
 ///
-/// @copyright 2024 The Open-Agriculture Developers
+/// @copyright 2022 Adrian Del Grosso
 //================================================================================================
 
 #ifndef CAN_CONTROL_FUNCTION_HPP
@@ -19,8 +19,12 @@
 
 namespace isobus
 {
+	//================================================================================================
+	/// @class ControlFunction
+	///
 	/// @brief A class that describes an ISO11783 control function, which includes a NAME and address.
-	class ControlFunction
+	//================================================================================================
+	class ControlFunction : public std::enable_shared_from_this<ControlFunction>
 	{
 	public:
 		/// @brief The type of the control function
@@ -31,15 +35,19 @@ namespace isobus
 			Partnered ///< An external control function that you explicitly want to talk to
 		};
 
-		/// @brief The constructor of a control function. In most cases use `CANNetworkManager::create_internal_control_function()` or
-		/// `CANNetworkManager::create_partnered_control_function()` instead, only use this constructor if you have advanced needs.
+		virtual ~ControlFunction() = default;
+
+		/// @brief The factory function to construct a control function
 		/// @param[in] NAMEValue The NAME of the control function
 		/// @param[in] addressValue The current address of the control function
 		/// @param[in] CANPort The CAN channel index that the control function communicates on
-		/// @param[in] type The 'Type' of control function to create
-		ControlFunction(NAME NAMEValue, std::uint8_t addressValue, std::uint8_t CANPort, Type type = Type::External);
+		/// @returns A shared pointer to a ControlFunction object created with the parameters passed in
+		static std::shared_ptr<ControlFunction> create(NAME NAMEValue, std::uint8_t addressValue, std::uint8_t CANPort);
 
-		virtual ~ControlFunction() = default;
+		/// @brief Destroys this control function, by removing it from the network manager
+		/// @param[in] expectedRefCount The expected number of shared pointers to this control function after removal
+		/// @returns true if the control function was successfully removed from everywhere in the stack, otherwise false
+		virtual bool destroy(std::uint32_t expectedRefCount = 1);
 
 		/// @brief Returns the current address of the control function
 		/// @returns The current address of the control function
@@ -66,6 +74,13 @@ namespace isobus
 		std::string get_type_string() const;
 
 	protected:
+		/// @brief The protected constructor for the control function, which is called by the (inherited) factory function
+		/// @param[in] NAMEValue The NAME of the control function
+		/// @param[in] addressValue The current address of the control function
+		/// @param[in] CANPort The CAN channel index that the control function communicates on
+		/// @param[in] type The 'Type' of control function to create
+		ControlFunction(NAME NAMEValue, std::uint8_t addressValue, std::uint8_t CANPort, Type type = Type::External);
+
 		friend class CANNetworkManager; ///< The network manager needs access to the control function's internals
 		static Mutex controlFunctionProcessingMutex; ///< Protects the control function tables
 		const Type controlFunctionType; ///< The Type of the control function

isobus/include/isobus/isobus/can_internal_control_function.hpp

@@ -34,13 +34,31 @@ namespace isobus
 	class InternalControlFunction : public ControlFunction
 	{
 	public:
-		/// @brief The constructor of an internal control function.
-		/// In most cases use `CANNetworkManager::create_internal_control_function()` instead,
-		/// only use this constructor if you have advanced needs.
+		/// @brief The factory function to construct an internal control function
 		/// @param[in] desiredName The NAME for this control function to claim as
 		/// @param[in] preferredAddress The preferred NAME for this control function
 		/// @param[in] CANPort The CAN channel index for this control function to use
-		InternalControlFunction(NAME desiredName, std::uint8_t preferredAddress, std::uint8_t CANPort);
+		/// @returns A shared pointer to an InternalControlFunction object created with the parameters passed in
+		static std::shared_ptr<InternalControlFunction> create(NAME desiredName, std::uint8_t preferredAddress, std::uint8_t CANPort);
+
+		/// @brief The factory function to construct an internal control function.
+		/// This version of the factory function will automatically assign the preferred address somewhere in the arbitrary address
+		/// range, which means your NAME must have the arbitrary address bit set.
+		/// @param[in] desiredName The NAME for this control function to claim as
+		/// @param[in] CANPort The CAN channel index for this control function to use
+		/// @returns A shared pointer to an InternalControlFunction object created with the parameters passed in
+		static std::shared_ptr<InternalControlFunction> create(NAME desiredName, std::uint8_t CANPort);
+
+		/// @brief Destroys this control function, by removing it from the network manager
+		/// @param[in] expectedRefCount The expected number of shared pointers to this control function after removal
+		/// @returns true if the control function was successfully removed from everywhere in the stack, otherwise false
+		bool destroy(std::uint32_t expectedRefCount = 1) override;
+
+		/// @brief The protected constructor for the internal control function, which is called by the (inherited) factory function
+		/// @param[in] desiredName The NAME for this control function to claim as
+		/// @param[in] preferredAddress The preferred NAME for this control function
+		/// @param[in] CANPort The CAN channel index for this control function to use
+		InternalControlFunction(NAME desiredName, std::uint8_t preferredAddress, std::uint8_t CANPort, CANLibBadge<InternalControlFunction>);
 
 		/// @brief Used to inform the member address claim state machine that two CFs are using the same source address.
 		/// @note Address violation occurs when two CFs are using the same source address.
@@ -59,12 +77,9 @@ namespace isobus
 		/// @returns The PGN request protocol for this ICF
 		std::weak_ptr<ParameterGroupNumberRequestProtocol> get_pgn_request_protocol() const;
 
-	protected:
-		friend class CANNetworkManager; ///< Allow the network manager to access the pgn request protocol
-		std::shared_ptr<ParameterGroupNumberRequestProtocol> pgnRequestProtocol; ///< The PGN request protocol for this ICF
-
 	private:
 		AddressClaimStateMachine stateMachine; ///< The address claimer for this ICF
+		std::shared_ptr<ParameterGroupNumberRequestProtocol> pgnRequestProtocol; ///< The PGN request protocol for this ICF
 	};
 
 } // namespace isobus