begin properly implementing monitor display logic

main.lua

@@ -33,6 +33,8 @@ Thrusters = {
     }
 } -- Table of thruster tables
 
+SensorData = {}
+
 ThrusterTypes = {
     "thruster",
     "solid_fuel_thruster",
@@ -455,21 +457,38 @@ function PollVelocity()
 
     -- Velocity Sensors
     VelocityVectors = {}
+    local next = next
+    if next(velSensors) == nil then
+
+        SensorData.Velocity = {}
+
         for vsindex, velsensor in pairs(velSensors) do
+            
             local vsAxis = velsensor.getAxis()
             local vsVelocity = velsensor.getVelocity()
             VelocityVectors[vsAxis] = vsVelocity
+            
+            SensorData.Velocity.Raw = VelocityVectors
         end
     end
     
+end
+
 function PollAltitude()
     local altSensor = peripheral.find("altitude_sensor") -- enforce one alt sensor
 
     -- Altitude Sensor
     if altSensor then
+
+        SensorData.Altitude = {}
+
         Altitude = altSensor.getHeight()
         AirPressure = altSensor.getAirPressure()
         VerticalSpeed = altSensor.getVerticalSpeed()
+
+        SensorData.Altitude.Altitude = Altitude
+        SensorData.Altitude.AirPressure = AirPressure
+        SensorData.Altitude.VerticalSpeed = VerticalSpeed
     end
 end
 
@@ -478,8 +497,14 @@ function PollNavTable()
     
     -- Navigation Table
     if navTable then
+
+        SensorData.NavTable = {}
+
         Heading = navTable.getHeading()
         NavTableHasTarget = navTable.hasTarget()
+
+        SensorData.NavTable.Heading = Heading
+        SensorData.NavTable.HasTarget = NavTableHasTarget
         if NavTableHasTarget then
             BearingToTarget = navTable.getBearing()
             TargetClosureRate = navTable.getClosureRate()
@@ -492,13 +517,11 @@ function PollNavTable()
             TargetVerticalOffset = 0
             TargetRelativeAngle = 0
         end
-    else
+
-        Heading = 0
+        SensorData.NavTable.TargetBearing = BearingToTarget
-        NavTableHasTarget = false
+        SensorData.NavTable.TargetClosureRate = TargetClosureRate
-        BearingToTarget = 0
+        SensorData.NavTable.TargetVerticalOffset = TargetVerticalOffset
-        TargetClosureRate = 0
+        SensorData.NavTable.TargetRelativeAngle = TargetRelativeAngle
-        TargetVerticalOffset = 0
-        TargetRelativeAngle = 0
     end
 end
 
@@ -507,13 +530,16 @@ function PollGimbal()
 
     -- Gimbal Sensor
     if gimbalSensor then
+
+        SensorData.Gimbal = {}
+
         Angles = gimbalSensor.getAngles()
         AngularRates = gimbalSensor.getAngularRates()
         LinearAcceleration = gimbalSensor.getLinearAcceleration()
-    else
+
-        Angles = {0, 0}
+        SensorData.Gimbal.Angles = Angles
-        AngularRates = {0, 0, 0}
+        SensorData.Gimbal.AngularRates = AngularRates
-        LinearAcceleration = {0, 0, 0}
+        SensorData.Gimbal.LinearAcceleration = LinearAcceleration
     end
 end
 
@@ -668,17 +694,19 @@ function displayInstrumentPanel(monitor, sensorData)
     m.setCursorPos(1, 2)
     m.write("----------------------")
 
+    local next = next
+    if next(sensorData) ~= nil then
         if sensorData then
             m.setCursorPos(1, 3)
-        m.write("Pitch:   " .. string.format("%.2f", sensorData.gimbal.pitch or 0))
+            m.write("Pitch:   " .. string.format("%.2f", SensorData.Gimbal.Angles.xAngle or 0))
             m.setCursorPos(1, 4)
-        m.write("Roll:    " .. string.format("%.2f", sensorData.gimbal.roll or 0))
+            m.write("Roll:    " .. string.format("%.2f", SensorData.Gimbal.Angles.zAngle or 0))
             m.setCursorPos(1, 5)
-        m.write("Yaw:     " .. string.format("%.2f", sensorData.navTable.heading or 0))
+            m.write("Yaw:     " .. string.format("%.2f", SensorData.NavTable.Heading or 0))
             m.setCursorPos(1, 6)
             m.write("Velocity: " .. string.format("%.2f", sensorData.velocity or 0))
             m.setCursorPos(1, 7)
-        m.write("Altitude: " .. string.format("%.2f", sensorData.altitude or 0))
+            m.write("Altitude: " .. string.format("%.2f", SensorData.Altitude.Altitude or 0))
         else
             m.setCursorPos(1, 3)
             m.write("Pitch:   0.00")
@@ -698,6 +726,9 @@ function displayInstrumentPanel(monitor, sensorData)
         m.write("Autopilot: " .. autopilotStatus)
     end
     
+    
+end
+
 function displayAutopilotControls(monitor, sensorData)
     if not monitor or not monitor.peripheral then return end
     
@@ -763,15 +794,16 @@ function Main()
     Init()
 
     local sentinel = true
+    print("Mainloop starting. Press 'q' to stop the loop and save configuration changes.")
     while sentinel do
 
         -- Update monitor displays
         if Config.Monitors.InstrumentPanelMonitor then
-            displayInstrumentPanel(Config.Monitors.InstrumentPanelMonitor)
+            displayInstrumentPanel(Config.Monitors.InstrumentPanelMonitor, SensorData)
         end
         
         if Config.Monitors.AutopilotControlMonitor then
-            displayAutopilotControls(Config.Monitors.AutopilotControlMonitor)
+            displayAutopilotControls(Config.Monitors.AutopilotControlMonitor, SensorData)
         end
 
         local unindexedThrusters = checkIfThrusterIsIndexed()