Fixed CMakeLists.txt and tests check

src/devices/CMakeLists.txt

@@ -10,122 +10,41 @@ yarp_begin_plugin_library(yarpmod
   OPTION YARP_COMPILE_DEVICE_PLUGINS
   DEFAULT ON
 )
-  add_subdirectory(framegrabber_protocol)
-  add_subdirectory(audioPlayerWrapper)
-  add_subdirectory(audioRecorderWrapper)
-  add_subdirectory(audioRecorder_nwc_yarp)
-  add_subdirectory(audioRecorder_nws_yarp)
+  add_subdirectory(fake)
+  add_subdirectory(messages)
+  add_subdirectory(networkWrappers)
+
   add_subdirectory(audioFromFileDevice)
   add_subdirectory(audioToFileDevice)
   add_subdirectory(openNI2DepthCamera)
-  add_subdirectory(fakeDepthCamera)
-  add_subdirectory(fakebot)
-  add_subdirectory(fakeChatBotDevice)
-  add_subdirectory(fakeMotionControl)
-  add_subdirectory(fakeMotionControlMicro)
-  add_subdirectory(fakeAnalogSensor)
-  add_subdirectory(fakeBattery)
-  add_subdirectory(fakeIMU)
-  add_subdirectory(fakeJointCoupling)
-  add_subdirectory(fakeJoypad)
-  add_subdirectory(fakeLLMDevice)
-  add_subdirectory(fakeOdometry2D)
-  add_subdirectory(fakePositionSensor)
-  add_subdirectory(fakeSerialPort)
-  add_subdirectory(fakeSpeechSynthesizer)
-  add_subdirectory(fakeSpeechTranscription)
   add_subdirectory(frameTransformClient)
   add_subdirectory(frameTransformGet)
   add_subdirectory(frameTransformServer)
   add_subdirectory(frameTransformSet)
-  add_subdirectory(frameTransformStorageMsgs)
   add_subdirectory(frameTransformStorage)
-  add_subdirectory(frameGrabber_nwc_yarp)
-  add_subdirectory(frameGrabber_nws_yarp)
   add_subdirectory(SerialServoBoard)
   add_subdirectory(ffmpeg)
   add_subdirectory(opencv)
   add_subdirectory(serialport)
   add_subdirectory(portaudioPlayer)
   add_subdirectory(portaudioRecorder)
   add_subdirectory(imuBosch_BNO055)
-  add_subdirectory(IChatBotMsgs)
-  add_subdirectory(ILLMMsgs)
-  add_subdirectory(IAudioGrabberMsgs)
-  add_subdirectory(IMap2DMsgs)
-  add_subdirectory(INavigation2DMsgs)
-  add_subdirectory(ILocalization2DMsgs)
-  add_subdirectory(IOdometry2DMsgs)
-  add_subdirectory(ISerialMsgs)
-  add_subdirectory(ISpeechSynthesizerMsgs)
-  add_subdirectory(ISpeechTranscriptionMsgs)
   add_subdirectory(DynamixelAX12Ftdi)
-  add_subdirectory(fakeLaser)
-  add_subdirectory(fakeLaserWithMotor)
-  add_subdirectory(fakeMicrophone)
-  add_subdirectory(fakeSpeaker)
   add_subdirectory(laserFromDepth)
   add_subdirectory(laserFromPointCloud)
   add_subdirectory(laserFromExternalPort)
   add_subdirectory(laserHokuyo)
-  add_subdirectory(fakeFrameGrabber)
   add_subdirectory(SDLJoypad)
-  add_subdirectory(battery_nwc_yarp)
-  add_subdirectory(battery_nws_yarp)
-  add_subdirectory(chatBot_nwc_yarp)
-  add_subdirectory(chatBot_nws_yarp)
   add_subdirectory(upowerBattery)
