Commit Graph

151 Commits

Author SHA1 Message Date
Devoalda 9e391da487 Amended Magnetometer to use global struct 2023-11-09 23:24:45 +08:00
OldManSteve c1fd73a16e
Merge branch 'L4ncelot-R:main' into main 2023-11-09 15:18:51 +08:00
Richie 034ccb47e5 pending dodge test 2023-11-09 15:16:50 +08:00
OldManSteve 41a21ed506
Merge branch 'L4ncelot-R:main' into main 2023-11-09 15:00:48 +08:00
Richie 6ac564ee04 direction update 2023-11-09 14:58:35 +08:00
Richie 546f340f52 everything working, somehow 2023-11-09 14:02:58 +08:00
Devoalda 4761893cd9
Added Car config (#16)
* Ultrasonic Sensor + Car init obs struct

* Line sensor update for integration

* ultrasonic update for integration

* Integrate Line and Ultraman

* Added Car config

---------

Co-authored-by: xypoon <2837264P@student.gla.ac.uk>
2023-11-09 05:26:35 +00:00
Richie b7a0f60d8d Merge remote-tracking branch 'origin/main' 2023-11-09 13:20:45 +08:00
Richie da028e41b1 update comments 2023-11-09 13:20:36 +08:00
Devoalda 1b8bcfefae
Integrate Line and Ultrasonic sensor for obstacle detection (#15)
* Ultrasonic Sensor + Car init obs struct

* Line sensor update for integration

* ultrasonic update for integration

* Integrate Line and Ultraman

---------

Co-authored-by: xypoon <2837264P@student.gla.ac.uk>
2023-11-09 05:20:11 +00:00
OldManSteve 21ef7e8892
Merge branch 'L4ncelot-R:main' into main 2023-11-09 13:02:23 +08:00
OldManSteve c959946071 added webserver config, using shared config folder 2023-11-09 13:01:16 +08:00
Richie 107a142ef6 remove debug prints 2023-11-09 12:58:10 +08:00
Richie e9511eb8ce updated vtask and init 2023-11-09 12:57:26 +08:00
OldManSteve ffa89d033b frontend sys freertos working 2023-11-09 12:48:34 +08:00
Richie 0a62f7738c use minimum global variables 2023-11-09 11:38:20 +08:00
Richie 191c8686c0 push every thing 2023-11-08 17:09:01 +08:00
Richie b52685d25e add direction calculation 2023-11-08 17:07:35 +08:00
Richie a066bd06a6 add redeclare prevent 2023-11-08 15:11:42 +08:00
Devoalda 32ddff1e97
Merge pull request #13 from Devoalda/main
Added calibration for magnetometer
2023-11-08 14:11:44 +08:00
Devoalda f78fb7973d
Merge branch 'L4ncelot-R:main' into main 2023-11-08 14:11:11 +08:00
Devoalda f65c0ab189 fix(Magnetometer): Added option for calibration 2023-11-08 14:09:54 +08:00
Richie f284f972d2 PID final 2023-11-08 14:00:47 +08:00
Richie Wang b60170a526
Merge pull request #12 from soapysoltionss/main 2023-11-07 13:19:08 +08:00
soapysoltionss 96322b2fcd edit 2023-11-07 13:13:45 +08:00
soapysoltionss d716d43fa2 Merge branch 'main' of https://github.com/soapysoltionss/freeRTOS-car 2023-11-07 13:13:30 +08:00
soapysoltionss 0dd80ab90f edit 2023-11-07 13:13:10 +08:00
soapysoltionss 6e65fac708 barcode 2023-11-07 13:11:21 +08:00
soapysoltionss 57683829ae Merge branch 'main' of https://github.com/soapysoltionss/freeRTOS-car 2023-11-07 13:08:15 +08:00
soapysoltionss d840b2710d update barcode 2023-11-07 13:05:12 +08:00
soapysoltionss 678aa00ecc update methods and added bar width detection 2023-11-07 12:48:19 +08:00
Richie Wang 11f60117ed
Merge pull request #11 from Devoalda/main
Magnetometer Accuracy Fix
2023-11-07 10:06:01 +08:00
Devoalda 585f797460
Merge branch 'L4ncelot-R:main' into main 2023-11-07 10:03:11 +08:00
Devoalda d0553b6ddb fix(Magnetometer):
Added filter for magnetometer outliers
2023-11-07 10:02:09 +08:00
Richie b02919bf1b add turn to yaw function (pending test) 2023-11-07 09:35:15 +08:00
Richie c19b665e0b update PWM and PID value 2023-11-06 23:46:47 +08:00
Richie 389c4ecd92 add function to revert wheel direction 2023-11-06 20:45:42 +08:00
Devoalda f933d8ea91 fix(Magnetometer):
Removed Com Filter
2023-11-04 13:38:47 +08:00
Richie 4137d4f350 updated motor with testing codes with line sensor 2023-10-31 21:52:09 +08:00
soapysoltionss 2d0f17a4bc Revert "add direction control"
This reverts commit ed3c440ebc.
2023-10-31 15:45:37 +08:00
Richie Wang 398ef2b8ca
Merge pull request #10 from soapysoltionss/main
barcode
2023-10-31 14:39:27 +08:00
soapysoltionss 2a38789890 barcode 2023-10-31 14:34:45 +08:00
Richie ed3c440ebc add direction control 2023-10-30 23:24:58 +08:00
Richie 2bf8d625ac Merge remote-tracking branch 'origin/main' 2023-10-30 23:20:30 +08:00
Richie ed516b5ce4 add direction control 2023-10-30 23:20:15 +08:00
Richie Wang 8a18908765
Merge pull request #9 from OldManSteve/main
frontend first push
2023-10-30 11:05:31 +08:00
OldManSteve 5cb4fae0c9 frontend first push 2023-10-30 11:03:55 +08:00
Richie f176192dce PID 99%, suspect wheel issue as if I swap the wheels the car slants opposite direction, for a bit; but generally straight for about 1m, should be enough for the map 2023-10-29 20:26:13 +08:00
Richie e8f8d31b85 pending PID tuning; now car moves in S shape 2023-10-29 17:54:33 +08:00
soapysoltionss 19d6512639 barcode update 2023-10-29 15:46:20 +08:00