caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated comments for gpu temp section for jetson

Browse Source
This commit is contained in:
MatthewTaylor24
2018-01-27 17:57:07 -08:00
parent 33112d20b9
commit d6f6ba9fe4
2 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
rover/system_statuses/scripts/.idea/workspace.xml generated
View File

@@ -14,16 +14,16 @@
<file leaf-file-name="system_statuses_node.py" pinned="false" current-in-tab="true"> <file leaf-file-name="system_statuses_node.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/system_statuses_node.py"> <entry file="file://$PROJECT_DIR$/system_statuses_node.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137"> <state relative-caret-position="401">
<caret line="116" column="57" lean-forward="true" selection-start-line="116" selection-start-column="57" selection-end-line="116" selection-end-column="57" /> <caret line="121" column="65" lean-forward="false" selection-start-line="121" selection-start-column="65" selection-end-line="121" selection-end-column="65" />
<folding> <folding>
<element signature="e#22#34#0" expanded="true" /> <element signature="e#22#34#0" expanded="true" />
<element signature="e#6122#6413#0" expanded="false" /> <element signature="e#6507#6798#0" expanded="false" />
<element signature="e#6842#6942#0" expanded="false" /> <element signature="e#7227#7327#0" expanded="false" />
<element signature="e#6995#7217#0" expanded="false" /> <element signature="e#7380#7602#0" expanded="false" />
<element signature="e#7268#7403#0" expanded="false" /> <element signature="e#7653#7788#0" expanded="false" />
<element signature="e#7455#7946#0" expanded="false" /> <element signature="e#7840#8331#0" expanded="false" />
<marker date="1517103102832" expanded="true" signature="6070:7946" ph="..." /> <marker date="1517104529510" expanded="true" signature="6455:8331" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -56,8 +56,8 @@
<option value="$PROJECT_DIR$/system_statuses.py" /> <option value="$PROJECT_DIR$/system_statuses.py" />
<option value="$PROJECT_DIR$/node_statuses.py" /> <option value="$PROJECT_DIR$/node_statuses.py" />
<option value="$PROJECT_DIR$/camera_2_updater.py" /> <option value="$PROJECT_DIR$/camera_2_updater.py" />
<option value="$PROJECT_DIR$/system_statuses_node.py" />
<option value="$PROJECT_DIR$/rover_statuses.py" /> <option value="$PROJECT_DIR$/rover_statuses.py" />
<option value="$PROJECT_DIR$/system_statuses_node.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -181,12 +181,12 @@
<caret line="124" column="61" lean-forward="false" selection-start-line="124" selection-start-column="61" selection-end-line="124" selection-end-column="61" /> <caret line="124" column="61" lean-forward="false" selection-start-line="124" selection-start-column="61" selection-end-line="124" selection-end-column="61" />
<folding> <folding>
<element signature="e#22#34#0" expanded="true" /> <element signature="e#22#34#0" expanded="true" />
<element signature="e#6122#6413#0" expanded="false" /> <element signature="e#6507#6798#0" expanded="false" />
<element signature="e#6842#6942#0" expanded="false" /> <element signature="e#7227#7327#0" expanded="false" />
<element signature="e#6995#7217#0" expanded="false" /> <element signature="e#7380#7602#0" expanded="false" />
<element signature="e#7268#7403#0" expanded="false" /> <element signature="e#7653#7788#0" expanded="false" />
<element signature="e#7455#7946#0" expanded="false" /> <element signature="e#7840#8331#0" expanded="false" />
<marker date="1517103102832" expanded="true" signature="6070:7946" ph="..." /> <marker date="1517104529510" expanded="true" signature="6455:8331" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -207,12 +207,12 @@
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="e#22#34#0" expanded="true" /> <element signature="e#22#34#0" expanded="true" />
<element signature="e#6122#6413#0" expanded="false" /> <element signature="e#6507#6798#0" expanded="false" />
<element signature="e#6842#6942#0" expanded="false" /> <element signature="e#7227#7327#0" expanded="false" />
<element signature="e#6995#7217#0" expanded="false" /> <element signature="e#7380#7602#0" expanded="false" />
<element signature="e#7268#7403#0" expanded="false" /> <element signature="e#7653#7788#0" expanded="false" />
<element signature="e#7455#7946#0" expanded="false" /> <element signature="e#7840#8331#0" expanded="false" />
<marker date="1517103102832" expanded="true" signature="6070:7946" ph="..." /> <marker date="1517104529510" expanded="true" signature="6455:8331" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -248,16 +248,16 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/system_statuses_node.py"> <entry file="file://$PROJECT_DIR$/system_statuses_node.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137"> <state relative-caret-position="401">
<caret line="116" column="57" lean-forward="true" selection-start-line="116" selection-start-column="57" selection-end-line="116" selection-end-column="57" /> <caret line="121" column="65" lean-forward="false" selection-start-line="121" selection-start-column="65" selection-end-line="121" selection-end-column="65" />
<folding> <folding>
<element signature="e#22#34#0" expanded="true" /> <element signature="e#22#34#0" expanded="true" />
<element signature="e#6122#6413#0" expanded="false" /> <element signature="e#6507#6798#0" expanded="false" />
<element signature="e#6842#6942#0" expanded="false" /> <element signature="e#7227#7327#0" expanded="false" />
<element signature="e#6995#7217#0" expanded="false" /> <element signature="e#7380#7602#0" expanded="false" />
<element signature="e#7268#7403#0" expanded="false" /> <element signature="e#7653#7788#0" expanded="false" />
<element signature="e#7455#7946#0" expanded="false" /> <element signature="e#7840#8331#0" expanded="false" />
<marker date="1517103102832" expanded="true" signature="6070:7946" ph="..." /> <marker date="1517104529510" expanded="true" signature="6455:8331" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>

14
rover/system_statuses/scripts/system_statuses_node.py
View File

@@ -111,10 +111,16 @@ class SystemStatuses:
self.jetson_msg.jetson_NVME_SSD = self.__used_percent_fs(self.file_systems_EMMC_NVMe_SSD[1]) self.jetson_msg.jetson_NVME_SSD = self.__used_percent_fs(self.file_systems_EMMC_NVMe_SSD[1])
# Temperature # Temperature
sensor_temperatures = subprocess.check_output("sensors | grep temp", shell=True) # This try except causes a bunch of annoying messages, but lets it run on non-jetson devices
parsed_temps = sensor_temperatures.replace("\xc2\xb0C","").replace("(crit = ","").replace("temp1:","")\ # sets to -1.0 if sensor fails to give it a default value notifying failure to pull
.replace("\n","").replace("+","").split() try:
self.jetson_msg.jetson_GPU_temp = parsed_temps[4] sensor_temperatures = subprocess.check_output("sensors | grep temp", shell=True)
parsed_temps = sensor_temperatures.replace("\xc2\xb0C","").replace("(crit = ","").replace("temp1:","")\
.replace("\n","").replace("+","").split()
self.jetson_msg.jetson_GPU_temp = parsed_temps[4]
except subprocess.CalledProcessError:
print 'sensors call failed (potential reason: on VM)'
self.jetson_msg.jetson_GPU_temp = -1.0
# EMMC and NVMe_SSD used % calculation # EMMC and NVMe_SSD used % calculation
def __used_percent_fs(self, pathname): def __used_percent_fs(self, pathname):