diff --git a/modules/CarConfig/CarConfig b/modules/CarConfig/CarConfig new file mode 120000 index 0000000000000000000000000000000000000000..beafaae748b85be2376a7b3cc63af4260613e56b --- /dev/null +++ b/modules/CarConfig/CarConfig @@ -0,0 +1 @@ +/home/bethke/Repositories/Semesterprojekt/Gruppe-A-intern/modules/CarConfig/ \ No newline at end of file diff --git a/modules/CarConfig/environment.config b/modules/CarConfig/environment.config new file mode 100644 index 0000000000000000000000000000000000000000..9ee0d91d01dfc35bc4b7bcb70f095a527abc65e3 --- /dev/null +++ b/modules/CarConfig/environment.config @@ -0,0 +1,20 @@ +// Numbers on name representing indicies +// current car state +x1: 0 +x2: 0 +// covariance matrix +p11: 10 +p22: 10 +// dynamic model +f11: 1 +f12: 0.001 +f21: 0 +f22: 1 +// process error +q11: 1 +q22: 1 +// measure vector +h1: 1 +h2: 0 +// measurement error +r: 5 diff --git a/modules/CarConfig/platoon.config b/modules/CarConfig/platoon.config new file mode 100644 index 0000000000000000000000000000000000000000..76a1da8f7b6b75fa64677cd79953dcae0ca0ee43 --- /dev/null +++ b/modules/CarConfig/platoon.config @@ -0,0 +1,2 @@ +VehicleId: 1 use 1,2 or 3 here depending on the position of the car in platoon; 1 = LEADER +BroadCast: 10.255.255.255 diff --git a/modules/catkin_ws/src/car/src/environment/Environment.cpp b/modules/catkin_ws/src/car/src/environment/Environment.cpp index f021c34b1031bb1b786d51c2cbbb262741c20abb..7fb8a84c5386518fd0c0104b94c2ad10c4fd6acb 100644 --- a/modules/catkin_ws/src/car/src/environment/Environment.cpp +++ b/modules/catkin_ws/src/car/src/environment/Environment.cpp @@ -39,7 +39,7 @@ void Environment::readConfigFile() // open config file std::string userHome = getenv("HOME"); std::ifstream configFile; - configFile.open(userHome + "/.CarConfig/environment.config", std::ifstream::in); + configFile.open(userHome + "/CarConfig/environment.config", std::ifstream::in); if (!configFile.is_open()) { throw FileNotFound(); } // desired parameters diff --git a/modules/catkin_ws/src/car/src/mainNode/MainNode.cpp b/modules/catkin_ws/src/car/src/mainNode/MainNode.cpp index 7a98560f7c6734fcdc8840fe189b2349aba39a41..11d44623bd919d81f9ba69a5fca94a6aaeca9482 100644 --- a/modules/catkin_ws/src/car/src/mainNode/MainNode.cpp +++ b/modules/catkin_ws/src/car/src/mainNode/MainNode.cpp @@ -24,7 +24,7 @@ platoonProtocol::NetworkInfo readNetworkInfo() { // open config file std::string userHome = getenv("HOME"); std::ifstream configFile; - configFile.open(userHome + "/.CarConfig/platoon.config", std::ifstream::in); + configFile.open(userHome + "/CarConfig/platoon.config", std::ifstream::in); if (!configFile.is_open()) { throw FileNotFound(); } // desired parameters