Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development into main. #22

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
67bfdef
Add initial wheelchair assistant use case.
EoWal Nov 28, 2023
6335162
Adopt modell for wheelchair assistant use case
stubb Nov 28, 2023
68ad733
Add wheelchair assistant state
stubb Nov 28, 2023
2a39a20
Add wheelchair scenario documentation.
EoWal Nov 28, 2023
c9f6cf8
Add wheelchairdistancestate
stubb Nov 29, 2023
065d1a0
Update in-vehicle-stack/scenarios/wheelchair_assistant_use_case/digit…
stubb Nov 29, 2023
3054293
Merge pull request #1 from Eclipse-SDV-Hackathon-Accenture/enhance_di…
Shreyanair21 Nov 29, 2023
a883238
Add add wheelchair provider.
EoWal Nov 28, 2023
9a5928e
Update digital dwin model.
EoWal Nov 29, 2023
e7bc7af
Update README.md
DennisHa95 Nov 29, 2023
c1221f6
implemented Carkey Lock/Unlock provider
Shreyanair21 Nov 28, 2023
536c006
Added car ignition on and car ignition off provider.
Nov 29, 2023
c804e16
providers for CAR lock and Unlock added
Shreyanair21 Nov 29, 2023
e4c6a9e
added providers for wheelchair distance decreasing
Shreyanair21 Nov 29, 2023
69b6ba0
added the provider impl file for Distance decreasing
Shreyanair21 Nov 29, 2023
7cb8e84
renamed files
Shreyanair21 Nov 29, 2023
6811ff9
final changes
Shreyanair21 Nov 29, 2023
87b6ba5
Added wheelchair_distance_increasing provider.
DennisHa95 Nov 29, 2023
776efff
Adjusted connection providers to digital twins, first check code prov…
DennisHa95 Nov 29, 2023
70b4f67
application wheelchair distance added
dedalus1904 Nov 29, 2023
3313df9
rename application folder and auxiliaries
dedalus1904 Nov 29, 2023
52761de
the remains of the trailer removed
dedalus1904 Nov 29, 2023
986dd9c
Fix some compiler errors
stubb Nov 29, 2023
ffda4f9
Update wheel char scenario documentation.
Shreyanair21 Nov 29, 2023
446cecf
Update README.md
DennisHa95 Nov 29, 2023
8becf92
Fix errors of integrating providers with app
stubb Nov 29, 2023
e651d3d
Merge pull request #3 from Eclipse-SDV-Hackathon-Accenture/feature/ap…
stubb Nov 30, 2023
9e022b8
template for the wheelchair_assistant_application added
dedalus1904 Nov 29, 2023
8782e3f
wheelchair assistant logic added
dedalus1904 Nov 29, 2023
f4637ca
missed changes from the previous
dedalus1904 Nov 29, 2023
19e6021
Update README.md
DennisHa95 Nov 30, 2023
e2dc660
Create Wheelchair assistant application Readme document
DennisHa95 Nov 30, 2023
2df16ca
Update README.md: deleted Additional Information
DennisHa95 Nov 30, 2023
e349525
Integrate assistant
stubb Nov 30, 2023
9bd5bb8
Update README.md
DennisHa95 Nov 30, 2023
afc02ca
Add new python UI app
dedalus1904 Nov 30, 2023
c8d4aa0
Scripts.
EoWal Nov 29, 2023
9a04b7a
Add scripts and fix minor building issues.
EoWal Nov 29, 2023
468339f
Cleanup.
EoWal Nov 30, 2023
f65d28f
Merge branch 'feat/integration' into development
EoWal Nov 30, 2023
82c2e82
Merge pull request #5 from Eclipse-SDV-Hackathon-Accenture/feature/py…
dedalus1904 Nov 30, 2023
7a20352
Add images to readme.
EoWal Nov 30, 2023
2401ffa
Merge pull request #2 from Eclipse-SDV-Hackathon-Accenture/docs/defin…
ecw74 Nov 30, 2023
ba8c556
Fix building assistant
stubb Nov 30, 2023
426f944
Merge branch 'development' into feature/wheelchair_assistant_application
stubb Nov 30, 2023
2ea6b67
Merge pull request #7 from Eclipse-SDV-Hackathon-Accenture/feature/wh…
stubb Nov 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 20 additions & 193 deletions README.md

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions docs/Wheelchair assistant application
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#### The Wheelchair Assistant Applications
This application takes care of the software implementation corresponding to the person arriving at the car, getting in ,driving, getting out and leaving the car.
- When a person approaches the car, the car lowers itself, opens the front and the back doors. The seat and the steering wheel get adjusted in order for the person to get in.
- A mechanical setting (ramp or a crane) can be used for getting the wheelchair inside the car.
- Once the person gets in, the seat and the steering gets adjusted back for driving, while closing the backdoor.
- On reaching destination, the car is lowered. As the backdoor opens,the wheelchair is retrieved.
- The seats and steering get adjusted for the person to get out of the car. Once they"re out, everything gets readjusted to normal position.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/wheelchair_assistant_use_case/orchester.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions eclipse-bluechi/.devcontainer/devcontainer.json

