diff --git a/.travis.yml b/.travis.yml index 7b2bcd31..65c7dd4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ jobs: before_script: - docker pull ${NATIVE_DOCKER} script: - - docker run --rm -v $(pwd):/root/catkin_ws/src/clever ${NATIVE_DOCKER} /root/catkin_ws/src/clever/builder/standalone-install.sh + - docker run --rm -v $(pwd):/root/catkin_ws/src/clover ${NATIVE_DOCKER} /root/catkin_ws/src/clover/builder/standalone-install.sh - stage: Build name: "Native Melodic build" env: @@ -65,7 +65,7 @@ jobs: before_script: - docker pull ${NATIVE_DOCKER} script: - - docker run --rm -v $(pwd):/root/catkin_ws/src/clever ${NATIVE_DOCKER} /root/catkin_ws/src/clever/builder/standalone-install.sh + - docker run --rm -v $(pwd):/root/catkin_ws/src/clover ${NATIVE_DOCKER} /root/catkin_ws/src/clover/builder/standalone-install.sh - stage: Build name: "Documentation" language: node_js diff --git a/builder/assets/clever/clever/__init__.py b/builder/assets/clever/clever/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/builder/assets/clever/clever/srv.py b/builder/assets/clever/clever/srv.py new file mode 100644 index 00000000..1fa19116 --- /dev/null +++ b/builder/assets/clever/clever/srv.py @@ -0,0 +1,3 @@ +print("Warning: clever package is renamed to clover") + +from clover.srv import * diff --git a/builder/assets/clever/setup.py b/builder/assets/clever/setup.py new file mode 100755 index 00000000..1ed75dee --- /dev/null +++ b/builder/assets/clever/setup.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python + +from distutils.core import setup + +setup(name='clever', + version='1.0', + description='Clever transitional package for backwards compatibility', + author='Oleg Kalachev', + packages=['clever'], + ) diff --git a/builder/assets/clever.service b/builder/assets/clover.service similarity index 60% rename from builder/assets/clever.service rename to builder/assets/clover.service index 619b0cc1..0c9a9dc8 100644 --- a/builder/assets/clever.service +++ b/builder/assets/clover.service @@ -1,12 +1,12 @@ [Unit] -Description=Clever ROS package +Description=Clover ROS package Requires=roscore.service [Service] User=pi ExecStart=/bin/bash -c ". /home/pi/catkin_ws/devel/setup.sh; \ - ROS_HOSTNAME=`hostname`.local exec stdbuf -o L roslaunch clever clever.launch --wait --screen --skip-log-check \ - 2> >(tee /tmp/clever.err)" + ROS_HOSTNAME=`hostname`.local exec stdbuf -o L roslaunch clover clover.launch --wait --screen --skip-log-check \ + 2> >(tee /tmp/clover.err)" [Install] WantedBy=multi-user.target diff --git a/builder/assets/init_rpi.sh b/builder/assets/init_rpi.sh index 4d9c61fd..ef32048a 100755 --- a/builder/assets/init_rpi.sh +++ b/builder/assets/init_rpi.sh @@ -35,9 +35,9 @@ echo_stamp() { echo -e ${TEXT} } -NEW_SSID='CLEVER-'$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e "s/[^0-9]//g" | cut -c 1-4) +NEW_SSID='clover-'$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e "s/[^0-9]//g" | cut -c 1-4) echo_stamp "Setting SSID to ${NEW_SSID}" -sudo sed -i.OLD "s/CLEVER/${NEW_SSID}/" /etc/wpa_supplicant/wpa_supplicant.conf +sudo sed -i.OLD "s/clover/${NEW_SSID}/" /etc/wpa_supplicant/wpa_supplicant.conf NEW_HOSTNAME=$(echo ${NEW_SSID} | tr '[:upper:]' '[:lower:]') echo_stamp "Setting hostname to $NEW_HOSTNAME" diff --git a/builder/assets/kinetic-ros-clever.rosinstall b/builder/assets/kinetic-ros-clover.rosinstall similarity index 100% rename from builder/assets/kinetic-ros-clever.rosinstall rename to builder/assets/kinetic-ros-clover.rosinstall diff --git a/builder/assets/kinetic-rosdep-clever.yaml b/builder/assets/kinetic-rosdep-clover.yaml similarity index 100% rename from builder/assets/kinetic-rosdep-clever.yaml rename to builder/assets/kinetic-rosdep-clover.yaml diff --git a/builder/assets/melodic-rosdep-clover.yaml b/builder/assets/melodic-rosdep-clover.yaml new file mode 100644 index 00000000..f888a0cc --- /dev/null +++ b/builder/assets/melodic-rosdep-clover.yaml @@ -0,0 +1,735 @@ +catkin: + debian: + buster: [ros-melodic-catkin] +genmsg: + debian: + buster: [ros-melodic-genmsg] +gencpp: + debian: + buster: [ros-melodic-gencpp] +geneus: + debian: + buster: [ros-melodic-geneus] +genlisp: + debian: + buster: [ros-melodic-genlisp] +gennodejs: + debian: + buster: [ros-melodic-gennodejs] +genpy: + debian: + buster: [ros-melodic-genpy] +bond_core: + debian: + buster: [ros-melodic-bond-core] +cmake_modules: + debian: + buster: [ros-melodic-cmake-modules] +class_loader: + debian: + buster: [ros-melodic-class-loader] +common_msgs: + debian: + buster: [ros-melodic-common-msgs] +common_tutorials: + debian: + buster: [ros-melodic-common-tutorials] +cpp_common: + debian: + buster: [ros-melodic-cpp-common] +desktop: + debian: + buster: [ros-melodic-desktop] +diagnostics: + debian: + buster: [ros-melodic-diagnostics] +executive_smach: + debian: + buster: [ros-melodic-executive-smach] +geometry: + debian: + buster: [ros-melodic-geometry] +geometry_tutorials: + debian: + buster: [ros-melodic-geometry-tutorials] +gl_dependency: + debian: + buster: [ros-melodic-gl-dependency] +image_common: + debian: + buster: [ros-melodic-image-common] +image_pipeline: + debian: + buster: [ros-melodic-image-pipeline] +image_transport_plugins: + debian: + buster: [ros-melodic-image-transport-plugins] +laser_pipeline: + debian: + buster: [ros-melodic-laser-pipeline] +mavlink: + debian: + buster: [ros-melodic-mavlink] +media_export: + debian: + buster: [ros-melodic-media-export] +message_generation: + debian: + buster: [ros-melodic-message-generation] +message_runtime: + debian: + buster: [ros-melodic-message-runtime] +mk: + debian: + buster: [ros-melodic-mk] +nodelet_core: + debian: + buster: [ros-melodic-nodelet-core] +orocos_kdl: + debian: + buster: [ros-melodic-orocos-kdl] +perception: + debian: + buster: [ros-melodic-perception] +perception_pcl: + debian: + buster: [ros-melodic-perception-pcl] +python_orocos_kdl: + debian: + buster: [ros-melodic-python-orocos-kdl] +qt_dotgraph: + debian: + buster: [ros-melodic-qt-dotgraph] +qt_gui: + debian: + buster: [ros-melodic-qt-gui] +qt_gui_py_common: + debian: + buster: [ros-melodic-qt-gui-py-common] +qwt_dependency: + debian: + buster: [ros-melodic-qwt-dependency] +robot: + debian: + buster: [ros-melodic-robot] +ros: + debian: + buster: [ros-melodic-ros] +ros_base: + debian: + buster: [ros-melodic-ros-base] +ros_comm: + debian: + buster: [ros-melodic-ros-comm] +ros_core: + debian: + buster: [ros-melodic-ros-core] +ros_environment: + debian: + buster: [ros-melodic-ros-environment] +ros_tutorials: + debian: + buster: [ros-melodic-ros-tutorials] +rosapi: + debian: + buster: [ros-melodic-rosapi] +rosbag_migration_rule: + debian: + buster: [ros-melodic-rosbag-migration-rule] +rosbash: + debian: + buster: [ros-melodic-rosbash] +rosboost_cfg: + debian: + buster: [ros-melodic-rosboost-cfg] +rosbridge_server: + debian: + buster: [ros-melodic-rosbridge-server] +rosbridge_suite: + debian: + buster: [ros-melodic-rosbridge-suite] +rosbuild: + debian: + buster: [ros-melodic-rosbuild] +rosclean: + debian: + buster: [ros-melodic-rosclean] +roscpp_core: + debian: + buster: [ros-melodic-roscpp-core] +roscpp_traits: + debian: + buster: [ros-melodic-roscpp-traits] +roscreate: + debian: + buster: [ros-melodic-roscreate] +rosgraph: + debian: + buster: [ros-melodic-rosgraph] +roslang: + debian: + buster: [ros-melodic-roslang] +roslint: + debian: + buster: [ros-melodic-roslint] +roslisp: + debian: + buster: [ros-melodic-roslisp] +rosmake: + debian: + buster: [ros-melodic-rosmake] +rosmaster: + debian: + buster: [ros-melodic-rosmaster] +rospack: + debian: + buster: [ros-melodic-rospack] +roslib: + debian: + buster: [ros-melodic-roslib] +rosparam: + debian: + buster: [ros-melodic-rosparam] +rospy: + debian: + buster: [ros-melodic-rospy] +rosserial: + debian: + buster: [ros-melodic-rosserial] +rosserial_msgs: + debian: + buster: [ros-melodic-rosserial-msgs] +rosserial_python: + debian: + buster: [ros-melodic-rosserial-python] +rosservice: + debian: + buster: [ros-melodic-rosservice] +rostime: + debian: + buster: [ros-melodic-rostime] +roscpp_serialization: + debian: + buster: [ros-melodic-roscpp-serialization] +python_qt_binding: + debian: + buster: [ros-melodic-python-qt-binding] +roslaunch: + debian: + buster: [ros-melodic-roslaunch] +rosunit: + debian: + buster: [ros-melodic-rosunit] +angles: + debian: + buster: [ros-melodic-angles] +libmavconn: + debian: + buster: [ros-melodic-libmavconn] +rosconsole: + debian: + buster: [ros-melodic-rosconsole] +pluginlib: + debian: + buster: [ros-melodic-pluginlib] +qt_gui_cpp: + debian: + buster: [ros-melodic-qt-gui-cpp] +resource_retriever: + debian: + buster: [ros-melodic-resource-retriever] +rosconsole_bridge: + debian: + buster: [ros-melodic-rosconsole-bridge] +roslz4: + debian: + buster: [ros-melodic-roslz4] +rosserial_client: + debian: + buster: [ros-melodic-rosserial-client] +rostest: + debian: + buster: [ros-melodic-rostest] +rqt_action: + debian: + buster: [ros-melodic-rqt-action] +rqt_bag: + debian: + buster: [ros-melodic-rqt-bag] +rqt_bag_plugins: + debian: + buster: [ros-melodic-rqt-bag-plugins] +rqt_common_plugins: + debian: + buster: [ros-melodic-rqt-common-plugins] +rqt_console: + debian: + buster: [ros-melodic-rqt-console] +rqt_dep: + debian: + buster: [ros-melodic-rqt-dep] +rqt_graph: + debian: + buster: [ros-melodic-rqt-graph] +rqt_gui: + debian: + buster: [ros-melodic-rqt-gui] +rqt_logger_level: + debian: + buster: [ros-melodic-rqt-logger-level] +rqt_moveit: + debian: + buster: [ros-melodic-rqt-moveit] +rqt_msg: + debian: + buster: [ros-melodic-rqt-msg] +rqt_nav_view: + debian: + buster: [ros-melodic-rqt-nav-view] +rqt_plot: + debian: + buster: [ros-melodic-rqt-plot] +rqt_pose_view: + debian: + buster: [ros-melodic-rqt-pose-view] +rqt_publisher: + debian: + buster: [ros-melodic-rqt-publisher] +rqt_py_console: + debian: + buster: [ros-melodic-rqt-py-console] +rqt_reconfigure: + debian: + buster: [ros-melodic-rqt-reconfigure] +rqt_robot_dashboard: + debian: + buster: [ros-melodic-rqt-robot-dashboard] +rqt_robot_monitor: + debian: + buster: [ros-melodic-rqt-robot-monitor] +rqt_robot_plugins: + debian: + buster: [ros-melodic-rqt-robot-plugins] +rqt_robot_steering: + debian: + buster: [ros-melodic-rqt-robot-steering] +rqt_runtime_monitor: + debian: + buster: [ros-melodic-rqt-runtime-monitor] +rqt_service_caller: + debian: + buster: [ros-melodic-rqt-service-caller] +rqt_shell: + debian: + buster: [ros-melodic-rqt-shell] +rqt_srv: + debian: + buster: [ros-melodic-rqt-srv] +rqt_tf_tree: + debian: + buster: [ros-melodic-rqt-tf-tree] +rqt_top: + debian: + buster: [ros-melodic-rqt-top] +rqt_topic: + debian: + buster: [ros-melodic-rqt-topic] +rqt_web: + debian: + buster: [ros-melodic-rqt-web] +smach: + debian: + buster: [ros-melodic-smach] +smclib: + debian: + buster: [ros-melodic-smclib] +std_msgs: + debian: + buster: [ros-melodic-std-msgs] +actionlib_msgs: + debian: + buster: [ros-melodic-actionlib-msgs] +bond: + debian: + buster: [ros-melodic-bond] +diagnostic_msgs: + debian: + buster: [ros-melodic-diagnostic-msgs] +geometry_msgs: + debian: + buster: [ros-melodic-geometry-msgs] +eigen_conversions: + debian: + buster: [ros-melodic-eigen-conversions] +kdl_conversions: + debian: + buster: [ros-melodic-kdl-conversions] +nav_msgs: + debian: + buster: [ros-melodic-nav-msgs] +rosbridge_msgs: + debian: + buster: [ros-melodic-rosbridge-msgs] +rosgraph_msgs: + debian: + buster: [ros-melodic-rosgraph-msgs] +rosmsg: + debian: + buster: [ros-melodic-rosmsg] +rqt_py_common: + debian: + buster: [ros-melodic-rqt-py-common] +shape_msgs: + debian: + buster: [ros-melodic-shape-msgs] +smach_msgs: + debian: + buster: [ros-melodic-smach-msgs] +std_srvs: + debian: + buster: [ros-melodic-std-srvs] +tf2_msgs: + debian: + buster: [ros-melodic-tf2-msgs] +tf2: + debian: + buster: [ros-melodic-tf2] +tf2_eigen: + debian: + buster: [ros-melodic-tf2-eigen] +trajectory_msgs: + debian: + buster: [ros-melodic-trajectory-msgs] +control_msgs: + debian: + buster: [ros-melodic-control-msgs] +urdf_parser_plugin: + debian: + buster: [ros-melodic-urdf-parser-plugin] +urdfdom_py: + debian: + buster: [ros-melodic-urdfdom-py] +uuid_msgs: + debian: + buster: [ros-melodic-uuid-msgs] +geographic_msgs: + debian: + buster: [ros-melodic-geographic-msgs] +vision_opencv: + debian: + buster: [ros-melodic-vision-opencv] +visualization_msgs: + debian: + buster: [ros-melodic-visualization-msgs] +visualization_tutorials: + debian: + buster: [ros-melodic-visualization-tutorials] +viz: + debian: + buster: [ros-melodic-viz] +webkit_dependency: + debian: + buster: [ros-melodic-webkit-dependency] +xmlrpcpp: + debian: + buster: [ros-melodic-xmlrpcpp] +roscpp: + debian: + buster: [ros-melodic-roscpp] +bondcpp: + debian: + buster: [ros-melodic-bondcpp] +bondpy: + debian: + buster: [ros-melodic-bondpy] +nodelet: + debian: + buster: [ros-melodic-nodelet] +nodelet_tutorial_math: + debian: + buster: [ros-melodic-nodelet-tutorial-math] +pluginlib_tutorials: + debian: + buster: [ros-melodic-pluginlib-tutorials] +roscpp_tutorials: + debian: + buster: [ros-melodic-roscpp-tutorials] +rosout: + debian: + buster: [ros-melodic-rosout] +async_web_server_cpp: + debian: + buster: [ros-melodic-async-web-server-cpp] +camera_calibration: + debian: + buster: [ros-melodic-camera-calibration] +diagnostic_aggregator: + debian: + buster: [ros-melodic-diagnostic-aggregator] +diagnostic_updater: + debian: + buster: [ros-melodic-diagnostic-updater] +diagnostic_common_diagnostics: + debian: + buster: [ros-melodic-diagnostic-common-diagnostics] +dynamic_reconfigure: + debian: + buster: [ros-melodic-dynamic-reconfigure] +filters: + debian: + buster: [ros-melodic-filters] +joint_state_publisher: + debian: + buster: [ros-melodic-joint-state-publisher] +message_filters: + debian: + buster: [ros-melodic-message-filters] +ros_pytest: + debian: + buster: [ros-melodic-ros-pytest] +rosauth: + debian: + buster: [ros-melodic-rosauth] +rosbag_storage: + debian: + buster: [ros-melodic-rosbag-storage] +rosnode: + debian: + buster: [ros-melodic-rosnode] +rospy_tutorials: + debian: + buster: [ros-melodic-rospy-tutorials] +rosshow: + debian: + buster: [ros-melodic-rosshow] +rostopic: + debian: + buster: [ros-melodic-rostopic] +rqt_gui_cpp: + debian: + buster: [ros-melodic-rqt-gui-cpp] +rqt_gui_py: + debian: + buster: [ros-melodic-rqt-gui-py] +self_test: + debian: + buster: [ros-melodic-self-test] +smach_ros: + debian: + buster: [ros-melodic-smach-ros] +tf2_py: + debian: + buster: [ros-melodic-tf2-py] +topic_tools: + debian: + buster: [ros-melodic-topic-tools] +rosbag: + debian: + buster: [ros-melodic-rosbag] +actionlib: + debian: + buster: [ros-melodic-actionlib] +actionlib_tutorials: + debian: + buster: [ros-melodic-actionlib-tutorials] +diagnostic_analysis: + debian: + buster: [ros-melodic-diagnostic-analysis] +nodelet_topic_tools: + debian: + buster: [ros-melodic-nodelet-topic-tools] +roswtf: + debian: + buster: [ros-melodic-roswtf] +rqt_launch: + debian: + buster: [ros-melodic-rqt-launch] +sensor_msgs: + debian: + buster: [ros-melodic-sensor-msgs] +camera_calibration_parsers: + debian: + buster: [ros-melodic-camera-calibration-parsers] +cv_bridge: + debian: + buster: [ros-melodic-cv-bridge] +image_geometry: + debian: + buster: [ros-melodic-image-geometry] +image_transport: + debian: + buster: [ros-melodic-image-transport] +camera_info_manager: + debian: + buster: [ros-melodic-camera-info-manager] +compressed_depth_image_transport: + debian: + buster: [ros-melodic-compressed-depth-image-transport] +compressed_image_transport: + debian: + buster: [ros-melodic-compressed-image-transport] +cv_camera: + debian: + buster: [ros-melodic-cv-camera] +image_proc: + debian: + buster: [ros-melodic-image-proc] +image_publisher: + debian: + buster: [ros-melodic-image-publisher] +map_msgs: + debian: + buster: [ros-melodic-map-msgs] +mavros_msgs: + debian: + buster: [ros-melodic-mavros-msgs] +pcl_msgs: + debian: + buster: [ros-melodic-pcl-msgs] +pcl_conversions: + debian: + buster: [ros-melodic-pcl-conversions] +polled_camera: + debian: + buster: [ros-melodic-polled-camera] +rqt_image_view: + debian: + buster: [ros-melodic-rqt-image-view] +stereo_msgs: + debian: + buster: [ros-melodic-stereo-msgs] +image_view: + debian: + buster: [ros-melodic-image-view] +rosbridge_library: + debian: + buster: [ros-melodic-rosbridge-library] +stereo_image_proc: + debian: + buster: [ros-melodic-stereo-image-proc] +tf2_ros: + debian: + buster: [ros-melodic-tf2-ros] +depth_image_proc: + debian: + buster: [ros-melodic-depth-image-proc] +mavros: + debian: + buster: [ros-melodic-mavros] +tf: + debian: + buster: [ros-melodic-tf] +interactive_markers: + debian: + buster: [ros-melodic-interactive-markers] +interactive_marker_tutorials: + debian: + buster: [ros-melodic-interactive-marker-tutorials] +laser_geometry: + debian: + buster: [ros-melodic-laser-geometry] +laser_assembler: + debian: + buster: [ros-melodic-laser-assembler] +laser_filters: + debian: + buster: [ros-melodic-laser-filters] +pcl_ros: + debian: + buster: [ros-melodic-pcl-ros] +tf2_geometry_msgs: + debian: + buster: [ros-melodic-tf2-geometry-msgs] +image_rotate: + debian: + buster: [ros-melodic-image-rotate] +tf2_kdl: + debian: + buster: [ros-melodic-tf2-kdl] +tf2_web_republisher: + debian: + buster: [ros-melodic-tf2-web-republisher] +tf_conversions: + debian: + buster: [ros-melodic-tf-conversions] +theora_image_transport: + debian: + buster: [ros-melodic-theora-image-transport] +turtlesim: + debian: + buster: [ros-melodic-turtlesim] +turtle_actionlib: + debian: + buster: [ros-melodic-turtle-actionlib] +turtle_tf: + debian: + buster: [ros-melodic-turtle-tf] +turtle_tf2: + debian: + buster: [ros-melodic-turtle-tf2] +urdf: + debian: + buster: [ros-melodic-urdf] +kdl_parser: + debian: + buster: [ros-melodic-kdl-parser] +kdl_parser_py: + debian: + buster: [ros-melodic-kdl-parser-py] +mavros_extras: + debian: + buster: [ros-melodic-mavros-extras] +robot_state_publisher: + debian: + buster: [ros-melodic-robot-state-publisher] +rviz: + debian: + buster: [ros-melodic-rviz] +librviz_tutorial: + debian: + buster: [ros-melodic-librviz-tutorial] +rqt_rviz: + debian: + buster: [ros-melodic-rqt-rviz] +rviz_plugin_tutorials: + debian: + buster: [ros-melodic-rviz-plugin-tutorials] +rviz_python_tutorial: + debian: + buster: [ros-melodic-rviz-python-tutorial] +urdf_tutorial: + debian: + buster: [ros-melodic-urdf-tutorial] +usb_cam: + debian: + buster: [ros-melodic-usb-cam] +visualization_marker_tutorials: + debian: + buster: [ros-melodic-visualization-marker-tutorials] +vl53l1x: + debian: + buster: [ros-melodic-vl53l1x] +web_video_server: + debian: + buster: [ros-melodic-web-video-server] +xacro: + debian: + buster: [ros-melodic-xacro] +led_msgs: + debian: + buster: [ros-melodic-led-msgs] +ws281x: + debian: + buster: [ros-melodic-ws281x] +ddynamic_reconfigure: + debian: + buster: [ros-melodic-ddynamic-reconfigure] +librealsense2: + debian: + buster: [ros-melodic-librealsense2] +realsense2_camera: + debian: + buster: [ros-melodic-realsense2-camera] +realsense2_description: + debian: + buster: [ros-melodic-realsense2-description] diff --git a/builder/assets/monkey b/builder/assets/monkey index 81e5c916..d52b2e75 100644 --- a/builder/assets/monkey +++ b/builder/assets/monkey @@ -20,7 +20,7 @@ # Example: # DocumentRoot /home/krypton/htdocs - DocumentRoot /home/pi/catkin_ws/src/clever/clever/www + DocumentRoot /home/pi/catkin_ws/src/clover/clover/www # Redirect: # --------- diff --git a/builder/image-build.sh b/builder/image-build.sh index 8b1125d5..0bd9dab1 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -89,7 +89,7 @@ shopt -s dotglob for dir in ${REPO_DIR}/*; do # Don't try to copy image into itself if [[ $dir != *"images" && $dir != *"imgcache" ]]; then - ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy $dir '/home/pi/catkin_ws/src/clever/' + ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy $dir '/home/pi/catkin_ws/src/clover/' fi; done @@ -109,16 +109,16 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-network. # If RPi then use a one thread to build a ROS package on RPi, else use all [[ $(arch) == 'armv7l' ]] && NUMBER_THREADS=1 || NUMBER_THREADS=$(nproc --all) -# Clever -${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever.service' '/lib/systemd/system/' +# Clover +${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clover.service' '/lib/systemd/system/' ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.service' '/lib/systemd/system/' -${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/melodic-rosdep-clever.yaml' '/etc/ros/rosdep/' +${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/melodic-rosdep-clover.yaml' '/etc/ros/rosdep/' ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/ros_python_paths' '/etc/sudoers.d/' ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/pigpiod.service' '/lib/systemd/system/' ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/launch.nanorc' '/usr/share/nano/' -# ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/' +# ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-ros-clover.rosinstall' '/home/pi/ros_catkin_ws/' # Add PX4 udev rules -${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${REPO_DIR}'/clever/config/99-px4fmu.rules' '/lib/udev/rules.d/' +${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${REPO_DIR}'/clover/config/99-px4fmu.rules' '/lib/udev/rules.d/' # Add rename script ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-ros.sh' ${REPO_URL} ${IMAGE_VERSION} false false ${NUMBER_THREADS} ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-validate.sh' diff --git a/builder/image-init.sh b/builder/image-init.sh index 0458c4ed..51985e80 100755 --- a/builder/image-init.sh +++ b/builder/image-init.sh @@ -34,12 +34,12 @@ echo_stamp() { echo -e ${TEXT} } -echo_stamp "Write CLEVER information" +echo_stamp "Write Clover information" -# Clever image version -echo "$1" >> /etc/clever_version +# Clover image version +echo "$1" >> /etc/clover_version # Origin image file name -echo "${2%.*}" >> /etc/clever_origin +echo "${2%.*}" >> /etc/clover_origin echo_stamp "Write magic script to /etc/rc.local" MAGIC_SCRIPT="sudo /root/init_rpi.sh; sudo sed -i '/sudo \\\/root\\\/init_rpi.sh/d' /etc/rc.local && sudo reboot" diff --git a/builder/image-network.sh b/builder/image-network.sh index a3e0b300..4a4b122a 100755 --- a/builder/image-network.sh +++ b/builder/image-network.sh @@ -39,8 +39,8 @@ echo_stamp "#1 Write to /etc/wpa_supplicant/wpa_supplicant.conf" # TODO: Use wpa_cli insted direct file edit cat << EOF >> /etc/wpa_supplicant/wpa_supplicant.conf network={ - ssid="CLEVER" - psk="cleverwifi" + ssid="clover" + psk="cloverwifi" mode=2 proto=WPA RSN key_mgmt=WPA-PSK @@ -61,7 +61,7 @@ echo_stamp "#3 Write dhcp-config to /etc/dnsmasq.conf" cat << EOF >> /etc/dnsmasq.conf interface=wlan0 -address=/clever/coex/192.168.11.1 +address=/clover/coex/192.168.11.1 dhcp-range=192.168.11.100,192.168.11.200,12h no-hosts filterwin2k @@ -70,8 +70,4 @@ domain-needed quiet-dhcp6 EOF -#echo_stamp "#4 Write magic script for rename SSID to /etc/rc.local" -#RENAME_SSID="sudo sed -i.OLD \"s/CLEVER/CLEVER-\$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e 's/[^0-9]//g' | cut -c 1-4)/g\" /etc/wpa_supplicant/wpa_supplicant.conf && sudo sed -i '/sudo sed/d' /etc/rc.local && sudo reboot" -#sed -i "19a$RENAME_SSID" /etc/rc.local - echo_stamp "#5 End of network installation" diff --git a/builder/image-ros.sh b/builder/image-ros.sh index f04f2152..fef4aec3 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -65,10 +65,10 @@ my_travis_retry() { return $result } -# TODO: 'kinetic-rosdep-clever.yaml' should add only if we use our repo? +# TODO: 'kinetic-rosdep-clover.yaml' should add only if we use our repo? echo_stamp "Init rosdep" my_travis_retry rosdep init -echo "yaml file:///etc/ros/rosdep/melodic-rosdep-clever.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list +echo "yaml file:///etc/ros/rosdep/melodic-rosdep-clover.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list my_travis_retry rosdep update echo_stamp "Populate rosdep for ROS user" @@ -88,30 +88,33 @@ resolve_rosdep() { export ROS_IP='127.0.0.1' # needed for running tests -echo_stamp "Reconfiguring Clever repository for simplier unshallowing" -cd /home/pi/catkin_ws/src/clever +echo_stamp "Reconfiguring Clover repository for simplier unshallowing" +cd /home/pi/catkin_ws/src/clover git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" -echo_stamp "Installing CLEVER" \ -&& cd /home/pi/catkin_ws/src/clever \ -&& git status \ -&& cd /home/pi/catkin_ws \ -&& resolve_rosdep $(pwd) \ -&& my_travis_retry pip install wheel \ -&& my_travis_retry pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \ -&& source /opt/ros/melodic/setup.bash \ -&& catkin_make -j2 -DCMAKE_BUILD_TYPE=Release \ -&& systemctl enable roscore \ -&& systemctl enable clever \ -&& echo_stamp "All CLEVER was installed!" "SUCCESS" \ -|| (echo_stamp "CLEVER installation was failed!" "ERROR"; exit 1) +echo_stamp "Build and install Clover" +cd /home/pi/catkin_ws +resolve_rosdep $(pwd) +my_travis_retry pip install wheel +my_travis_retry pip install -r /home/pi/catkin_ws/src/clover/clover/requirements.txt +source /opt/ros/melodic/setup.bash +catkin_make -j2 -DCMAKE_BUILD_TYPE=Release -echo_stamp "Build CLEVER documentation" -cd /home/pi/catkin_ws/src/clever +echo_stamp "Enable ROS services" +systemctl enable roscore +systemctl enable clover + +echo_stamp "Install clever package (for backwards compatibility)" +cd /home/pi/catkin_ws/src/clover/builder/assets/clever +./setup.py install +rm -rf build # remove build artifacts + +echo_stamp "Build Clover documentation" +cd /home/pi/catkin_ws/src/clover NPM_CONFIG_UNSAFE_PERM=true npm install gitbook-cli -g NPM_CONFIG_UNSAFE_PERM=true gitbook install gitbook build -touch node_modules/CATKIN_IGNORE docs/CATKIN_IGNORE _book/CATKIN_IGNORE clever/www/CATKIN_IGNORE apps/CATKIN_IGNORE # ignore documentation files by catkin +touch node_modules/CATKIN_IGNORE docs/CATKIN_IGNORE _book/CATKIN_IGNORE clover/www/CATKIN_IGNORE apps/CATKIN_IGNORE # ignore documentation files by catkin echo_stamp "Installing additional ROS packages" apt-get install -y --no-install-recommends \ diff --git a/builder/image-software.sh b/builder/image-software.sh index 6daf057e..bb8fec54 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -68,7 +68,7 @@ apt-get update \ echo "deb http://packages.ros.org/ros/ubuntu buster main" > /etc/apt/sources.list.d/ros-latest.list echo "deb http://deb.coex.tech/opencv3 buster main" > /etc/apt/sources.list.d/opencv3.list echo "deb http://deb.coex.tech/rpi-ros-melodic buster main" > /etc/apt/sources.list.d/rpi-ros-melodic.list -echo "deb http://deb.coex.tech/clever buster main" > /etc/apt/sources.list.d/clever.list +echo "deb http://deb.coex.tech/clover buster main" > /etc/apt/sources.list.d/clover.list echo_stamp "Update apt cache" diff --git a/builder/image-validate.sh b/builder/image-validate.sh index e4735017..a95beecd 100755 --- a/builder/image-validate.sh +++ b/builder/image-validate.sh @@ -21,10 +21,11 @@ export ROS_IP='127.0.0.1' source /opt/ros/melodic/setup.bash source /home/pi/catkin_ws/devel/setup.bash -cd /home/pi/catkin_ws/src/clever/builder/test/ +cd /home/pi/catkin_ws/src/clover/builder/test/ ./tests.sh ./tests.py ./tests_py3.py +[[ $(./tests_clever.py) == "Warning: clever package is renamed to clover" ]] # test backwards compatibility echo "Move /etc/ld.so.preload back to its original position" mv /etc/ld.so.preload.disabled-for-build /etc/ld.so.preload diff --git a/builder/test/tests.py b/builder/test/tests.py index 6d7f6e60..f676020e 100755 --- a/builder/test/tests.py +++ b/builder/test/tests.py @@ -14,7 +14,7 @@ from mavros_msgs.msg import State, StatusText, ExtendedState from mavros_msgs.srv import CommandBool, CommandLong, SetMode from std_srvs.srv import Trigger -from clever.srv import GetTelemetry, Navigate, NavigateGlobal, SetPosition, SetVelocity, \ +from clover.srv import GetTelemetry, Navigate, NavigateGlobal, SetPosition, SetVelocity, \ SetAttitude, SetRates, SetLEDEffect import tf2_ros diff --git a/builder/test/tests.sh b/builder/test/tests.sh index 3ee0302d..ef3c39b1 100755 --- a/builder/test/tests.sh +++ b/builder/test/tests.sh @@ -34,7 +34,7 @@ mjpg_streamer --version # ros stuff roscore -h -rosversion clever +rosversion clover rosversion aruco_pose rosversion vl53l1x rosversion mavros diff --git a/builder/test/tests_clever.py b/builder/test/tests_clever.py new file mode 100755 index 00000000..8db8b6b0 --- /dev/null +++ b/builder/test/tests_clever.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +# test backwards compatibility + +from clever.srv import GetTelemetry, Navigate, NavigateGlobal, SetPosition, SetVelocity, \ + SetAttitude, SetRates, SetLEDEffect diff --git a/clever/nodelet_plugins.xml b/clever/nodelet_plugins.xml deleted file mode 100644 index d9e2fc4d..00000000 --- a/clever/nodelet_plugins.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/clever/CMakeLists.txt b/clover/CMakeLists.txt similarity index 96% rename from clever/CMakeLists.txt rename to clover/CMakeLists.txt index 6341df2d..a97efc8d 100644 --- a/clever/CMakeLists.txt +++ b/clover/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(clever) +project(clover) ## Compile as C++11, supported in ROS Kinetic and newer add_compile_options(-std=c++11) @@ -127,7 +127,7 @@ generate_messages( ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( # INCLUDE_DIRS include - LIBRARIES clever + LIBRARIES ${PROJECT_NAME} # CATKIN_DEPENDS other_catkin_pkg # DEPENDS system_lib ) @@ -145,7 +145,7 @@ include_directories( ) # Declare a C++ library -add_library(clever +add_library(${PROJECT_NAME} src/optical_flow.cpp ) @@ -180,9 +180,9 @@ target_link_libraries(vpe_publisher ${catkin_LIBRARIES}) target_link_libraries(led ${catkin_LIBRARIES}) -add_dependencies(simple_offboard clever_generate_messages_cpp) +add_dependencies(simple_offboard ${PROJECT_NAME}_generate_messages_cpp) -add_dependencies(led clever_generate_messages_cpp) +add_dependencies(led ${PROJECT_NAME}_generate_messages_cpp) ## Rename C++ executable without prefix ## The above recommended prefix causes long target names, the following renames the @@ -195,7 +195,7 @@ add_dependencies(led clever_generate_messages_cpp) # add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) ## Specify libraries to link a library or executable target against -target_link_libraries(clever +target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ) @@ -252,7 +252,7 @@ endif() ############# ## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_clever.cpp) +# catkin_add_gtest(${PROJECT_NAME}-test test/test_${PROJECT_NAME}.cpp) # if(TARGET ${PROJECT_NAME}-test) # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) # endif() diff --git a/clever/camera_info/fisheye_cam_320.yaml b/clover/camera_info/fisheye_cam_320.yaml similarity index 100% rename from clever/camera_info/fisheye_cam_320.yaml rename to clover/camera_info/fisheye_cam_320.yaml diff --git a/clever/camera_info/fisheye_cam_640.yaml b/clover/camera_info/fisheye_cam_640.yaml similarity index 100% rename from clever/camera_info/fisheye_cam_640.yaml rename to clover/camera_info/fisheye_cam_640.yaml diff --git a/clever/cmake/FindGeographicLib.cmake b/clover/cmake/FindGeographicLib.cmake similarity index 100% rename from clever/cmake/FindGeographicLib.cmake rename to clover/cmake/FindGeographicLib.cmake diff --git a/clever/config/99-px4fmu.rules b/clover/config/99-px4fmu.rules similarity index 100% rename from clever/config/99-px4fmu.rules rename to clover/config/99-px4fmu.rules diff --git a/clever/launch/aruco.launch b/clover/launch/aruco.launch similarity index 97% rename from clever/launch/aruco.launch rename to clover/launch/aruco.launch index ca131130..0db4c4b9 100644 --- a/clever/launch/aruco.launch +++ b/clover/launch/aruco.launch @@ -31,7 +31,7 @@ - + diff --git a/clever/launch/clever.launch b/clover/launch/clover.launch similarity index 87% rename from clever/launch/clever.launch rename to clover/launch/clover.launch index 5ff3add6..e734b2a4 100644 --- a/clever/launch/clever.launch +++ b/clover/launch/clover.launch @@ -15,7 +15,7 @@ - + @@ -28,10 +28,10 @@ - + - + @@ -45,14 +45,14 @@ - + - + @@ -68,10 +68,10 @@ - + - + diff --git a/clever/launch/fpv_camera.launch b/clover/launch/fpv_camera.launch similarity index 70% rename from clever/launch/fpv_camera.launch rename to clover/launch/fpv_camera.launch index 399d403d..d436cd25 100644 --- a/clever/launch/fpv_camera.launch +++ b/clover/launch/fpv_camera.launch @@ -2,5 +2,5 @@ - + diff --git a/clever/launch/led.launch b/clover/launch/led.launch similarity index 92% rename from clever/launch/led.launch rename to clover/launch/led.launch index ef2fb643..0c74f495 100644 --- a/clever/launch/led.launch +++ b/clover/launch/led.launch @@ -3,7 +3,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/clever/launch/main_camera.launch b/clover/launch/main_camera.launch similarity index 91% rename from clever/launch/main_camera.launch rename to clover/launch/main_camera.launch index 7a575794..6faf2c30 100644 --- a/clever/launch/main_camera.launch +++ b/clover/launch/main_camera.launch @@ -2,7 +2,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/clever/launch/mavros.launch b/clover/launch/mavros.launch similarity index 98% rename from clever/launch/mavros.launch rename to clover/launch/mavros.launch index ae53b486..cafac876 100644 --- a/clever/launch/mavros.launch +++ b/clover/launch/mavros.launch @@ -29,7 +29,7 @@ - + diff --git a/clever/launch/mavros_config.yaml b/clover/launch/mavros_config.yaml similarity index 100% rename from clever/launch/mavros_config.yaml rename to clover/launch/mavros_config.yaml diff --git a/clever/launch/sitl.launch b/clover/launch/sitl.launch similarity index 85% rename from clever/launch/sitl.launch rename to clover/launch/sitl.launch index 048f3b53..bc38e650 100644 --- a/clever/launch/sitl.launch +++ b/clover/launch/sitl.launch @@ -1,9 +1,9 @@ - + - + diff --git a/clover/nodelet_plugins.xml b/clover/nodelet_plugins.xml new file mode 100644 index 00000000..a79f12d3 --- /dev/null +++ b/clover/nodelet_plugins.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/clever/package.xml b/clover/package.xml similarity index 93% rename from clever/package.xml rename to clover/package.xml index d784597c..8a9a0c7e 100644 --- a/clever/package.xml +++ b/clover/package.xml @@ -1,8 +1,8 @@ - clever + clover 0.0.1 - The CLEVER package + The Clover package Oleg Kalachev MIT @@ -15,6 +15,7 @@ + message_generation roscpp rospy std_srvs diff --git a/clever/requirements.txt b/clover/requirements.txt similarity index 100% rename from clever/requirements.txt rename to clover/requirements.txt diff --git a/clever/src/camera_markers.cpp b/clover/src/camera_markers.cpp similarity index 100% rename from clever/src/camera_markers.cpp rename to clover/src/camera_markers.cpp diff --git a/clever/src/fpv_camera b/clover/src/fpv_camera similarity index 100% rename from clever/src/fpv_camera rename to clover/src/fpv_camera diff --git a/clever/src/led.cpp b/clover/src/led.cpp similarity index 98% rename from clever/src/led.cpp rename to clover/src/led.cpp index dd2f31a4..3b00c52c 100644 --- a/clever/src/led.cpp +++ b/clover/src/led.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ #include #include -clever::SetLEDEffect::Request current_effect; +clover::SetLEDEffect::Request current_effect; int led_count; ros::Timer timer; ros::Time start_time; @@ -144,7 +144,7 @@ void proceed(const ros::TimerEvent& event) } } -bool setEffect(clever::SetLEDEffect::Request& req, clever::SetLEDEffect::Response& res) +bool setEffect(clover::SetLEDEffect::Request& req, clover::SetLEDEffect::Response& res) { res.success = true; @@ -237,7 +237,7 @@ void notify(const std::string& event) ros::param::has("~notify/" + event + "/g") || ros::param::has("~notify/" + event + "/b")) { ROS_INFO_THROTTLE(5, "led: notify %s", event.c_str()); - clever::SetLEDEffect effect; + clover::SetLEDEffect effect; effect.request.effect = ros::param::param("~notify/" + event + "/effect", std::string("")); effect.request.r = ros::param::param("~notify/" + event + "/r", 0); effect.request.g = ros::param::param("~notify/" + event + "/g", 0); diff --git a/clever/src/optical_flow.cpp b/clover/src/optical_flow.cpp similarity index 100% rename from clever/src/optical_flow.cpp rename to clover/src/optical_flow.cpp diff --git a/clever/src/rc.cpp b/clover/src/rc.cpp similarity index 99% rename from clever/src/rc.cpp rename to clover/src/rc.cpp index e94e7e20..24132ea8 100644 --- a/clever/src/rc.cpp +++ b/clover/src/rc.cpp @@ -1,5 +1,5 @@ /* - * CLEVER mobile remote control backend + * Clover mobile remote control backend * Send ManualControl messages through UDP * 'latched_state' topic * diff --git a/clever/src/selfcheck.py b/clover/src/selfcheck.py similarity index 98% rename from clever/src/selfcheck.py rename to clover/src/selfcheck.py index 69875a97..e35f75b0 100755 --- a/clever/src/selfcheck.py +++ b/clover/src/selfcheck.py @@ -200,17 +200,17 @@ def check_fcu(): info('no version data available from SITL') r = re.compile(r'^FW (git tag|version): (v?\d\.\d\.\d.*)$') - is_clever_firmware = False + is_clover_firmware = False for ver_line in version_str.split('\n'): match = r.search(ver_line) if match is not None: field, version = match.groups() info('firmware %s: %s' % (field, version)) - if 'clever' in version: - is_clever_firmware = True + if 'clover' in version or 'clever' in version: + is_clover_firmware = True - if not is_clever_firmware: - failure('not running Clever PX4 firmware, https://clever.coex.tech/firmware') + if not is_clover_firmware: + failure('not running Clover PX4 firmware, https://clever.coex.tech/firmware') est = get_param('SYS_MC_EST_GROUP') if est == 1: @@ -629,16 +629,16 @@ def check_cpu_usage(): cpu.strip(), cmd.strip(), pid.strip()) -@check('clever.service') -def check_clever_service(): +@check('clover.service') +def check_clover_service(): try: - output = subprocess.check_output('systemctl show -p ActiveState --value clever.service'.split(), + output = subprocess.check_output('systemctl show -p ActiveState --value clover.service'.split(), stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: failure('systemctl returned %s: %s', e.returncode, e.output) return if 'inactive' in output: - failure('service is not running, try sudo systemctl restart clever') + failure('service is not running, try sudo systemctl restart clover') return elif 'failed' in output: failure('service failed to run, check your launch-files') @@ -646,7 +646,7 @@ def check_clever_service(): r = re.compile(r'^(.*)\[(FATAL|ERROR)\] \[\d+.\d+\]: (.*?)(\x1b(.*))?$') error_count = OrderedDict() try: - for line in open('/tmp/clever.err', 'r'): + for line in open('/tmp/clover.err', 'r'): node_error = r.search(line) if node_error: msg = node_error.groups()[1] + ': ' + node_error.groups()[2] @@ -670,9 +670,9 @@ def check_clever_service(): @check('Image') def check_image(): try: - info('version: %s', open('/etc/clever_version').read().strip()) + info('version: %s', open('/etc/clover_version').read().strip()) except IOError: - info('no /etc/clever_version file, not the Clever image?') + info('no /etc/clover_version file, not the Clover image?') @check('Preflight status') @@ -761,7 +761,7 @@ def check_rpi_health(): def selfcheck(): check_image() - check_clever_service() + check_clover_service() check_network() check_fcu() check_imu() diff --git a/clever/src/simple_offboard.cpp b/clover/src/simple_offboard.cpp similarity index 99% rename from clever/src/simple_offboard.cpp rename to clover/src/simple_offboard.cpp index 66763328..0db67756 100644 --- a/clever/src/simple_offboard.cpp +++ b/clover/src/simple_offboard.cpp @@ -37,18 +37,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using std::string; using namespace geometry_msgs; using namespace sensor_msgs; -using namespace clever; +using namespace clover; using mavros_msgs::PositionTarget; using mavros_msgs::AttitudeTarget; using mavros_msgs::Thrust; diff --git a/clever/src/vpe_publisher.cpp b/clover/src/vpe_publisher.cpp similarity index 100% rename from clever/src/vpe_publisher.cpp rename to clover/src/vpe_publisher.cpp diff --git a/clever/srv/GetTelemetry.srv b/clover/srv/GetTelemetry.srv similarity index 100% rename from clever/srv/GetTelemetry.srv rename to clover/srv/GetTelemetry.srv diff --git a/clever/srv/Navigate.srv b/clover/srv/Navigate.srv similarity index 100% rename from clever/srv/Navigate.srv rename to clover/srv/Navigate.srv diff --git a/clever/srv/NavigateGlobal.srv b/clover/srv/NavigateGlobal.srv similarity index 100% rename from clever/srv/NavigateGlobal.srv rename to clover/srv/NavigateGlobal.srv diff --git a/clever/srv/SetAttitude.srv b/clover/srv/SetAttitude.srv similarity index 100% rename from clever/srv/SetAttitude.srv rename to clover/srv/SetAttitude.srv diff --git a/clever/srv/SetLEDEffect.srv b/clover/srv/SetLEDEffect.srv similarity index 100% rename from clever/srv/SetLEDEffect.srv rename to clover/srv/SetLEDEffect.srv diff --git a/clever/srv/SetPosition.srv b/clover/srv/SetPosition.srv similarity index 100% rename from clever/srv/SetPosition.srv rename to clover/srv/SetPosition.srv diff --git a/clever/srv/SetRates.srv b/clover/srv/SetRates.srv similarity index 100% rename from clever/srv/SetRates.srv rename to clover/srv/SetRates.srv diff --git a/clever/srv/SetVelocity.srv b/clover/srv/SetVelocity.srv similarity index 100% rename from clever/srv/SetVelocity.srv rename to clover/srv/SetVelocity.srv diff --git a/clever/test/basic.py b/clover/test/basic.py similarity index 94% rename from clever/test/basic.py rename to clover/test/basic.py index 67de1fbe..39efc0bb 100755 --- a/clever/test/basic.py +++ b/clover/test/basic.py @@ -5,7 +5,7 @@ from mavros_msgs.msg import State @pytest.fixture() def node(): - return rospy.init_node('clever_test', anonymous=True) + return rospy.init_node('clover_test', anonymous=True) def test_state(node): state = rospy.wait_for_message('mavros/state', State, timeout=10) diff --git a/clever/test/basic.test b/clover/test/basic.test similarity index 83% rename from clever/test/basic.test rename to clover/test/basic.test index d7a4bae4..aa297005 100755 --- a/clever/test/basic.test +++ b/clover/test/basic.test @@ -3,7 +3,7 @@ - + @@ -23,19 +23,19 @@ - + - + - + startup: { r: 255, g: 255, b: 255 } - + diff --git a/clever/www/aruco_map.html b/clover/www/aruco_map.html similarity index 100% rename from clever/www/aruco_map.html rename to clover/www/aruco_map.html diff --git a/clever/www/docs b/clover/www/docs similarity index 100% rename from clever/www/docs rename to clover/www/docs diff --git a/clever/www/gcs.html b/clover/www/gcs.html similarity index 100% rename from clever/www/gcs.html rename to clover/www/gcs.html diff --git a/clever/www/index.html b/clover/www/index.html similarity index 95% rename from clever/www/index.html rename to clover/www/index.html index 9476d6df..d25ea74d 100644 --- a/clever/www/index.html +++ b/clover/www/index.html @@ -1,4 +1,4 @@ -

