supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-11-12 18:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
59 commits 1 branch 0 tags 9.8 MiB
Commit graph

59 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aadi Desai 54d30741e0
Merge branch 'main' into Integration 2021-06-14 12:17:20 +01:00
Aadi Desai ddea9f26ca
Merge pull request #1 from supleed2/Testad3919 
Merge Testad3919 into main
 2021-06-13 18:42:15 +01:00
Aadi Desai 24bd7db3a8 Rover Control Program Complete 
To be tested
 2021-06-13 18:36:13 +01:00
Aadi Desai dc927495ec Fix type errors for battery stat reporting 2021-06-13 18:26:00 +01:00
Aadi Desai f3ca90fb2e Add battery cycle tracking to Command<->Control reference doc 2021-06-13 17:59:21 +01:00
Aadi Desai 0483397ae6 Add emergency stop function 2021-06-13 17:26:50 +01:00
Aadi Desai 39603efd3c Add odometer reset flag to Drive<->Control reference doc 2021-06-13 16:51:46 +01:00
Aadi Desai bbec96810f Set up basic rover flow, individual functions to be completed 2021-06-13 00:56:49 +01:00
Aadi Desai 5e6254029a Add instruction.h 
Struct for holding instructions in FIFO Queue, enum for instruction types
 2021-06-13 00:50:38 +01:00
Aadi Desai 1e87e9b0f4 Fix incorrect variable types 
reqSpeed is between 0 & 1, batteryVoltage has decimal places, both should be float not int
 2021-06-13 00:47:41 +01:00
Aadi Desai 52e14dfaa8 Update Command<->Control reference doc 
Add Rover state and correct comments
 2021-06-12 21:00:55 +01:00
Aadi Desai 1d29735429 Update Command<->Control reference doc 2021-06-12 15:15:37 +01:00
Aadi Desai 5667ef67f2 Add basic status flag for flow control 2021-06-12 12:50:44 +01:00
Aadi Desai 88adbdc572 Correct location of credentials.h to include/ 2021-06-12 12:47:12 +01:00
Mee2001 5dba48bee3 Attempt at angle PID 2021-06-11 00:52:32 +01:00
Aadi Desai 778be64c3d Create Vision<->Control reference doc 2021-06-10 18:00:13 +01:00
Mee2001 bb33d95697 Implemented PID control 
for forward and backward motion
 2021-06-10 17:34:22 +01:00
Mee2001 f40452c255 Integrated Command and Drive 2021-06-10 14:40:00 +01:00
Aadi Desai 108f4d1495 Add nonblock flag to UART FILE* 2021-06-10 00:19:35 +01:00
Nikita Konovalchik eac44e1d3d Some updates tm 2021-06-09 20:06:39 +01:00
Aadi Desai 7ab9de2cc7 Tidy up main.cpp formatting 
Regions allow for Code Folding
 2021-06-09 18:33:37 +01:00
NikitaK be103e3072
Add files via upload 2021-06-09 18:04:51 +01:00
Aadi Desai 5411a247bc Create Command<->Control reference doc 2021-06-09 15:25:18 +01:00
Aadi Desai 65f48f99c3 Create Energy<->Control reference doc 2021-06-08 20:26:59 +01:00
Aadi Desai c7a5a930f1 Vision "Fresh Start" from Updated Upstream 2021-06-08 19:07:13 +01:00
Aadi Desai 4a6997e3b0 Merge branch 'main' into Testad3919 2021-06-08 18:44:28 +01:00
IssaBqain f2f1dfa80f Energy stuff added 2021-06-08 02:10:13 +01:00
Aadi Desai 0798db2d3e Add expansion board mapping for connection to DE10 Lite 2021-06-07 16:59:56 +01:00
Aadi Desai fd76a692e1 Add ability for Drive to request current heading from Control 2021-06-07 16:29:04 +01:00
Aadi Desai 9463a14cdc Create Drive<->Control reference doc 2021-06-07 14:08:58 +01:00
Aadi Desai 0dee19f28c Updated main to use portable Ticker Lib 2021-06-05 13:11:09 +01:00
Aadi Desai 99c3af355b Add portable Ticker @ 2.0.0 Library 2021-06-05 13:10:51 +01:00
Aadi Desai e07744478d SPIFFS tested, working 2021-06-04 17:12:40 +01:00
Aadi Desai bcdd392020 Migrate to SPIFFS, untested 2021-06-04 01:02:32 +01:00
Aadi Desai 87b16945f2 Merge code from temp.cpp into main.cpp 2021-06-03 21:29:14 +01:00
Aadi Desai de87475e47 Add debugging compilation and monitor flags 2021-06-03 21:29:00 +01:00
Aadi Desai 3920375c43 Update library dependencies 2021-06-03 21:28:20 +01:00
Aadi Desai d8209c009f Add dummy credentials file 2021-06-03 01:09:29 +01:00
Aadi Desai a120aa10fc Add Json dependency to project 2021-06-02 18:53:55 +01:00
Aadi Desai 084959db0e Add temp file to migrate to main.cpp 2021-06-02 18:50:54 +01:00
Aadi Desai 3dd798716b Merge branch 'main' into Testad3919 2021-06-02 18:49:11 +01:00
Aadi Desai 02aed60775 Add software serial library and demo 
Connect each TX/RX pair as loopback: results in message passing through both pairs of hardware and software UARTs and echoing back input to serial monitor
 2021-06-01 17:46:31 +01:00
Aadi Desai 20cdb8f06e Test branch copy to move to local 2021-06-01 16:04:15 +01:00
jc4419 a00eb39ad1 Added SPIFFS support so the html file does not need to be embedded in the main sketch. Makes it easier to update the webpage quickly as no longer need to recompile everything. Also added a favicon! 2021-05-31 23:57:23 +04:00
jc4419 816c9d5663 Fixed some syntax errors in the js code for the webpage. Also added mouse click support for the arrow keys. Added some commented code that can be uncommented for connecting the esp32 to a wifi router instead of AP mode. 2021-05-31 21:49:50 +04:00
jc4419 bf2675fa45 Major Update: Developed all the backend programming for full duplex transmission in real time, using websockets. Added some minor fixes to formatting of text. Tested using a button and pot to simulate odometer and battery values to test real time information transfer from rover to client. Used LED to signifiy movement direction, and tested the same from client to rover. Tests passed! 2021-05-29 07:54:53 +04:00
jc4419 7478a4b0db Added a very basic test sketch to test components on breadboard before first draft of main sketch. 2021-05-29 02:04:04 +04:00
jc4419 29d1ace16b Merge branch 'main' of https://github.com/supleed2/EE2Rover into main 2021-05-29 00:28:03 +04:00
jc4419 d9eaccc5ab Developed a basic template for web ui. Added arrow keys with mouse and keyboard support for movement control, added battery level indicator and odometer(w/ dummy values) more to add for sensor output, also added css/js touches for aestheics/resposiveness/layout. 2021-05-29 00:27:27 +04:00
anishghanekar d0619cd9cd Changed Colour recognition code 2021-05-28 00:40:25 +01:00