-  add_subdirectory(Rangefinder2D_nws_yarp)
-  add_subdirectory(Rangefinder2D_nwc_yarp)
-  add_subdirectory(mobileBaseVelocityControl_nwc_yarp)
-  add_subdirectory(mobileBaseVelocityControl_nws_yarp)
-  add_subdirectory(mobileBaseVelocityControlMsgs)
-  add_subdirectory(multipleAnalogSensorsMsgs)
-  add_subdirectory(multipleanalogsensorsserver)
-  add_subdirectory(multipleanalogsensorsclient)
   add_subdirectory(multipleanalogsensorsremapper)
-  add_subdirectory(LLM_nws_yarp)
-  add_subdirectory(LLM_nwc_yarp)
-  add_subdirectory(localization2D_nwc_yarp)
-  add_subdirectory(localization2D_nws_yarp)
-  add_subdirectory(map2D_nwc_yarp)
-  add_subdirectory(map2D_nws_yarp)
   add_subdirectory(map2DStorage)
-  add_subdirectory(navigation2D_nwc_yarp)
-  add_subdirectory(navigation2D_nws_yarp)
-  add_subdirectory(odometry2D_nws_yarp)
-  add_subdirectory(Rangefinder2DClient)
   add_subdirectory(usbCamera)
-  add_subdirectory(fakeLocalizerDevice)
-  add_subdirectory(fakeNavigationDevice)
-  add_subdirectory(serialPort_nws_yarp)
-  add_subdirectory(serialPort_nwc_yarp)
-  add_subdirectory(speechSynthesizer_nws_yarp)
-  add_subdirectory(speechSynthesizer_nwc_yarp)
-  add_subdirectory(speechTranscription_nws_yarp)
-  add_subdirectory(speechTranscription_nwc_yarp)
-  add_subdirectory(RemoteControlBoard)
-  add_subdirectory(AnalogSensorClient)
-  add_subdirectory(AnalogWrapper)
-  add_subdirectory(VirtualAnalogWrapper)
-  add_subdirectory(RGBDSensorClient)
-  add_subdirectory(RGBDSensor_nws_yarp)
-  add_subdirectory(controlBoard_nws_yarp)
   add_subdirectory(controlBoardRemapper)
-  add_subdirectory(RobotDescriptionClient)
-  add_subdirectory(RobotDescriptionServer)
   add_subdirectory(JoypadControlNetUtils)
-  add_subdirectory(JoypadControlClient)
-  add_subdirectory(JoypadControlServer)
   add_subdirectory(frameGrabberCropper)
 
   add_subdirectory(portaudio) # DEPRECATED Since YARP 3.2
 
-  OPTION(YARP_COMPILE_ALL_FAKE_DEVICES
-         "Build all devices marked as fake, for testing purposes. Overrides the option for the single fake device."
-         OFF)
-  mark_as_advanced(YARP_COMPILE_ALL_FAKE_DEVICES)
-
   # Test devices
   add_subdirectory(test_segfault)
   add_subdirectory(test_nop)

src/devices/fake/CMakeLists.txt

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(fakeDepthCamera)
+add_subdirectory(fakebot)
+add_subdirectory(fakeChatBotDevice)
+add_subdirectory(fakeMotionControl)
+add_subdirectory(fakeMotionControlMicro)
+add_subdirectory(fakeAnalogSensor)
+add_subdirectory(fakeBattery)
+add_subdirectory(fakeIMU)
+add_subdirectory(fakeJointCoupling)
+add_subdirectory(fakeJoypad)
+add_subdirectory(fakeLLMDevice)
+add_subdirectory(fakeOdometry2D)
+add_subdirectory(fakePositionSensor)
+add_subdirectory(fakeSerialPort)
+add_subdirectory(fakeSpeechSynthesizer)
+add_subdirectory(fakeSpeechTranscription)
+add_subdirectory(fakeLaser)
+add_subdirectory(fakeLaserWithMotor)
+add_subdirectory(fakeMicrophone)
+add_subdirectory(fakeSpeaker)
+add_subdirectory(fakeFrameGrabber)
+add_subdirectory(fakeLocalizerDevice)
+add_subdirectory(fakeNavigationDevice)
+
+OPTION(YARP_COMPILE_ALL_FAKE_DEVICES
+       "Build all devices marked as fake, for testing purposes. Overrides the option for the single fake device."
+       OFF)
+mark_as_advanced(YARP_COMPILE_ALL_FAKE_DEVICES)

