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

82 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aadi Desai 531a86c6d0 Fix instruction struct 
Type declaration of colour variable
 2021-06-15 08:52:33 +01:00
Aadi Desai c98bafd6f7 Add ability to select Vision colour tracking 2021-06-15 03:14:04 +01:00
Aadi Desai bbe36fb9dd Merge branch 'main' into Testad3919 2021-06-15 03:08:12 +01:00
Aadi Desai 72021e7208 Fix Instruction Queue and Emergency Stop 2021-06-15 01:33:52 +01:00
Mee2001 5e95a8d860 Control updates 2021-06-15 00:51:46 +01:00
Mee2001 d4e14208e2 Merge branch 'Integration' of https://github.com/supleed2/EE2Rover into Integration 2021-06-14 20:32:42 +01:00
Mee2001 c6f93039a1 IMU Stuff 2021-06-14 20:32:07 +01:00
Aadi Desai 4fd4e56f62 Add command.js to webserver serve code 2021-06-14 20:27:49 +01:00
Mee2001 cc113aa086 Pin change 2021-06-14 18:40:58 +01:00
Aadi Desai 5f3d1b5366 Merge branch 'main' into Integration 2021-06-14 18:38:15 +01:00
Aadi Desai dbe01b64ac
Merge pull request #3 from supleed2/PIOjc4419 
PIOjc4419
 2021-06-14 18:37:32 +01:00
Aadi Desai 20f13252a7 Merge branch 'main' into PIOjc4419 2021-06-14 18:36:47 +01:00
Aadi Desai 2c135f118a Add external compass input 2021-06-14 17:50:15 +01:00
jc4419 46519cfe19 Alpha stage commit. Console done. 
Console Changes: changed the name of the tokens so that more helpful error messages. Added help text.
Moved command.jison to src.
Other Changes: Added more telemetry data about battery and rover status.
Finished gui commands, replaced to sliders from buttons and linked them to command console.
 2021-06-14 20:37:05 +04:00
Mee2001 aadb52990e IMU stuff 2021-06-14 17:25:57 +01:00
Aadi Desai c3550ab4e1
Merge pull request #2 from supleed2/Integration 
Integration
 2021-06-14 12:18:27 +01:00
Aadi Desai 54d30741e0
Merge branch 'main' into Integration 2021-06-14 12:17:20 +01:00
Aadi Desai cea4237b75 Add waiting state to reference doc 2021-06-13 23:33:49 +01:00
Aadi Desai 39a8d232a7 Add wait function to rover 
Instruction type and handling within switch statements
 2021-06-13 21:43:43 +01:00
Aadi Desai b6cbfc7619 Add ability to pause rover for a defined time to reference doc 2021-06-13 21:24:38 +01:00
jc4419 6c221f6d12 Fully implemented the console. Console required the additon of a parser written in .jison api and output as command.js which is linked in html. Tested working sending correct JSON packets. 2021-06-13 22:42:00 +04: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
jc4419 44f9d8ce7b Removed redundant leftover code from previous versions. Tweaked some coloring and formatting(again). 
Added the 'Command Buffer' section.
Added the JSON format for sending data, yet to be implemented.
 2021-06-12 04:18:04 +04:00
jc4419 f5ca382c49 Added extra telemetry data parameters, and the corresponding javascript websocket back end. In short rover to client interface is done, needs to be tested. Also changed button interface to accomodate new 'command buffer' system. No real time control. Also made layout static so that button layout doesnt break when resizing window. 2021-06-11 22:45:00 +04:00
jc4419 385eac760f Changed layout fomatting to use tables instead of 'float' property. Removed com port field so it works in my environment. 2021-06-11 17:44:12 +04: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