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.

Sign up for GitHub

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

Jump to bottom

Merge from original repo #5

Merged
merged 86 commits into from
Apr 21, 2021
Merged

Merge from original repo #5

merged 86 commits into from
Apr 21, 2021

Conversation

micolspitale93
Copy link
Owner

Update and merge forked repo

micolspitale93 and others added 30 commits October 23, 2020 18:59
@micolspitale93
decision multiple-choice WIP.
ad512ff
@micolspitale93
merged web and face services.
b7d999b
@micolspitale93
fix face bugs. integration web+face done.
c197ba7
@micolspitale93
update multiple-choice
dd9c884
@micolspitale93
multiple_choice decision manager works.
919aff2
@micolspitale93
added new pattern script.
e94a9ed
@micolspitale93
linguistic activities almost done
036049c
@micolspitale93
tested full, choices, and composed activity. Alt missing.
788e698
@micolspitale93
added display image pattern.
91ead9c
@micolspitale93
update multiple_choice
0787113
@apaikan
update pattern.
1142064
@apaikan
update server face for QT.
e2e15ca
@apaikan
added bash script for pi
807f8d3
@micolspitale93
fix lag in sequencial pattern.
8b1732c
@micolspitale93
added interface for requests.
cdaa009
@micolspitale93
added websocket interface for client. added automatic pattern launcher.
7debb62
@micolspitale93
server - client communication works. WIP commands and automatic patte…
5404ae2 
…rn launch.
@micolspitale93
Merge pull request #1 from interaction-lab/feature/web-service
78d74fc 
Feature/web service
@RMichaelSwan
basic unit test working with rostest.
dbf402b
@micolspitale93
tested commands for activities with robot.
93f689a
@micolspitale93
Merge pull request #34 from micolspitale93/feature/web-service
4616ebc 
Merge pull request #1 from interaction-lab/feature/web-service
@RMichaelSwan
Unit test example for W2L STT.
a28443b
@RMichaelSwan
minor syntax fix.
d8eeff2
@micolspitale93
enable testing from command line without configurator.
738b4cf
@RMichaelSwan
Publish to proper w2l topic, improve some logging.
f2f87c3
@micolspitale93
added REPLAY command.
0f6b013
@micolspitale93
updated gitignore.
87a2994
@micolspitale93
adding unittest and rostest for harmoni_bot (aws_lex).
dca2d31
@micolspitale93
Merge branch 'feature/testing-framework' of https://github.com/intera…
c4a08c7 
…ction-lab/HARMONI into feature/testing-framework
@micolspitale93
adding store data.
84c1ca7
chrismbirmingham and others added 29 commits February 18, 2021 12:40
@chrismbirmingham
Streamline testing
168a97c
@chrismbirmingham
Bugfix param loading
63f5404
@micolspitale93
adding test for harmoni_gesture.
6284ef2
@chrismbirmingham
Merge branch 'feature/testing-framework' of https://github.com/intera…
879c26b 
…ction-lab/HARMONI into feature/testing-framework
@chrismbirmingham
Finish speaker rostests
68758cb
@chrismbirmingham
Add testing to camera
a66a193
@chrismbirmingham
start-stop test debuging
0e4e9b7
@chrismbirmingham
Finish up speaker test
c812683
@RMichaelSwan
microphone stop/pause fix. May affect other services which rely on pr…
59ad148 
…eemption.
@chrismbirmingham
Merge branch 'feature/testing-framework' of https://github.com/intera…
ad50516 
…ction-lab/HARMONI into feature/testing-framework
@chrismbirmingham
refactor stt and setup w2l testing
92908d2
@micolspitale93
add testing for harmoni_face. only for mouth, not eyes.
6fc0633
@micolspitale93
commenting code for documentation.
ad705e0
@RMichaelSwan
Python folder refactor. Scripts are nodes with no setup.py needed and…
e57b758 
… anything that imports is a module in its src folder.
@RMichaelSwan
absolute path fixing using substitution args.
45c397b
@RMichaelSwan
fix common lib test.
bd7d9d9
@RMichaelSwan
re-add setup script templates.
4c77660
@micolspitale93
adding testing for web
c052227
@chrismbirmingham
Fix sequential pattern launch
1f69ead
@chrismbirmingham
Refactor sequential pattern
0819f39
@chrismbirmingham
Create simple test for pattern player
7f01044
@chrismbirmingham
Remove some logging from w2l
36b94dc
@chrismbirmingham
Update tts launch and main
43a8061
@chrismbirmingham
small fix for tests
e2ca332
@chrismbirmingham
Merge branch 'feature/testing-framework' of https://github.com/intera…
9c247d4 
…ction-lab/HARMONI into feature/testing-framework
@chrismbirmingham
Update threading
bc4e3c5
@chrismbirmingham
added face detector tests - not passing
0f4a207
@micolspitale93
adding testing for gesture. passing rostest.
b432fb9
@chrismbirmingham
Merge branch 'feature/testing-framework' into develop
1802012
@micolspitale93 micolspitale93 merged commit 37896a9 into micolspitale93:develop Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@micolspitale93 @apaikan @RMichaelSwan @chrismbirmingham