supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-12-22 13:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit graph

  • aa1e957061
         Update readme with project info main Aadi Desai 2022-06-27 17:13:47 +0100
  • f11d869a4a
         Minor fixes, outside of project Aadi Desai 2021-06-17 10:56:44 +0100
  • 046f28a3c2
         Add colour command to help text Aadi Desai 2021-06-15 18:06:36 +0100
  • b7ac9a5f66 Energy Data files Aadi Desai 2021-06-15 17:50:01 +0100
  • cf85d0750f
         Merge pull request #4 from supleed2/Integration Aadi Desai 2021-06-15 13:34:49 +0100
  • 7dd064afe9 Charge cycles added (6hrs) Heading orientation fixed Mee2001 2021-06-15 13:33:58 +0100
  • f0c4567102 Add data flow for battery stats when Energy is not integrated Aadi Desai 2021-06-15 12:59:46 +0100
  • 34114e1b55 Fix UI range Change colour to string Fix distance counting Mee2001 2021-06-15 12:57:28 +0100
  • a02bb51d7e Merge branch 'main' into Integration Aadi Desai 2021-06-15 11:25:46 +0100
  • ca662990b7 Update UI for Colour Update for negative translation Change default UI values Mee2001 2021-06-15 11:25:10 +0100
  • ec55c24a7c Implement stop Fix UI Mee2001 2021-06-15 09:42:22 +0100
  • 6ca4be5e11 Add missing RSSI / Signal Strength tracking Aadi Desai 2021-06-15 08:59:11 +0100
  • 8353103e1f Add colour selection to Command<->Control reference doc Aadi Desai 2021-06-15 08:55:42 +0100
  • 531a86c6d0 Fix instruction struct Aadi Desai 2021-06-15 08:52:33 +0100
  • 1961951de0 Merge branch 'Integration' of https://github.com/supleed2/EE2Rover into Integration Mee2001 2021-06-15 03:38:49 +0100
  • 6f6320e920 Added I term to drive pid and checking for correct json Mee2001 2021-06-15 03:38:44 +0100
  • c98bafd6f7 Add ability to select Vision colour tracking Aadi Desai 2021-06-15 03:14:04 +0100
  • bbe36fb9dd Merge branch 'main' into Testad3919 Aadi Desai 2021-06-15 03:08:12 +0100
  • 72021e7208 Fix Instruction Queue and Emergency Stop Aadi Desai 2021-06-15 01:33:52 +0100
  • 5e95a8d860 Control updates Mee2001 2021-06-15 00:51:46 +0100
  • d4e14208e2 Merge branch 'Integration' of https://github.com/supleed2/EE2Rover into Integration Mee2001 2021-06-14 20:32:42 +0100
  • c6f93039a1 IMU Stuff Mee2001 2021-06-14 20:32:07 +0100
  • 4fd4e56f62 Add command.js to webserver serve code Aadi Desai 2021-06-14 20:27:49 +0100
  • cc113aa086 Pin change Mee2001 2021-06-14 18:40:58 +0100
  • 5f3d1b5366 Merge branch 'main' into Integration Aadi Desai 2021-06-14 18:38:15 +0100
  • dbe01b64ac
         Merge pull request #3 from supleed2/PIOjc4419 Aadi Desai 2021-06-14 18:37:32 +0100
  • 20f13252a7 Merge branch 'main' into PIOjc4419 Aadi Desai 2021-06-14 18:36:47 +0100
  • 2c135f118a Add external compass input Aadi Desai 2021-06-14 17:50:15 +0100
  • 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. jc4419 2021-06-14 20:37:05 +0400
  • aadb52990e IMU stuff Mee2001 2021-06-14 17:25:57 +0100
  • c3550ab4e1
         Merge pull request #2 from supleed2/Integration Aadi Desai 2021-06-14 12:18:27 +0100
  • 54d30741e0
         Merge branch 'main' into Integration Aadi Desai 2021-06-14 12:17:20 +0100
  • cea4237b75 Add waiting state to reference doc Aadi Desai 2021-06-13 23:33:49 +0100
  • 39a8d232a7 Add wait function to rover Aadi Desai 2021-06-13 21:43:43 +0100
  • b6cbfc7619 Add ability to pause rover for a defined time to reference doc Aadi Desai 2021-06-13 21:24:38 +0100
  • 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. jc4419 2021-06-13 22:42:00 +0400
  • ddea9f26ca
         Merge pull request #1 from supleed2/Testad3919 Aadi Desai 2021-06-13 18:42:15 +0100
  • 24bd7db3a8 Rover Control Program Complete Aadi Desai 2021-06-13 18:36:13 +0100
  • dc927495ec Fix type errors for battery stat reporting Aadi Desai 2021-06-13 18:26:00 +0100
  • f3ca90fb2e Add battery cycle tracking to Command<->Control reference doc Aadi Desai 2021-06-13 17:59:21 +0100
  • 0483397ae6 Add emergency stop function Aadi Desai 2021-06-13 17:26:50 +0100
  • 39603efd3c Add odometer reset flag to Drive<->Control reference doc Aadi Desai 2021-06-13 16:51:46 +0100
  • bbec96810f Set up basic rover flow, individual functions to be completed Aadi Desai 2021-06-13 00:56:49 +0100
  • 5e6254029a Add instruction.h Aadi Desai 2021-06-13 00:50:38 +0100
  • 1e87e9b0f4 Fix incorrect variable types Aadi Desai 2021-06-12 23:04:01 +0100
  • 52e14dfaa8 Update Command<->Control reference doc Aadi Desai 2021-06-12 21:00:55 +0100
  • 1d29735429 Update Command<->Control reference doc Aadi Desai 2021-06-12 15:15:37 +0100
  • 5667ef67f2 Add basic status flag for flow control Aadi Desai 2021-06-12 12:50:44 +0100
  • 88adbdc572 Correct location of credentials.h to include/ Aadi Desai 2021-06-12 12:47:12 +0100
  • 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. jc4419 2021-06-12 04:18:04 +0400
  • 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. jc4419 2021-06-11 22:45:00 +0400
  • 385eac760f Changed layout fomatting to use tables instead of 'float' property. Removed com port field so it works in my environment. jc4419 2021-06-11 17:44:12 +0400
  • 5dba48bee3 Attempt at angle PID Mee2001 2021-06-11 00:52:32 +0100
  • 778be64c3d Create Vision<->Control reference doc Aadi Desai 2021-06-10 18:00:13 +0100
  • bb33d95697 Implemented PID control for forward and backward motion Mee2001 2021-06-10 17:34:22 +0100
  • f40452c255 Integrated Command and Drive Mee2001 2021-06-10 14:40:00 +0100
  • 108f4d1495 Add nonblock flag to UART FILE* Aadi Desai 2021-06-10 00:19:35 +0100
  • eac44e1d3d Some updates tm Nikita Konovalchik 2021-06-09 20:06:39 +0100
  • 7ab9de2cc7 Tidy up main.cpp formatting Aadi Desai 2021-06-09 18:33:37 +0100
  • be103e3072
         Add files via upload NikitaK 2021-06-09 18:04:51 +0100
  • 5411a247bc Create Command<->Control reference doc Aadi Desai 2021-06-09 15:25:18 +0100
  • 65f48f99c3 Create Energy<->Control reference doc Aadi Desai 2021-06-08 20:26:59 +0100
  • c7a5a930f1 Vision "Fresh Start" from Updated Upstream Aadi Desai 2021-06-08 19:07:13 +0100
  • 4a6997e3b0 Merge branch 'main' into Testad3919 Aadi Desai 2021-06-08 18:44:28 +0100
  • f2f1dfa80f Energy stuff added IssaBqain 2021-06-08 02:10:13 +0100
  • 0798db2d3e Add expansion board mapping for connection to DE10 Lite Aadi Desai 2021-06-07 16:59:56 +0100
  • fd76a692e1 Add ability for Drive to request current heading from Control Aadi Desai 2021-06-07 16:29:04 +0100
  • 9463a14cdc Create Drive<->Control reference doc Aadi Desai 2021-06-07 14:08:58 +0100
  • 0dee19f28c Updated main to use portable Ticker Lib Aadi Desai 2021-06-05 13:11:09 +0100
  • 99c3af355b Add portable Ticker @ 2.0.0 Library Aadi Desai 2021-06-05 13:10:51 +0100
  • e07744478d SPIFFS tested, working Aadi Desai 2021-06-04 17:12:40 +0100
  • bcdd392020 Migrate to SPIFFS, untested Aadi Desai 2021-06-04 01:02:32 +0100
  • 87b16945f2 Merge code from temp.cpp into main.cpp Aadi Desai 2021-06-03 21:29:14 +0100
  • de87475e47 Add debugging compilation and monitor flags Aadi Desai 2021-06-03 21:29:00 +0100
  • 3920375c43 Update library dependencies Aadi Desai 2021-06-03 21:28:20 +0100
  • d8209c009f Add dummy credentials file Aadi Desai 2021-06-03 01:09:29 +0100
  • a120aa10fc Add Json dependency to project Aadi Desai 2021-06-02 18:53:55 +0100
  • 084959db0e Add temp file to migrate to main.cpp Aadi Desai 2021-06-02 18:50:54 +0100
  • 3dd798716b Merge branch 'main' into Testad3919 Aadi Desai 2021-06-02 18:49:11 +0100
  • 02aed60775 Add software serial library and demo Aadi Desai 2021-06-01 17:46:31 +0100
  • 20cdb8f06e Test branch copy to move to local Aadi Desai 2021-06-01 16:04:15 +0100
  • 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! jc4419 2021-05-31 23:57:23 +0400
  • 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. jc4419 2021-05-31 21:49:50 +0400
  • 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! jc4419 2021-05-29 07:54:53 +0400
  • 7478a4b0db Added a very basic test sketch to test components on breadboard before first draft of main sketch. jc4419 2021-05-29 02:04:04 +0400
  • 29d1ace16b Merge branch 'main' of https://github.com/supleed2/EE2Rover into main jc4419 2021-05-29 00:28:03 +0400
  • 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. jc4419 2021-05-29 00:27:27 +0400
  • d0619cd9cd Changed Colour recognition code anishghanekar 2021-05-28 00:40:25 +0100
  • d178e7bee0 Add UART interface IP Aadi Desai 2021-05-27 17:09:15 +0100
  • 6c31662970 UART Test program for ESP32 expansion board Aadi Desai 2021-05-22 18:06:39 +0100
  • 98933c77c9 Set PIO Serial Monitor to "Line Mode" Aadi Desai 2021-05-22 18:05:24 +0100
  • f10ea7555b Added setup instructions for future reference anishghanekar 2021-05-19 18:28:13 +0100
  • af79650f8c Completed initial camera setup and added sof file anishghanekar 2021-05-19 18:14:24 +0100
  • 3142d1e64e
         Remove blink sketch Aadi Desai 2021-05-18 12:28:50 +0100
  • dce62bdd77 Add Vision initial files from vision resource repo Aadi Desai 2021-05-18 12:20:27 +0100
  • e4b6e0dc0d Control Module Initial Commit Aadi Desai 2021-05-18 12:18:36 +0100
  • 8a7a37a191 Initial commit Aadi Desai 2021-05-18 11:41:35 +0100