resurrect usb camera

romi · May 23, 2024 · 0b201eb · 0b201eb
1 parent 136da05
commit 0b201eb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/applications/romi-remote-client/src/main_client.cpp b/applications/romi-remote-client/src/main_client.cpp
@@ -173,8 +173,8 @@ int main(int argc, char** argv)
 
                 rcom::Address remote_address(romi::ScriptHubListeningPort);
 
-                if (options.is_set(romi::RoverOptions::registry)) {
-                        std::string ip = options.get_value(romi::RoverOptions::registry);
+                if (options.is_set(romi::RoverOptions::kRegistry)) {
+                        std::string ip = options.get_value(romi::RoverOptions::kRegistry);
                         r_info("Registry IP set to %s", ip.c_str());
                         remote_address.set(ip.c_str(), romi::ScriptHubListeningPort);
                 }

diff --git a/applications/romi-rover/main.cpp b/applications/romi-rover/main.cpp
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
                 nlohmann::json config = nlohmann::json::parse(ifs);
 
                 // Registry
-                std::string registry = options.get_value(romi::RoverOptions::registry);
+                std::string registry = options.get_value(romi::RoverOptions::kRegistry);
                 if (!registry.empty())
                         rcom::RegistryServer::set_address(registry.c_str());
 

diff --git a/applications/weeder/eval.cpp b/applications/weeder/eval.cpp
@@ -79,18 +79,18 @@ static std::vector<romi::Option> eval_options = {
 
         // File paths
 
-        { romi::RoverOptions::config, true, "config.json",
+        { romi::RoverOptions::kConfig, true, "config.json",
           "Path of the config file" },
 
-        { romi::RoverOptions::session_directory, true, ".",
+        { romi::RoverOptions::kSessionDirectory, true, ".",
           "The session directory where the output "
           "files are stored (logs, images...)"},
 
-        { romi::RoverOptions::camera_classname, true, romi::FileCamera::ClassName,
+        { romi::RoverOptions::kCameraClassname, true, romi::FileCamera::ClassName,
           "The classname of the camera to instanciate "
           "(default: file-camera)."},
 
-        { romi::RoverOptions::camera_image, true, nullptr,
+        { romi::RoverOptions::kCameraImage, true, nullptr,
           "The path of the image file for the file camera."},
 
         { kCNCControllerClassname.c_str(), true, romi::FakeCNCController::ClassName,
@@ -129,7 +129,7 @@ int main(int argc, char** argv)
                         exit(0);
                 }
 
-                std::string path = options.get_value(romi::RoverOptions::config);
+                std::string path = options.get_value(romi::RoverOptions::kConfig);
                 if (path.empty())
                         throw std::runtime_error("No configuration file was given");
 

diff --git a/config/cablebot-v3.json b/config/cablebot-v3.json
@@ -25,7 +25,7 @@
             ]
         },
         "external-camera": {
-            "executable": "/home/hanappe/projects/ROMI/github/rover/romi-rover-build-and-test/applications/romi-cablebot/vgrabbj/grab.sh",
+            "path": "/home/romi/romi-rover-build-and-test/applications/romi-cablebot/libcamera/grab.sh",
             "height": 1080,
             "width": 1920
         },

diff --git a/librcom b/librcom
diff --git a/libromi b/libromi
+2 −2		libromi/include/cablebot/Cablebot.h
+4 −0		libromi/include/camera/CameraFactory.h
+14 −9		libromi/include/camera/ICameraSettings.h
+5 −4		libromi/include/camera/USBCamera.h
+4 −3		libromi/include/cv/cv.h
+37 −38		libromi/src/cablebot/Cablebot.cpp
+39 −7		libromi/src/camera/CameraFactory.cpp
+32 −8		libromi/src/camera/USBCamera.cpp
+2 −0		libromi/src/rpc/CameraAdaptor.cpp