Commit Graph

  • 820cb39781 changed mysql package ishak jmilou.ishak 2024-12-12 14:00:26 +01:00
  • 58f1a931a6 Merge branch 'OpenCV' into 'main' Sam Hos 2024-12-12 13:48:59 +01:00
  • c9d3b0f795 Merge branch 'main' into 'OpenCV' OpenCV Sam Hos 2024-12-12 13:48:21 +01:00
  • 85af15d7a3 change default camera Sam Hos 2024-12-12 13:28:43 +01:00
  • a1b50a3780 changes to video settings Sam Hos 2024-12-12 13:27:06 +01:00
  • 5c4a0f1e9d busy with sending command to database ishak jmilou.ishak 2024-12-11 18:45:22 +01:00
  • b86528595e change camera Sam Hos 2024-12-11 16:51:01 +01:00
  • eef4f9c79c revert video format change Sam Hos 2024-12-11 16:39:45 +01:00
  • 3c23d37be1 change video format Sam Hos 2024-12-11 16:37:01 +01:00
  • c2886d32c9 use libcamera with picam Sam Hos 2024-12-11 16:30:14 +01:00
  • 8158c85d6e use astra backend Sam Hos 2024-12-11 16:12:16 +01:00
  • e682969ec8 code revert Sam Hos 2024-12-11 16:07:26 +01:00
  • 0dfc3b5c13 attempt with gstreamer Sam Hos 2024-12-11 15:43:05 +01:00
  • 7f786d5197 change camera logic Sam Hos 2024-12-11 15:37:31 +01:00
  • 60ba177dc2 add pipeline for picam Sam Hos 2024-12-11 15:34:53 +01:00
  • e9f998b3e7 set V4L2 backend Sam Hos 2024-12-11 15:28:21 +01:00
  • e77aa4b2dc try to get data from database ishak jmilou.ishak 2024-12-11 14:54:33 +01:00
  • 7eeaba482e removed attempt for camera detection Sam Hos 2024-12-11 14:50:02 +01:00
  • e8db00120f update video camera logic Sam Hos 2024-12-11 14:46:50 +01:00
  • c65f310e81 cleanup Sam Hos 2024-12-11 14:38:12 +01:00
  • b2432ab9cd removed execute to test if page works ishak jmilou.ishak 2024-12-11 14:39:47 +01:00
  • ec3e83ef7f changed ip adress and cmakelist Sam Hos 2024-12-11 14:35:42 +01:00
  • 4c5cea71b2 Restructure want de vorige was niet goed gegaan Yannick van Etten 2024-12-10 13:59:39 +01:00
  • dcd3f1006d restructure en code toegevoegd voor mqtt Yannick van Etten 2024-12-10 13:30:42 +01:00
  • 480d36393a update website so it shows image Sam Hos 2024-12-10 13:29:58 +01:00
  • fea0f19857 update ip adress Sam Hos 2024-12-10 13:29:50 +01:00
  • e1135dac0f update cmakelist Sam Hos 2024-12-10 13:13:45 +01:00
  • 93167e67f6 changed table name ishak jmilou.ishak 2024-12-09 15:01:29 +01:00
  • 3bb40d5929 Replace MariaDB connection with Flask-MySQLdb integration ishak jmilou.ishak 2024-12-09 14:59:42 +01:00
  • 9689d70104 Uncommented mariadb conn ishak jmilou.ishak 2024-12-09 13:12:51 +01:00
  • 2f4e5ae096 re enable robot communication Sam Hos 2024-12-09 10:31:01 +01:00
  • 01535607fc removed mariadb ishak jmilou.ishak 2024-12-09 10:14:10 +01:00
  • f0637f4ba8 final etische aspecten ishak jmilou.ishak 2024-12-09 10:13:53 +01:00
  • 14a62c022c start van visie op etische aspecten ishak jmilou.ishak 2024-12-07 22:11:03 +01:00
  • cd374dab81 rename index route to database and update response message ishak jmilou.ishak 2024-12-05 13:40:34 +01:00
  • f9cb54a1cf start db connection ishak jmilou.ishak 2024-12-04 17:46:40 +01:00
  • 606506e40c update review feedback with additional documentation and planning notes Develop_test_branch ishak jmilou.ishak 2024-12-03 13:37:44 +01:00
  • 6efd95fb32 feedback sprint 4 ishak jmilou.ishak 2024-12-03 13:34:43 +01:00
  • 5eff7fccba fix ishak jmilou.ishak 2024-12-03 12:45:18 +01:00
  • a03894e52e changed MQTT connection port from 1884 to 80 ishak jmilou.ishak 2024-12-03 12:18:02 +01:00
  • 9e07a243ea receive images from mqtt server and display on endpoint Sam Hos 2024-12-03 12:06:12 +01:00
  • b93a5f2dca added mosquitto conf Sam Hos 2024-12-02 14:00:29 +01:00
  • 911b870786 remove unused library Sam Hos 2024-12-02 13:59:27 +01:00
  • dd2a1b56c4 changed port Sam Hos 2024-12-02 12:58:14 +00:00
  • dd39bd3021 fixed mqtt and sockets and reverse proxy after 5 hours Sam Hos 2024-12-02 13:44:15 +01:00
  • 1563528b67 changed file location ishak jmilou.ishak 2024-12-02 13:32:45 +01:00
  • 2e5af52ba8 changed mqtt port to 8080 ishak jmilou.ishak 2024-12-02 12:45:26 +01:00
  • eb04d35d40 changed path ishak jmilou.ishak 2024-12-02 10:13:42 +01:00
  • 80fcb1ccc3 daily stand up 02/12/2024 ishak jmilou.ishak 2024-12-02 09:13:34 +01:00
  • 62cdf98098 testing phpmyadmin ishak jmilou.ishak 2024-11-30 15:18:01 +01:00
  • 4f79695d9c Foto toegevoegd van het aansluitschema Yannick van Etten 2024-11-29 14:04:12 +01:00
  • b2d233386c uitleg toegevoegd voor de MQ5 gassensor Yannick van Etten 2024-11-29 13:52:27 +01:00
  • db6fa156c9 Update WSGI path to point to the correct application directory ishak jmilou.ishak 2024-11-28 13:21:24 +01:00
  • 048790ec8b Add WSGI entry point for the application ishak jmilou.ishak 2024-11-28 13:16:03 +01:00
  • 8aa54805ac Grabbed existing progam off github and repaired it Sam Hos 2024-11-27 21:25:48 +01:00
  • aca6644c02 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/technische-informatica-sm3/ti-projectten/rooziinuubii79 ishak jmilou.ishak 2024-11-26 14:55:47 +01:00
  • 492f506aa2 daily stand up-/ hoofdvraag en deelvragen ishak jmilou.ishak 2024-11-26 14:55:45 +01:00
  • d26d277c3c driver cleanup Sam Hos 2024-11-26 13:32:14 +01:00
  • c76ba93e82 code req Sam Hos 2024-11-26 13:30:38 +01:00
  • 508d2ed4e2 added base OpenCV script and documentation Sam Hos 2024-11-25 11:46:24 +01:00
  • 3e202acc8d gitignore update Sam Hos 2024-11-25 11:46:07 +01:00
  • 0bfba0bffe Added comments Sam Hos 2024-11-24 16:42:34 +01:00
  • 8a5b349040 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/technische-informatica-sm3/ti-projectten/rooziinuubii79 ishak jmilou.ishak 2024-11-20 17:14:55 +01:00
  • a41ea1b70c styling website ishak jmilou.ishak 2024-11-20 17:14:54 +01:00
  • eb804c888c updated credentials to secure mqtt Sam Hos 2024-11-20 16:29:22 +01:00
  • a028a6f88f change mqtt credentials Sam Hos 2024-11-20 16:07:39 +01:00
  • 47b29a1c55 added both json and idividual topic sending in cpp Sam Hos 2024-11-20 15:49:21 +01:00
  • 528de4f3f4 code conventions Sam Hos 2024-11-20 15:39:13 +01:00
  • c16ba3cf9d busy with website redesign ishak jmilou.ishak 2024-11-20 15:38:56 +01:00
  • 82c4381143 daily stand up 19/11/2024 ishak jmilou.ishak 2024-11-20 11:45:54 +01:00
  • 160b43f49e nog stukje toegevoegd aan de tvoc/eco2 sensor uitleg Yannick van Etten 2024-11-19 15:26:46 +01:00
  • afe8ae3357 uitleg toegevoegd van de tvoc/eco2 sensor toegevoegd Yannick van Etten 2024-11-19 15:23:40 +01:00
  • 66d5444488 Uitleg van de DHT11 sensor toegevoegd aan sensoronderzoek Yannick van Etten 2024-11-19 15:07:17 +01:00
  • 25b1fa8c35 changed locations of different files ishak jmilou.ishak 2024-11-18 13:07:02 +01:00
  • bcbd6743fb Added comment Yannick van Etten 2024-11-18 11:16:53 +01:00
  • 9997bf2319 Removed double code Yannick van Etten 2024-11-18 11:12:02 +01:00
  • 0ae0b83e4b Merged m5 code into sensor code Yannick van Etten 2024-11-18 11:09:13 +01:00
  • cc9aefa424 made admonition work ishak jmilou.ishak 2024-11-18 09:18:49 +01:00
  • 3d95479840 fixed drop down ishak jmilou.ishak 2024-11-18 09:15:56 +01:00
  • b2a24779f5 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/technische-informatica-sm3/ti-projectten/rooziinuubii79 ishak jmilou.ishak 2024-11-18 09:13:36 +01:00
  • 97efd7d6e1 started with daily 18-11 ishak jmilou.ishak 2024-11-18 09:13:35 +01:00
  • ef52dbefe4 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/technische-informatica-sm3/ti-projectten/rooziinuubii79 Mees Roelofsz 2024-11-13 16:06:57 +01:00
  • f24b88bd68 fixed markdown Mees Roelofsz 2024-11-13 16:06:53 +01:00
  • f9767965a1 wrote comments ishak jmilou.ishak 2024-11-13 15:01:15 +01:00
  • db8758e1e5 removed unnecessary code Yannick van Etten 2024-11-13 14:45:27 +01:00
  • 08dff8bbc1 changed test code for the m5stack sensor Yannick van Etten 2024-11-13 14:37:14 +01:00
  • a6b1b3bd1e removed space ishak jmilou.ishak 2024-11-13 14:20:14 +01:00
  • f0260c1a91 changed file location Yannick van Etten 2024-11-13 13:46:04 +01:00
  • c9efba62d4 testing vpn ishak jmilou.ishak 2024-11-13 13:41:40 +01:00
  • 40d601a35b Name change and small changes Yannick van Etten 2024-11-13 13:02:22 +01:00
  • 661fdb9d26 Added placeholder webite for main website Sam Hos 2024-11-12 14:30:45 +01:00
  • 0e30854b51 fix html and added password to enter page Sam Hos 2024-11-12 14:13:43 +01:00
  • 3525479b17 Added comments Yannick van Etten 2024-11-11 10:53:10 +01:00
  • 2e08bf7e74 Removed baseline Yannick van Etten 2024-11-11 09:19:08 +01:00
  • 194920bdad refert to older version to check if this is the problem ishak jmilou.ishak 2024-11-06 15:08:47 +01:00
  • a67f5238b6 Enhance MQTT message handling and add data fetching in Flask app ishak jmilou.ishak 2024-11-06 14:44:12 +01:00
  • d534940370 Refactor safety checks and improve message handling in CKobuki class ishak jmilou.ishak 2024-11-06 14:06:15 +01:00
  • 89b608b759 comments and cleanup Sam Hos 2024-11-06 14:01:39 +01:00
  • 6dba1d0262 added sensordata to website Sam Hos 2024-11-06 13:59:40 +01:00
  • f95b78d236 comment Sam Hos 2024-11-06 13:08:48 +01:00