supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-12-22 21:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
80 commits 1 branch 0 tags 9.8 MiB
Commit graph

49 commits

Author SHA1 Message Date
Mee2001 ca662990b7 Update UI for Colour 
Update for negative translation
Change default UI values
 2021-06-15 11:25:10 +01:00
Mee2001 ec55c24a7c Implement stop 
Fix UI
 2021-06-15 09:42:22 +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
Aadi Desai 4fd4e56f62 Add command.js to webserver serve code 2021-06-14 20:27:49 +01:00
Aadi Desai 5f3d1b5366 Merge branch 'main' into Integration 2021-06-14 18:38:15 +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
Aadi Desai 54d30741e0
Merge branch 'main' into Integration 2021-06-14 12:17:20 +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 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
Aadi Desai 778be64c3d Create Vision<->Control reference doc 2021-06-10 18:00:13 +01:00
Mee2001 f40452c255 Integrated Command and Drive 2021-06-10 14:40:00 +01:00
Aadi Desai 7ab9de2cc7 Tidy up main.cpp formatting 
Regions allow for Code Folding
 2021-06-09 18:33:37 +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 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 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 6c31662970 UART Test program for ESP32 expansion board 
Uses ESP32 hardware serial UARTs with pins of Arduino HAT board
 2021-05-22 18:06:39 +01:00
Aadi Desai 98933c77c9 Set PIO Serial Monitor to "Line Mode" 
Using "send_on_enter" monitor filter mode
 2021-05-22 18:05:24 +01:00
Aadi Desai 3142d1e64e
Remove blink sketch 
ESP32 DevKitC V4 does not have LED_BUILTIN
 2021-05-18 12:28:50 +01:00
Aadi Desai e4b6e0dc0d Control Module Initial Commit 2021-05-18 12:18:36 +01:00