src/devices/messages/CMakeLists.txt

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(framegrabber_protocol)
+add_subdirectory(frameTransformStorageMsgs)
+add_subdirectory(IChatBotMsgs)
+add_subdirectory(ILLMMsgs)
+add_subdirectory(IAudioGrabberMsgs)
+add_subdirectory(IMap2DMsgs)
+add_subdirectory(INavigation2DMsgs)
+add_subdirectory(ILocalization2DMsgs)
+add_subdirectory(IOdometry2DMsgs)
+add_subdirectory(ISerialMsgs)
+add_subdirectory(ISpeechSynthesizerMsgs)
+add_subdirectory(ISpeechTranscriptionMsgs)
+add_subdirectory(mobileBaseVelocityControlMsgs)
+add_subdirectory(multipleAnalogSensorsMsgs)

src/devices/networkWrappers/CMakeLists.txt

@@ -0,0 +1,46 @@
+# SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(audioPlayerWrapper)
+add_subdirectory(audioRecorderWrapper)
+add_subdirectory(audioRecorder_nwc_yarp)
+add_subdirectory(audioRecorder_nws_yarp)
+add_subdirectory(frameGrabber_nwc_yarp)
+add_subdirectory(frameGrabber_nws_yarp)
+add_subdirectory(battery_nwc_yarp)
+add_subdirectory(battery_nws_yarp)
+add_subdirectory(chatBot_nwc_yarp)
+add_subdirectory(chatBot_nws_yarp)
+add_subdirectory(Rangefinder2D_nws_yarp)
+add_subdirectory(Rangefinder2D_nwc_yarp)
+add_subdirectory(mobileBaseVelocityControl_nwc_yarp)
+add_subdirectory(mobileBaseVelocityControl_nws_yarp)
+add_subdirectory(multipleanalogsensorsserver)
+add_subdirectory(multipleanalogsensorsclient)
+add_subdirectory(LLM_nws_yarp)
+add_subdirectory(LLM_nwc_yarp)
+add_subdirectory(localization2D_nwc_yarp)
+add_subdirectory(localization2D_nws_yarp)
+add_subdirectory(map2D_nwc_yarp)
+add_subdirectory(map2D_nws_yarp)
+add_subdirectory(navigation2D_nwc_yarp)
+add_subdirectory(navigation2D_nws_yarp)
+add_subdirectory(odometry2D_nws_yarp)
+add_subdirectory(Rangefinder2DClient)
+add_subdirectory(serialPort_nws_yarp)
+add_subdirectory(serialPort_nwc_yarp)
+add_subdirectory(speechSynthesizer_nws_yarp)
+add_subdirectory(speechSynthesizer_nwc_yarp)
+add_subdirectory(speechTranscription_nws_yarp)
+add_subdirectory(speechTranscription_nwc_yarp)
+add_subdirectory(RemoteControlBoard)
+add_subdirectory(AnalogSensorClient)
+add_subdirectory(AnalogWrapper)
+add_subdirectory(VirtualAnalogWrapper)
+add_subdirectory(RGBDSensorClient)
+add_subdirectory(RGBDSensor_nws_yarp)
+add_subdirectory(controlBoard_nws_yarp)
+add_subdirectory(RobotDescriptionClient)
+add_subdirectory(RobotDescriptionServer)
+add_subdirectory(JoypadControlClient)
+add_subdirectory(JoypadControlServer)

tests/misc/check_license_skip.txt

@@ -1,5 +1,5 @@
 bindings/lua/argcargv.i
 src/devices/opencv/OpenCVGrabber.cpp
 src/devices/opencv/OpenCVGrabber.h
-src/devices/fakeLaserWithMotor/robotinterface_xml/
+src/devices/fake/fakeLaserWithMotor/robotinterface_xml/
 src/libYARP_robotinterface/tests/RobotinterfaceFile.xml

