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 +4 -3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1b51dd7f4 - Show all commits

1
api/views/index.ejs
View File

@@ -138,6 +138,7 @@
}
function send_move_request(data) {
console.log("sending move request " + data);
var xhr = new XMLHttpRequest();
xhr.open("POST", "/move", true);
xhr.setRequestHeader("Content-Type", "application/json");

6
src/api_communication/api_communication/api_listener.py
View File

@@ -99,10 +99,10 @@ class ApiListener(Node):
def send_video(self):
self.get_logger().info('Starting video thread')
vid = cv2.VideoCapture(0, cv2.CAP_DSHOW)
vid = cv2.VideoCapture(0)
vid.set(cv2.CAP_PROP_FRAME_WIDTH, RES_4K_W)
vid.set(cv2.CAP_PROP_FRAME_HEIGHT, RES_4K_H)
# vid.set(cv2.CAP_PROP_FRAME_WIDTH, RES_4K_W)
# vid.set(cv2.CAP_PROP_FRAME_HEIGHT, RES_4K_H)
while True:
try:
while vid.isOpened():