Purge laptop battery and plugged in status code as the Pi does not ha…

…ve a concept of this.
chrisl8 · Oct 7, 2024 · cbf8ea2 · cbf8ea2
1 parent d956ec7
commit cbf8ea2
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 182 deletions.
diff --git a/arlobot_ros/msg/ArloSafety.msg b/arlobot_ros/msg/ArloSafety.msg
@@ -1,6 +1,2 @@
 bool      safe_to_go
 bool      safe_to_operate
-bool      unplugging
-bool      ac_power
-int16     laptop_battery_percent
-bool      dangerous_doors_open
diff --git a/arlobot_ros/msg/ArloStatus.msg b/arlobot_ros/msg/ArloStatus.msg
@@ -10,7 +10,5 @@ bool      left_motor_power
 bool      right_motor_power
 float32   robot_battery_level
 bool      robot_battery_low
-int16     laptop_battery_percent
-bool      ac_power
 bool      cliff
 bool      floor_obstacle
diff --git a/arlobot_ros/propellerbot_node.py b/arlobot_ros/propellerbot_node.py
@@ -63,7 +63,6 @@ def __init__(self):
         self._broadcast_static_odometry = False
         self._leftMotorPower = False
         self._rightMotorPower = False
-        self._laptop_battery_percent = 100
         # Store last x, y and heading for reuse when we reset
         # I took off the ~, because that was causing these to reset to default on every restart
         # even if roscore was still up.
@@ -265,10 +264,6 @@ def _safety_shutdown(self, status):
         self._SafeToOperate = status.safe_to_operate
         self._safeToGo = status.safe_to_go
 
-        self._settings_from_ros["pluggedIn"] = status.ac_power
-
-        self._laptop_battery_percent = status.laptop_battery_percent
-
     # noinspection Duplicates
     def _propellerOdomDataHandler(self, data):
         """

diff --git a/node/behaviors/polling.js b/node/behaviors/polling.js
@@ -9,7 +9,6 @@ const webModelFunctions = require('../webModelFunctions');
 const personalData = require('../personalData');
 const robotModel = require('../robotModel');
 const speechEngine = require('../speechEngine');
-const checkBattery = require('../checkBattery');
 const getQRcodes = require('../getQRcodes');
 const saveScreenShotForWeb = require('../saveScreenShotForWeb');
 const howManySecondsSince = require('../howManySecondsSince');
@@ -45,9 +44,6 @@ async function polling() {
     // noinspection ES6MissingAwait
     publishRobotURL.updateRobotURL();
   }
-  if (intervalCount === 0) {
-    checkBattery();
-  }
   if (intervalCount === intervalTop) {
     if (!webModel.cameraOn) {
       saveScreenShotForWeb();

diff --git a/node/behaviors/startROS.js b/node/behaviors/startROS.js
@@ -123,7 +123,6 @@ async function startROS() {
           webModelFunctions.updateRosTopicItem('gyro_heading', 0.0);
           webModelFunctions.updateRosTopicItem('left_motor_power', true);
           webModelFunctions.updateRosTopicItem('right_motor_power', true);
-          webModelFunctions.updateRosTopicItem('laptopBatteryPercent', 85);
           webModelFunctions.updateRosTopicItem('robot_battery_level', 12.6);
           webModelFunctions.updateRosTopicItem('robot_battery_low', false);
         }

diff --git a/node/checkBattery.js b/node/checkBattery.js
diff --git a/node/speechModel.js b/node/speechModel.js
@@ -212,28 +212,6 @@ const speechModel = {
         },
       },
     },
-    laptopFullyCharged: {
-      repeatInterval: 0,
-      spacing: 0,
-      true: {
-        thingsToSay: {
-          repeat: true,
-          charged: {
-            text: 'Computer battery fully charged!',
-            weight: 100,
-          },
-        },
-      },
-      false: {
-        thingsToSay: {
-          repeat: true,
-          unDone: {
-            text: 'Starting to get tired.',
-            weight: 100,
-          },
-        },
-      },
-    },
     mostRecentArrival: {
       repeatInterval: 0,
       spacing: 0,

diff --git a/node/webModel.js b/node/webModel.js
@@ -26,8 +26,6 @@ module.exports = {
   checkUsbRelayBank: true, // Always read once on load
   haltRobot: false,
   semaphoreFilesRead: false,
-  laptopFullyCharged: 'unknown',
-  laptopBatteryPercentage: '???',
   logStreamerRunning: false,
   shutdownRequested: false,
   status: 'Arlo behavior is not running.',
@@ -164,14 +162,6 @@ module.exports = {
       alertOn: false,
       alertBtnClass: 'btn-danger',
     },
-    {
-      rosName: 'laptop_battery_percent',
-      fancyName: 'Laptop Battery %',
-      status: '',
-      btnClass: '',
-      alertOn: false,
-      alertBtnClass: 'btn-danger',
-    },
     {
       rosName: 'robot_battery_level',
       fancyName: 'Robot Battery Volts',

diff --git a/node/webModelFunctions.js b/node/webModelFunctions.js
@@ -83,9 +83,7 @@ const updateRosParameter = (key, value) => {
 exports.updateRosParameter = updateRosParameter;
 
 const updateRosTopicItem = (key, value) => {
-  if (key === 'robot_battery_level') {
-    value = value.toFixed(1);
-  } else if (key === 'heading' || key === 'gyro_heading') {
+  if (key === 'heading' || key === 'gyro_heading') {
     value = value.toFixed(3);
   }
   const arrayIndex = webModel.rosTopicItems.findIndex((x) => x.rosName === key);