tests/misc/check_tests.py

@@ -4,28 +4,34 @@
 import os
 import sys
 
-verbose = 0
+verbose = 1
+verbose_devel = 0
 def check_subfolders(root_dir):
     non_compliant_folders = []
     skip_folders = []
     with open('./tests/misc/check_tests_skip.txt', 'r') as f:
         skip_folders = [folder.strip() for folder in f.readlines()]
-    if (verbose): print(skip_folders)
-    for dirpath, dirnames, filenames in os.walk(root_dir):
-        if dirpath == root_dir:
-            for dirname in dirnames:
-                subfolder_path = os.path.join(dirpath, dirname, 'tests')
-                if (verbose):  print (subfolder_path, skip_folders)
-                if os.path.join(dirpath, dirname) not in skip_folders:
-                   if not os.path.exists(subfolder_path):
-                      non_compliant_folders.append(os.path.join(dirpath, dirname))
-                else:
-                  if (verbose): print("Skipping folder:", os.path.join(dirpath, dirname))
+    if (verbose_devel): print(skip_folders)
+
+    for root_dir in root_dirs:
+        for dirpath, dirnames, filenames in os.walk(root_dir):
+            if dirpath == root_dir:
+                for dirname in dirnames:
+                    subfolder_path = os.path.join(dirpath, dirname, 'tests')
+                    if (verbose_devel):  print (subfolder_path, skip_folders)
+                    if os.path.join(dirpath, dirname) not in skip_folders:
+                       if not os.path.exists(subfolder_path):
+                          if (verbose): print("Tests NOT found in folder:", os.path.join(dirpath, dirname))
+                          non_compliant_folders.append(os.path.join(dirpath, dirname))
+                       else:
+                          if (verbose): print("Tests found in folder:", os.path.join(dirpath, dirname))
+                    else:
+                       if (verbose): print("Skipping folder:", os.path.join(dirpath, dirname))
     return non_compliant_folders
 
-root_dir = './src/devices'
+root_dirs = ['./src/devices', './src/devices/networkWrappers', './src/devices/fake']
 
-non_compliant_folders = check_subfolders(root_dir)
+non_compliant_folders = check_subfolders(root_dirs)
 
 if non_compliant_folders:
     print("The following subfolders (",len(non_compliant_folders),") do not contain a 'tests' subfolder:")

tests/misc/check_tests_skip.txt

@@ -1,14 +1,10 @@
-./src/devices/mobileBaseVelocityControlMsgs
-./src/devices/IMap2DMsgs
-./src/devices/multipleAnalogSensorsMsgs
-./src/devices/IOdometry2DMsgs
-./src/devices/ILocalization2DMsgs
-./src/devices/frameTransformStorageMsgs
-./src/devices/IAudioGrabberMsgs
-./src/devices/INavigation2DMsgs
-./src/devices/ISerialMsgs
-./src/devices/ISpeechSynthesizerMsgs
-./src/devices/ISpeechTranscriptionMsgs
+./src/devices/fake
+./src/devices/messages
+./src/devices/networkWrappers
+./src/devices/fake/fakebot
+./src/devices/networkWrappers/VirtualAnalogWrapper
+./src/devices/networkWrappers/AnalogSensorClient
+./src/devices/networkWrappers/AnalogWrapper
 ./src/devices/test_segfault
 ./src/devices/test_nop
 ./src/devices/DynamixelAX12Ftdi
@@ -24,12 +20,6 @@
 ./src/devices/framegrabber_protocol
 ./src/devices/opencv
 ./src/devices/ffmpeg
-./src/devices/fakebot
 ./src/devices/serialport
 ./src/devices/JoypadControlNetUtils
 ./src/devices/SerialServoBoard
-./src/devices/VirtualAnalogWrapper
-./src/devices/AnalogSensorClient
-./src/devices/AnalogWrapper
-./src/devices/ILLMMsgs
-./src/devices/IChatBotMsgs