CLEVER Drone Kit Tools

+

Clover Drone Kit Tools

  • View documentation (snapshot of clever.coex.tech)
    • diff --git a/clever/www/js/eventemitter2.js b/clover/www/js/eventemitter2.js similarity index 100% rename from clever/www/js/eventemitter2.js rename to clover/www/js/eventemitter2.js diff --git a/clever/www/js/gcs.js b/clover/www/js/gcs.js similarity index 100% rename from clever/www/js/gcs.js rename to clover/www/js/gcs.js diff --git a/clever/www/js/ros3d.js b/clover/www/js/ros3d.js similarity index 100% rename from clever/www/js/ros3d.js rename to clover/www/js/ros3d.js diff --git a/clever/www/js/roslib.js b/clover/www/js/roslib.js similarity index 100% rename from clever/www/js/roslib.js rename to clover/www/js/roslib.js diff --git a/clever/www/js/three.min.js b/clover/www/js/three.min.js similarity index 100% rename from clever/www/js/three.min.js rename to clover/www/js/three.min.js diff --git a/clever/www/js/viz.js b/clover/www/js/viz.js similarity index 96% rename from clever/www/js/viz.js rename to clover/www/js/viz.js index d1444c74..eb84d236 100644 --- a/clever/www/js/viz.js +++ b/clover/www/js/viz.js @@ -7,7 +7,7 @@ var titleEl = document.querySelector('title'); ros.on('error', function(error) { titleEl.innerText = 'Disconnected'; err = error; - alert('Connection error: please enable \'rosbridge\' in clever.launch!'); + alert('Connection error: please enable \'rosbridge\' in clover.launch!'); }); ros.on('connection', function() { diff --git a/clever/www/viz.html b/clover/www/viz.html similarity index 100% rename from clever/www/viz.html rename to clover/www/viz.html