added additional configuration

axis-ptz/camera.py

@@ -29,6 +29,9 @@
 args = None
 camera = None
 cameraConfig = None
+cameraZoom = None
+cameraMoveSpeed = None
+cameraDelay = None
 pan = 0
 tilt = 0
 actualPan = 0
@@ -128,6 +131,8 @@ def get_jpeg_request(): # 5.2.4.1
  text = str(resp)
  text += str(resp.text)
  return text
+
+
 def moveCamera():
  global actualPan
  global actualTilt
@@ -185,6 +190,9 @@ def main():
  global pan
  global tilt
  global camera
+ global cameraDelay
+ global cameraMoveSpeed
+ global cameraZoom
  global cameraConfig
 
  parser = argparse.ArgumentParser(description='An MQTT based camera controller')
@@ -195,6 +203,9 @@ def main():
  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)
+ parser.add_argument('-s', '--camera-move-speed', type=int help="The speed at which the Axis will move for Pan/Tilt (0-100)", default=0)
+ parser.add_argument('-d', '--camera-delay', type=float help="How many seconds after issuing a Pan/Tilt command should a picture be taken", default=0.5)
+ parser.add_argument('-z', '--camera-zoom', type=int help="The zoom setting for the camera (0-9999)", defult=9999)
  parser.add_argument('-v', '--verbose', action="store_true", help="Verbose output")
 
  args = parser.parse_args()
@@ -218,6 +229,9 @@ def main():
 
  logging.info("---[ Starting %s ]---------------------------------------------" % sys.argv[0])
  camera = vapix_control.CameraControl(args.axis_ip, args.axis_username, args.axis_password)
+ cameraDelay = args.camera_delay
+ cameraMoveSpeed = args.camera_move_speed
+ cameraZoom = args.camera_zoom
  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

docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
  tracker:
  build: ./tracker
- entrypoint: "./flighttracker.py -m mqtt -l ${LAT} -L ${LONG} -a ${ALT} -P skyscan/planes/json -T skyscan/tracking/json -M ${MIN_ELEVATION} "
+ entrypoint: "./flighttracker.py -m mqtt -l ${LAT} -L ${LONG} -a ${ALT} -P skyscan/planes/json -T skyscan/tracking/json -M ${MIN_ELEVATION} -c ${CAMERA_LEAD}"
  depends_on:
  - mqtt
  restart: unless-stopped
@@ -36,7 +36,7 @@ services:
 
  axis-ptz:
  build: ./axis-ptz
- entrypoint: "./camera.py -m mqtt -t skyscan/tracking/json -u ${AXIS_USERNAME} -p ${AXIS_PASSWORD} -a ${AXIS_IP}"
+ entrypoint: "./camera.py -m mqtt -t skyscan/tracking/json -u ${AXIS_USERNAME} -p ${AXIS_PASSWORD} -a ${AXIS_IP} -z ${CAMERA_ZOOM} -s ${CAMERA_MOVE_SPEED} -d ${CAMERA_DELAY}"
  volumes:
  - ./capture:/app/capture
  depends_on:

env-example

@@ -7,4 +7,8 @@ FEEDER_ID=long-api-key-goes-here
 AXIS_USERNAME=user
 AXIS_PASSWORD=pass
 AXIS_IP=192.168.1.1
+CAMERA_MOVE_SPEED=50
+CAMERA_DELAY=0.5
+CAMERA_ZOOM=9999
+CAMERA_LEAD=0.25
 RTL_DEV=1

tracker/flighttracker.py

@@ -53,6 +53,7 @@
 camera_latitude = None
 camera_longitude = None
 camera_altitude = None
+camera_lead = None
 min_elevation = None
 
 # http:https://stackoverflow.com/questions/1165352/fast-comparison-between-two-python-dictionary
@@ -341,7 +342,7 @@ def __publish_thread(self):
  if cur is None:
  continue
 
- (lat, lon) = utils.calc_travel(cur.getLat(), cur.getLon(), cur.getLoggedDate(), cur.getGroundSpeed(), cur.getTrack(), 0.25)
+ (lat, lon) = utils.calc_travel(cur.getLat(), cur.getLon(), cur.getLoggedDate(), cur.getGroundSpeed(), cur.getTrack(), camera_lead)
  distance = utils.coordinate_distance(self.__latitude, self.__longitude, lat, lon)
  # Round off to nearest 100 meters
  distance = round(distance/100) * 100
@@ -458,17 +459,18 @@ def main():
  global camera_altitude
  global camera_latitude
  global camera_longitude
+ global camera_lead
  global min_elevation
  parser = argparse.ArgumentParser(description='A Dump 1090 to MQTT bridge')
 
 
  parser.add_argument('-l', '--lat', type=float, help="Latitude of camera")
  parser.add_argument('-L', '--lon', type=float, help="Longitude of camera")
  parser.add_argument('-a', '--alt', type=float, help="altitude of camera", default=0)
+ parser.add_argument('-c', '--camera-lead', type=float, help="how many seconds ahead of a plane's predicted location should the camera be positioned", default=0.25)
  parser.add_argument('-M', '--min-elevation', type=int, help="minimum elevation for camera", default=0)
  parser.add_argument('-m', '--mqtt-host', help="MQTT broker hostname", default='127.0.0.1')
  parser.add_argument('-p', '--mqtt-port', type=int, help="MQTT broker port number (default 1883)", default=1883)
-
  parser.add_argument('-P', '--plane-topic', dest='plane_topic', help="MQTT plane topic", default="skyscan/planes/json")
  parser.add_argument('-T', '--tracking-topic', dest='tracking_topic', help="MQTT tracking topic", default="skyscan/tracking/json")
  parser.add_argument('-v', '--verbose', action="store_true", help="Verbose output")
@@ -481,6 +483,7 @@ def main():
  camera_longitude = args.lon
  camera_latitude = args.lat
  camera_altitude = args.alt
+ camera_lead = args.camera_lead
  min_elevation = args.min_elevation
  level = logging.DEBUG if args.verbose else logging.INFO