Integration v2 (#1)

Integration v2 #1

Merged

Hongzheng Li opened 2 years ago

merge application into main branch

Copy

Commits were merged into target branch

Add battery asset

3 years ago

c0f509d9

Adding recharge station and corresponding factory

3 years ago

df26c352

POI base code

3 years ago

fb79dcc2
Merge pull request #1 from umn-csci-3081-s24/double-delivery-sam
```
POI base code
```
3 years ago

553be209
Base drone decorator

3 years ago

21a2c59b
Merge pull request #2 from umn-csci-3081-s24/double-delivery-dev
```
Double delivery dev
```
3 years ago

64f0f95f
Updated decorator attributes

2 years ago

b177d32a
Merge pull request #3 from umn-csci-3081-s24/double-delivery-daniel
```
Double delivery daniel
```
2 years ago

f8e40cd8
Messaging temp fix

2 years ago

8bc0a6c2

Add drone base decorator

2 years ago

46ded353

first iteration of battery decorator

2 years ago

9e68be41

intergrate battery decorator to the simulation

2 years ago

a6d904e6

Drone.cc automatic multiple delivery

2 years ago

2dabeeff

Front end base code

2 years ago

500565cb
Merge pull request #4 from umn-csci-3081-s24/double-delivery-sam
```
Front end base code
- Still needs button prompting / functionality
```
2 years ago

49dd1913
Base button functionality

2 years ago

a33a48ee
Merge pull request #5 from umn-csci-3081-s24/double-delivery-sam
```
Base button functionality
```
2 years ago

53ebc349
Prototype: No prompting

2 years ago

e3ae71ec

Functioning prototype

2 years ago

429f0330

Minor pop-up fix

2 years ago

ae367300

Storing recharge stations

2 years ago

497becef

Add getModel function for recharge station decorator

2 years ago

83a67bfc

Add getModel to retrive position of recharge stations

2 years ago

1e6e594e

Implement getModel()

2 years ago

f04d9836

Implement findNearestRecharge station and refine logic of charging

2 years ago

42be4b42

Add movement to recharge stations

2 years ago

eb5307ec

fixed: not sending msg to front end

2 years ago

9c24154d
Merge pull request #6 from umn-csci-3081-s24/double-delivery-sam
```
Final Implementation (NOT CLEAN)
```
2 years ago

4dd2e29d
fixed: not updating drones in the map

2 years ago

22d66a6b

Documentation and clean-up

2 years ago

eff2ee07
Merge pull request #7 from umn-csci-3081-s24/double-delivery-sam
```
Documentation and clean-up
```
2 years ago

3f0edceb
Change lookAhead() to checkIfNeedRecharge()

2 years ago

648467ee

Change checkIfNeedRecharge function

2 years ago

b2065428

Update lookAheadForRechargeStation()

2 years ago

1ab26c3f

Created totalDistance function in PathStrategy

2 years ago

af99d27d

Finish lookAhead function

2 years ago

621f4a6f

Adding functions to return total time for delivery, starting to refactor update in decorator

2 years ago

44c2f824

lookAhead mostly done

2 years ago

924d4b6b

Fix totalPathDistance in PathStrategy

2 years ago

77586f92

Removed unneccessary functions

2 years ago

b425af4b

Working lookAhead function

2 years ago

0ea7e9ef

Create message for when drone reaches recharge station

2 years ago

8fdb350f

Merge branch 'battery-dev' into lookAhead

2 years ago

c6aa511e
Merge pull request #9 from umn-csci-3081-s24/lookAhead
```
Complete lookAhead function
```
2 years ago

9de639c9
Fix issues after merging

2 years ago

b1882145

Fix cppLint errors

2 years ago

582e1dd0

Make comments a bit more clear

2 years ago

9d3d81b1

Cleaned up getter functions in Drone

2 years ago

a885f35a

Make total path always include distance to final destination

2 years ago

6eecc2b2

Adding recharge drone methods

2 years ago

a6f72bb8

Add recharge_drone asset

2 years ago

42fb79c7

Adding recharge drones to scene

2 years ago

e8a31a2e

Allow drone to go to recharge station after package if neccessary

2 years ago

010f5dff

Rename totalPathDistance to currentPathDistance

2 years ago

8562beb1

Make drone only check lookAhead when changing paths

2 years ago

b0165488

Adding recharge drone functionality

2 years ago

0da4f853

Make the drone not stop to recharge after picking up a package

2 years ago

7d90186b

Fix: all recharge drones head to one dead drone

2 years ago

8acbef84

Merge branch 'recharge-drone-dev' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into recharge-drone-dev

2 years ago

5abe40f1

Fixed drone going to station after package

2 years ago

cde96ecf

Added documentation for new/existing classes, modified DroneDecorator functionality

2 years ago

86d36b68

Minor linting fixes and documentation additions

2 years ago

727d8e15

Add documentation

2 years ago

0df16beb

Add README.md

2 years ago

5c04a810

Implement station malfunctioning

2 years ago

35cdfb21
Merge pull request #10 from umn-csci-3081-s24/Malfunctioning-Stations-Dev
```
Implement station malfunctioning
```
2 years ago

90a5d6d1
Fix cppLint erros

2 years ago

4dcf1e26

Fixes to prevent segfaults, minor observer messaging update

2 years ago

17c1e0b7

Updated writeup

2 years ago

b483a312

Add documentation

2 years ago

2d115514

Finish DroneBatteryDecorator.h documentation

2 years ago

fab51f85

Merge branch 'extension-1-documentation' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into extension-1-documentation

2 years ago

b1b8eea5

Added DoubleDelivery UML

2 years ago

636a60c2

Merge branch 'Integration-v2' into extension-1-documentation

2 years ago

06a37399
Merge pull request #12 from umn-csci-3081-s24/extension-1-documentation
```
Integration of both features
```
2 years ago

cd560dbd
Fix error caused by integration

2 years ago

91689ffc

add drone

2 years ago

2413c039

Fix integration

2 years ago

216f9835

Fix make lint errors

2 years ago

1f3d6840

Update README.md

2 years ago

f6c0c7eb

Update README.md

2 years ago

eb72cfc9

Update README.md

2 years ago

90609b8a

Update README.md

2 years ago

2d2fc2de

Add documentation

2 years ago

aeff1aa4

Updated writeup to be almost complete

2 years ago

4b8e0948

Update UML

2 years ago

2a43403b

Minor linting and writeup formatting fixes

2 years ago

1fed34d7

Update README.md

2 years ago

06c97d11

Merge branch 'Integration-v2' of github.umn.edu:umn-csci-3081-s24/team-010-38-finalproject into Integration-v2

2 years ago

17f8ee72

Changed Double Delivery UML

2 years ago

0b64f4ca

Merge branch 'Integration-v2' of https://github.umn.edu/umn-csci-3081-s24/team-010-38-finalproject into Integration-v2

2 years ago

eaa046ed

Updated writeup to include Docker Hub link

2 years ago

3cc7f7d1

Added instructions for Docker in writeup

2 years ago

bc673f0f

Update README.md

2 years ago

09a46e7e

Update README.md

2 years ago

d3dad881

ci: add .onedev-buildspec.yml

2 years ago

27110e51
Hongzheng Li merged 2 years ago (merge commit: caebb76a )
Login to comment

Submitter	Hongzheng Li
Target	main
Source	Integration-v2

Jobs

Merge Strategy

Create Merge Commit

Watchers (1)

Reference

PR drone_simulation#1

Please wait...

Connection lost or session expired, reload to recover

Page is in error, reload to recover