Skip to content

Commit

Permalink
build baby build
Browse files Browse the repository at this point in the history
  • Loading branch information
robotastic committed Feb 26, 2024
1 parent 6248cd1 commit b58a12a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Build Images
env:
# Every folder in the repo that has a Dockerfile within it, comma separated
DOCKERFOLDERS: "template"
DOCKERFOLDERS: "skyscan-c2"
DOCKERNAMESPACE: ${{ secrets.DOCKER_NAMESPACE }}
PROJECT_NAME: "edgetech"
run: |
Expand Down
12 changes: 4 additions & 8 deletions skyscan-c2/c2_pub_sub.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ def __init__(
self.device_altitude = float(device_altitude)
self.object_distance_threshold = float(object_distance_threshold)
self.lambda_t = self.device_longitude # [deg]
self.varphi_t = self.device_latitude # [deg]
self.h_t = self.device_altitude # [m]
self.varphi_t = self.device_latitude # [deg]
self.h_t = self.device_altitude # [m]
self.alpha = 0.0 # [deg]
self.beta = 0.0
self.gamma = 0.0
Expand All @@ -89,7 +89,6 @@ def __init__(
self.lambda_t, self.varphi_t, self.h_t
)


# Compute orthogonal transformation matrix from geocentric
# (XYZ) to topocentric (ENz) coordinates
(
Expand Down Expand Up @@ -251,7 +250,7 @@ def _calculate_camera_angles(self, data: Any) -> tuple[float, float]:
math.atan2(r_uvw_o_1_t[2], axis_ptz_utilities.norm(r_uvw_o_1_t[0:2]))
) # [deg]
logging.info(f"Camera pan and tilt to object: {self.rho_o}, {self.tau_o} [deg]")

return self.rho_o, self.tau_o

def _relative_distance_meters(
Expand Down Expand Up @@ -310,12 +309,9 @@ def _target_selection_callback(
### some logic to select which target
target = None


object_ledger_df["camera_tilt"], object_ledger_df["camera_pan"] = zip(
*object_ledger_df.apply(
lambda x: self._calculate_camera_angles(
x.to_dict()
),
lambda x: self._calculate_camera_angles(x.to_dict()),
axis=1,
)
)
Expand Down

0 comments on commit b58a12a

Please sign in to comment.