This file was deleted.

232 changes: 0 additions & 232 deletions eclipse-bluechi/README.md

This file was deleted.

79 changes: 46 additions & 33 deletions in-vehicle-stack/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,33 +1,46 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
# SPDX-License-Identifier: MIT

[workspace]

members = [
# in-vehicle-stack interfaces
"proto_build",

# smart_trailer_use_case
"scenarios/smart_trailer_use_case/applications/smart_trailer_application",
"scenarios/smart_trailer_use_case/digital_twin_providers/common",
"scenarios/smart_trailer_use_case/digital_twin_providers/trailer_connected_provider",
"scenarios/smart_trailer_use_case/digital_twin_providers/trailer_properties_provider",
"scenarios/smart_trailer_use_case/proto_build",
]

[workspace.dependencies]
env_logger= "0.10.0"
log = "0.4.20"
paho-mqtt = "0.12"
parking_lot = "0.12.1"
prost = "0.12.1"
serde = "1.0.190"
serde_derive = "1.0.163"
serde_json = "^1.0"
strum = "0.25"
strum_macros = "0.25.1"
tokio = "1.29.1"
tonic = "0.10.2"
tonic-build = "0.10.2"
uuid = "1.2.2"
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
# SPDX-License-Identifier: MIT

[workspace]

members = [
# in-vehicle-stack interfaces
"proto_build",

# smart_trailer_use_case
"scenarios/smart_trailer_use_case/applications/smart_trailer_application",
"scenarios/smart_trailer_use_case/digital_twin_providers/common",
"scenarios/smart_trailer_use_case/digital_twin_providers/trailer_connected_provider",
"scenarios/smart_trailer_use_case/digital_twin_providers/trailer_properties_provider",
"scenarios/smart_trailer_use_case/proto_build",

# wheelchair_assistant_use_case
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/common",
"scenarios/wheelchair_assistant_use_case/proto_build",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/car_off_provider",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/car_on_provider",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/carkey_lock_provider",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/carkey_unlock_provider",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/wheelchair_distance_decreasing_provider",
"scenarios/wheelchair_assistant_use_case/digital_twin_providers/wheelchair_distance_increasing_provider",
"scenarios/wheelchair_assistant_use_case/applications/wheelchair_distance_application",
"scenarios/wheelchair_assistant_use_case/applications/wheelchair_assistant_application",

]

[workspace.dependencies]
env_logger= "0.10.0"
log = "0.4.20"
paho-mqtt = "0.12"
parking_lot = "0.12.1"
prost = "0.12.1"
serde = "1.0.190"
serde_derive = "1.0.163"
serde_json = "^1.0"
strum = "0.25"
strum_macros = "0.25.1"
tokio = "1.29.1"
tonic = "0.10.2"
tonic-build = "0.10.2"
uuid = "1.2.2"
25 changes: 25 additions & 0 deletions in-vehicle-stack/build_wheelchair_assistant_container.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

# Deklariere das Array
PROVIDER_CONTAINERS=(
"car_off_provider"
"car_on_provider"
"carkey_lock_provider"
"carkey_unlock_provider"
"wheelchair_distance_decreasing_provider"
"wheelchair_distance_increasing_provider"
)

APPLICATION_CONTAINERS=(
"wheelchair_distance_application"
)

# Iterate over provider containers to build
for CONTAINER in "${PROVIDER_CONTAINERS[@]}"; do
podman build -t sdvblueprint.azurecr.io/sdvblueprint/in-vehicle-stack/${CONTAINER}:0.1.0 -f "scenarios/wheelchair_assistant_use_case/digital_twin_providers/${CONTAINER}/Dockerfile" .
done

# Iterate over provider containers to build
for CONTAINER in "${APPLICATION_CONTAINERS[@]}"; do
podman build -t sdvblueprint.azurecr.io/sdvblueprint/in-vehicle-stack/${CONTAINER}:0.1.0 -f "scenarios/wheelchair_assistant_use_case/applications/${CONTAINER}/Dockerfile" .
done

This file was deleted.

Loading