Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pipeline updates (allows configuration variables in place of static values) and documentation #53

Merged
merged 5 commits into from
May 13, 2023
Merged

Pipeline updates (allows configuration variables in place of static values) and documentation #53

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d3210e
Pipeline updates and documentation
meadej Apr 5, 2023
756e558
Updates to camera module
meadej Apr 18, 2023
47f9fd5
Deployment additions
meadej Apr 24, 2023
c3a5179
Updates
meadej Apr 24, 2023
714ce84
Updates
meadej Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates to camera module
  • Loading branch information
@meadej
meadej committed Apr 18, 2023
commit 756e558312b45f79748fe2bbaf462762859ca7ee
10 changes: 9 additions & 1 deletion axis-ptz/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def moveCamera(ip, username, password, mqtt_client):
get_jpeg_request()
capture_metadata = get_json_request()
mqtt_client.publish(
"skyscan/captures/data",
publish_topic,
json.dumps(capture_metadata),
0,
False
Expand Down Expand Up @@ -816,6 +816,7 @@ def main():
global cameraConfig
global flight_topic
global object_topic
global publish_topic
global logging_directory
global Active

Expand Down Expand Up @@ -892,6 +893,12 @@ def main():
action="store_true",
help="Verbose output"
)
parser.add_argument(
"--publish-topic",
type=str,
help="The topic to publish capture information to",
default="skyscan/captures/data"
)
parser.add_argument(
"-f",
"--flat-file-structure",
Expand Down Expand Up @@ -956,6 +963,7 @@ def main():

flight_topic = args.mqtt_flight_topic
object_topic = args.mqtt_object_topic
publish_topic = args.publish_topic
print(
"connecting to MQTT broker at "
+ args.mqtt_host
Expand Down