corrected terms: azimuth->elevation

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .env
 notes.md
+axis-ptz/*.jpg

adsb-mqtt/adsb-mqtt.py

@@ -375,14 +375,17 @@ def dump1090Read(self) -> str:
  try:
  buffer = self.__dump1090_sock.recv(4096)
  except ConnectionResetError:
+ logging.critical("Connection Reset Error")
  self.dump1090Close()
  yield None
  except socket.error:
+ logging.critical("Socket Error")
  self.dump1090Close()
  yield None
  buffer = buffer.decode("utf-8")
  buffering = True
  if buffer == "":
+ logging.critical("Buffer Empty")
  self.dump1090Close()
  return None
  while buffering:
@@ -393,9 +396,11 @@ def dump1090Read(self) -> str:
  try:
  more = self.__dump1090_sock.recv(4096)
  except ConnectionResetError:
+ logging.critical("Connection Reset Error")
  self.dump1090Close()
  yield None
  except socket.error:
+ logging.critical("Socket Error")
  self.dump1090Close()
  yield None
  if not more:
@@ -404,6 +409,7 @@ def dump1090Read(self) -> str:
  if not isinstance(more, str):
  more = more.decode("utf-8")
  if more == "":
+ logging.critical("Receive Empty")
  self.dump1090Close()
  return None
  buffer += more

adsb-mqtt/utils.py

@@ -15,7 +15,7 @@ def deg2rad(deg: float) -> float:
  """
  return deg * (math.pi/180)
 
-def azimuth(distance: float, altitude, camera_altitude):
+def elevation(distance: float, altitude, camera_altitude):
  baseElevation = camera_altitude
  ratio = ( altitude - baseElevation) / distance
  a = math.atan(ratio) * (180 /math.pi)

axis-ptz/camera.py

@@ -19,13 +19,14 @@
 import errno
 import paho.mqtt.client as mqtt 
 from json.decoder import JSONDecodeError
-from sensecam_control import vapix_control
+from sensecam_control import vapix_control,vapix_config
 
 
 
 tiltCorrect = 15
 args = None
 camera = None
+cameraConfig = None
 pan = 0
 tilt = 0
 actualPan = 0
@@ -67,13 +68,13 @@ def setPan(bearing):
  return True
  return False
 
-def setTilt(azimuth):
+def setTilt(elevation):
  global tilt
- if azimuth < 90:
- if abs(tilt-azimuth) > 2:
- tilt = azimuth
+ if elevation < 90:
+ if abs(tilt-elevation) > 2:
+ tilt = elevation
 
- #logging.info("Setting Tilt to: %d"%azimuth)
+ #logging.info("Setting Tilt to: %d"%elevation)
 
 def moveCamera():
  global actualPan
@@ -88,8 +89,9 @@ def moveCamera():
  actualTilt = tilt
  actualPan = pan
  lockedOn = True
- camera.absolute_move(pan, tilt, 5000, 50)
-
+ camera.absolute_move(pan, tilt, 9999, 50)
+ time.sleep(0.1)
+ cameraConfig.get_jpeg_request("1920x1080", camera=1,compression=10)
 
 
  #if lockedOn == True:
@@ -120,9 +122,9 @@ def on_message(client, userdata, message):
  except:
  print("Caught it!")
 
- logging.info("{}\tBearing: {} \tAzimuth: {}".format(update["icao24"],update["bearing"],update["azimuth"]))
+ logging.info("{}\tBearing: {} \tElevation: {}".format(update["icao24"],update["bearing"],update["elevation"]))
  bearingGood = setPan(update["bearing"])
- setTilt(update["azimuth"])
+ setTilt(update["elevation"])
  currentPlane = update["icao24"]
 
 def main():
@@ -131,6 +133,7 @@ def main():
  global pan
  global tilt
  global camera
+ global cameraConfig
 
  parser = argparse.ArgumentParser(description='An MQTT based camera controller')
 
@@ -163,6 +166,7 @@ def main():
 
  logging.info("---[ Starting %s ]---------------------------------------------" % sys.argv[0])
  camera = vapix_control.CameraControl(args.axis_ip, args.axis_username, args.axis_password)
+ cameraConfig = vapix_config.CameraConfiguration(args.axis_ip, args.axis_username, args.axis_password)
  threading.Thread(target = moveCamera, daemon = True).start()
  # Sleep for a bit so we're not hammering the HAT with updates
  time.sleep(0.005)

axis-ptz/test.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+
+
+import argparse
+import logging
+import coloredlogs
+import sys
+import os
+import time
+from sensecam_control import vapix_control,vapix_config
+
+
+def main():
+
+ global camera
+ global cameraConfig
+
+ parser = argparse.ArgumentParser(description='An MQTT based camera controller')
+
+
+ parser.add_argument('-u', '--axis-username', help="Username for the Axis camera", required=True)
+ parser.add_argument('-p', '--axis-password', help="Password for the Axis camera", required=True)
+ parser.add_argument('-a', '--axis-ip', help="IP address for the Axis camera", required=True)
+
+ args = parser.parse_args()
+ print("hello")
+
+ styles = {'critical': {'bold': True, 'color': 'red'}, 'debug': {'color': 'green'}, 'error': {'color': 'red'}, 'info': {'color': 'white'}, 'notice': {'color': 'magenta'}, 'spam': {'color': 'green', 'faint': True}, 'success': {'bold': True, 'color': 'green'}, 'verbose': {'color': 'blue'}, 'warning': {'color': 'yellow'}}
+ level = logging.DEBUG if '-v' in sys.argv or '--verbose' in sys.argv else logging.INFO
+ if 1:
+ coloredlogs.install(level=level, fmt='%(asctime)s.%(msecs)03d \033[0;90m%(levelname)-8s '
+ ''
+ '\033[0;36m%(filename)-18s%(lineno)3d\033[00m '
+ '%(message)s',
+ level_styles = styles)
+ else:
+ # Show process name
+ coloredlogs.install(level=level, fmt='%(asctime)s.%(msecs)03d \033[0;90m%(levelname)-8s '
+ '\033[0;90m[\033[00m \033[0;35m%(processName)-15s\033[00m\033[0;90m]\033[00m '
+ '\033[0;36m%(filename)s:%(lineno)d\033[00m '
+ '%(message)s')
+ print("hello")
+ logging.info("---[ Starting %s ]---------------------------------------------" % sys.argv[0])
+ camera = vapix_control.CameraControl(args.axis_ip, args.axis_username, args.axis_password)
+ print("hello")
+ #############################################
+ ## Main Loop ##
+ #############################################
+ while True:
+ camera.absolute_move(0, 0, 0, 50)
+ time.sleep(5)
+ camera.absolute_move(90, 0, 0, 50)
+ time.sleep(5)
+ camera.absolute_move(180, 0, 0, 50)
+ time.sleep(5)
+ camera.absolute_move(270, 0, 0, 50)
+ time.sleep(5)
+ camera.absolute_move(0, 90, 0, 50)
+ time.sleep(5)
+
+if __name__ == "__main__":
+ try:
+ main()
+ except Exception as e:
+ logging.critical(e, exc_info=True)

docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
  tracker:
  build: ./tracker
- entrypoint: "./flighttracker.py -H piaware -m mqtt -l ${LAT} -L ${LONG} -P skyscan/planes/json -T skyscan/tracking/json -M ${MIN_AZIMUTH} "
+ entrypoint: "./flighttracker.py -H piaware -m mqtt -l ${LAT} -L ${LONG} -P skyscan/planes/json -T skyscan/tracking/json -M ${MIN_ELEVATION} "
  depends_on:
  - mqtt
 

env-example

@@ -1,7 +1,7 @@
 TZ="New York"
 LAT=38.890022390623265 
 LONG=-77.03513244930217
-MIN_AZIMUTH=45
+MIN_ELEVATION=45
 FEEDER_ID=long-api-key-goes-here
 AXIS_USERNAME=user
 AXIS_PASSWORD=pass

pan-tilt-pi/camera.py

@@ -67,13 +67,13 @@ def setPan(bearing):
  return True
  return False
 
-def setTilt(azimuth):
+def setTilt(elevation):
  global tilt
- if azimuth < 90:
- if abs(tilt-azimuth) > 2:
- tilt = azimuth
+ if elevation < 90:
+ if abs(tilt-elevation) > 2:
+ tilt = elevation
 
- logging.info("Setting Tilt to: %d"%azimuth)
+ logging.info("Setting Tilt to: %d"%elevation)
 
 def moveCamera():
  global actualPan
@@ -137,9 +137,9 @@ def on_message(client, userdata, message):
  except:
  print("Caught it!")
 
- #logging.info("Bearing: {} Azimuth: {}".format(update["bearing"],update["azimuth"]))
+ #logging.info("Bearing: {} Elevation: {}".format(update["bearing"],update["elevation"]))
  bearingGood = setPan(update["bearing"])
- setTilt(update["azimuth"])
+ setTilt(update["elevation"])
  currentPlane = update["icao24"]
 
 def main():