sem/5g_drone_ROS2
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge API branch into main #12

Merged
SemvdH merged 334 commits from api into main 2023-06-13 19:54:43 +00:00
Conversation 0 Commits 334 Files Changed 51 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 402fcbab96 - Show all commits

2
api/views/index.ejs
View File

@@ -14,7 +14,7 @@
<!-- <div class="video"> -->
<div class="mainvideo">
<p>Camera view:</p>
<canvas id="result-video" style="border: 1px solid blue;" width="800" height="600">
<canvas id="result-video" style="border: 1px solid blue;" width="800" height="600"></canvas>
<div id="connectedbuttons">
<div id="connectedstatus">
<p id="connectedlabel">Connected: <%- api_connected %></p>

2
src/camera/camera/camera_controller.py
View File

@@ -71,7 +71,7 @@ class CameraController(Node):
try:
while(vid.isOpened()):
img, frame = vid.read()
self.get_logger().info("frame before: " + str(frame.shape))
# self.get_logger().info("frame before: " + str(frame.shape))
#frame = cv2.resize(frame,(RES_4K_W,RES_4K_H))
#print("frame after: " + str(frame.shape))
encode_param = [int(cv2.IMWRITE_JPEG_QUALITY), 100]