Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions computer_hw/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package computer_hw
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.6.32 (2021-05-26)
-------------------
* Merge pull request `#268 <https://github.com/pr2/pr2_robot/issues/268>`_ from k-okada/fix_for_noetic
* run 2to3 -w -fexcept .
* run 2to3 -w -fprint .
* Contributors: Kei Okada

1.6.31 (2020-04-14)
-------------------
* add --ignore-self arg in ntp_monitor.py (`#259 <https://github.com/pr2/pr2_robot/issues/259>`_)
* fixed CMake errors
* Contributors: David Feil-Seifer, Shingo Kitagawa

1.6.30 (2018-04-23)
-------------------
* removed more tests for jenkins build
* Contributors: David Feil-Seifer

1.6.29 (2018-04-22)
-------------------

1.6.28 (2018-04-21)
-------------------
* made sure tests only run if CATKIN_ENABLE_TESTING is set
* Contributors: David Feil-Seifer

1.6.27 (2018-04-20)
-------------------

1.6.26 (2018-03-19)
-------------------

1.6.25 (2018-03-19)
-------------------
* updated packages for new maintainer
* updated changelogs
* Contributors: David Feil-Seifer

1.6.7 (2015-02-11)
------------------
* Reverted changes
* Added dependencies in catkin
* Added catkin_package() to pr2_robot
* Updated mainpage.dox
* Fix binary location of network_detector
* Contributors: Ryohei Ueda, TheDash
39 changes: 39 additions & 0 deletions computer_hw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html
cmake_minimum_required(VERSION 2.8.3)
project(computer_hw)
# Load catkin and all dependencies required for this package
# TODO: remove all from COMPONENTS that are not catkin packages.
find_package(catkin REQUIRED COMPONENTS roscpp std_msgs)

if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test/parse_test.py)
endif()

include_directories(include ${catkin_INCLUDE_DIRS})

catkin_package(
DEPENDS roscpp std_msgs
CATKIN_DEPENDS # TODO
INCLUDE_DIRS # TODO include
LIBRARIES network_detector# TODO
)

catkin_install_python(PROGRAMS
executables/cpu_monitor.py executables/hd_monitor.py executables/ntp_monitor.py executables/ntp_monitor.py executables/nvidia_temp.py executables/wifi_monitor.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

add_executable(network_detector src/network_detector.cpp)
target_link_libraries(network_detector ${catkin_LIBRARIES})
add_dependencies(network_detector ${catkin_EXPORTED_TARGETS} ${${PROJECT_NAME}_EXPORTED_TARGETS})

install(TARGETS network_detector
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

foreach(dir conf)
install(DIRECTORY ${dir}/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
endforeach(dir)

catkin_python_setup()
17 changes: 17 additions & 0 deletions computer_hw/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# computer_hw

## Development history
`computer_hw` package was originally made in [pr2_robot](https://github.com/PR2/pr2_robot) repository. See discussion [pr2_common#286](https://github.com/PR2/pr2_common/issues/286) for the migration.

## Installation tips
In order for ipmitool to work on computers with a BMC, the following line needs to appear in `/etc/sudoers`:

```
ALL ALL=NOPASSWD: /usr/bin/ipmitool sdr type Temperature
```

## Usage / Operation
TBD

EoF

8 changes: 8 additions & 0 deletions computer_hw/conf/cpu_monitor.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<launch>
<node name="cpu_monitor" pkg="computer_hw" type="cpu_monitor.py"
args="--diag-hostname=my_machine" >
<param name="check_ipmi_tool" value="false" type="bool" />
<param name="enforce_clock_speed" value="false" type="bool" />
<param name="num_cores" value="-1" type="int" />
</node>
</launch>
6 changes: 6 additions & 0 deletions computer_hw/conf/hd_monitor.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<launch>
<node pkg="computer_hw" type="hd_monitor.py"
args="$(optenv HOME /home) --diag-hostname=my_machine" name="hd_monitor" >
<param name="no_hd_temp_warn" value="True" />
</node>
</launch>
10 changes: 10 additions & 0 deletions computer_hw/conf/monitor.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<launch>
<!-- Sensors -->
<node pkg="libsensors_monitor" type="libsensors_monitor" name="libsensors_monitor" output="screen" respawn="true" />

<node pkg="computer_hw" type="nvidia_temp.py" name="nvidia_temperature_monitor" output="screen" respawn="true" />

<!-- Enable ROS' diagnostics aggregation feature -->
<node pkg="diagnostic_aggregator" type="aggregator_node" name="diag_agg" />

</launch>
4 changes: 4 additions & 0 deletions computer_hw/conf/ntp_monitor.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<launch>
<node pkg="computer_hw" type="ntp_monitor.py" name="ntp_monitor"
args="fw1 --diag-hostname=my_machine" />
</launch>
8 changes: 8 additions & 0 deletions computer_hw/demo/cpu_monitor.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<launch>
<node name="cpu_monitor" pkg="computer_hw" type="cpu_monitor.py"
args="--diag-hostname=my_machine" >
<param name="check_ipmi_tool" value="false" type="bool" />
<param name="enforce_clock_speed" value="false" type="bool" />
<param name="num_cores" value="-1" type="int" />
</node>
</launch>
1 change: 1 addition & 0 deletions computer_hw/executables/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is the indigo code, and will not work correctly on a precise machine
Loading