Colour Estimation as part of Feature service! (not called for receptionist)#252

Closed

MBTMBTMBT wants to merge 323 commits intoLASR-at-Home:mainfrom MBTMBTMBT:main

+361-120

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 22, 2024

added a break in the loop
Benteng Ma
committed

Commits on Apr 17, 2024

I don't really understand why this is in my branch, please ignore this commit when merge.
Benteng Ma
committed
Replace string return with json string return.
Benteng Ma
committed

Commits on Apr 18, 2024

Merge pull request #5 from MBTMBTMBT/repository-clean-mar11
MBTMBTMBT
authored
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
pcl functioned remoeved because appeared repetitively.
Benteng Ma
committed
replaced the model and predictor initialization, put "__main__"
Benteng Ma
committed

Commits on Apr 19, 2024

Merged model classes file into predictor's file
Benteng Ma
committed
Merged helper functions into perdictor's file.
Benteng Ma
committed
Deleted feature extractor module
Benteng Ma
committed
Cleaned load model method, restart to use downloaded model.
Benteng Ma
committed
Removed unused files and cleaned the files.
Benteng Ma
committed
Cleaned usless comments and refilled package description.
Benteng Ma
committed
Removed useless colour messages.
Benteng Ma
committed
Brought aruco service package back.
Benteng Ma
committed
Removed useless keys from state machine.
Benteng Ma
committed
changed log messages.
Benteng Ma
committed

Commits on Apr 23, 2024

Fixed a stupid naming issue of feature extractor.
Benteng Ma
committed
Update common/helpers/numpy2message/package.xml

MBTMBTMBT
and
jws-1
authored
Update common/helpers/numpy2message/package.xml

MBTMBTMBT
and
jws-1
authored
Update common/vision/lasr_vision_feature_extraction/package.xml

MBTMBTMBT
and
jws-1
authored
Canceled the default neck coordinates and leave it to be a failure.
Benteng Ma
committed
Merge branch 'main' of https://github.com/MBTMBTMBT/LASR_ben
Benteng Ma
committed
Canceled the loop of getting mixed images, and renamed the keys.
Benteng Ma
committed
renamed the function.
Benteng Ma
committed
Update skills/src/lasr_skills/vision/get_image.py

MBTMBTMBT
and
jws-1
authored
Update skills/src/lasr_skills/vision/get_image.py

MBTMBTMBT
and
jws-1
authored
Update skills/src/lasr_skills/vision/image_msg_to_cv2.py

MBTMBTMBT
and
jws-1
authored
Update the new names in init.
Benteng Ma
committed
removed a print and rename the imports.
Benteng Ma
committed

Commits on Apr 24, 2024

Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed

Commits on Apr 29, 2024

Documentation - adding in how to run the receptionist task
zoe013evans
committed

Commits on May 14, 2024

robustifying receptionist
tiago
committed

Commits on May 17, 2024

Added cloth detection and classification in.
Benteng Ma
committed
Changed 'usb_cam' to 'camera'
Benteng Ma
committed

Commits on May 28, 2024

adding fixes to state machine
tiago
committed
fixing conflict
tiago
committed
Merge remote-tracking branch 'zoe-fork/main' into main
tiago
committed

Commits on May 30, 2024

Make receptionist more robust:
tiago
committed

Commits on May 31, 2024

Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed

Commits on Jun 4, 2024

too many values to unpack
Benteng Ma
committed
there is these fucking stupit fucking threshold mismatch that I'm so fucking tired and haven't fuking fixed.
Benteng Ma
committed

Commits on Jun 5, 2024

updated predictor working
Benteng Ma
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
Reformated files
Benteng Ma
committed

Commits on Jun 6, 2024

Reformated with black :)
Benteng Ma
committed

Commits on Jun 10, 2024

Commits on Jun 11, 2024

Correct typo and remove debug logs
Benteng Ma
committed
Merge remote-tracking branch 'origin/main'
Benteng Ma
committed
removed redundant comment :D
Benteng Ma
committed
call userdata people with "userdata.people" not ["people"]?
Benteng Ma
committed

Commits on Jun 12, 2024

Added people to userdata at an early stage to avoid key error.
Benteng Ma
committed

Commits on Jun 17, 2024

Merge branch 'LASR-at-Home:main' into main
MBTMBTMBT
authored
Add ClothPredictor class, simplified reading the thresholds.
Benteng Ma
committed
Changed attribute definitions and adjust thresholds.
Benteng Ma
committed
Add environment-based conditions
Benteng Ma
committed
Changed attribute description in image classification
Benteng Ma
committed
Changed cloth predictor initialization
Benteng Ma
committed
Update attribute list for cloth
Benteng Ma
committed
Reformatted the files.
Benteng Ma
committed
Removed debug print.
Benteng Ma
committed
Reformatted the files.
Benteng Ma
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
Corrected the threshold error :)
Benteng Ma
committed
Reformatted the file.
Benteng Ma
committed

Commits on Jun 18, 2024

refactor: undo some formatting, to reduce the diff.
jws-1
committed

Commits on Jun 21, 2024

Apply suggestions from code review
jws-1
authored
Receptionist recognise and look at (LASR-at-Home#220 )

authored and
Benteng Ma
committed
Receptinist 21/06

authored and
Benteng Ma
committed
Add required keypoint detection (LASR-at-Home#226 )

authored and
Benteng Ma
committed
Add support for masked cropping (LASR-at-Home#224 )

m-barker
authored and
Benteng Ma
committed
Receptionist recognise and look at (LASR-at-Home#220 )

authored and
Benteng Ma
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
added conditional topic and crop method back for testing.
Benteng Ma
committed
added conditional Say class using print only.
Benteng Ma
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed

Commits on Jun 25, 2024

Returning confidence of the prediction.
Benteng Ma
committed
Reformatted the code
Benteng Ma
committed
Stopped using segmentation.
Benteng Ma
committed
Returned cloth category strings.
Benteng Ma
committed
added look at person back.
Benteng Ma
committed

Commits on Jun 27, 2024

removed wrong -0,5
Benteng Ma
committed
Merge https://github.com/haiwei-luo/Base
Benteng Ma
committed
Added conditions for testing on roslocal.
Benteng Ma
committed
Added validate keypoints into the state.
Benteng Ma
committed
Updated missing body part detection.
Benteng Ma
committed
Updated detect_keypoints in bodipix.
Benteng Ma
committed
Updated camera movement suggestions.
Benteng Ma
committed

Commits on Jun 30, 2024

Commits on Jul 2, 2024

Commits on Jul 3, 2024

feat(WIP): use new sweep for seating guest.
jws-1
committed
feat: take target_frame as input.
jws-1
committed
fix: do tf.
jws-1
committed
fix: seating.
jws-1
committed
fix: imports.
jws-1
committed
Made adjust camera an idividual state machine that runs compleately independent.
Benteng Ma
committed
Merge remote-tracking branch 'upstream/receptionist-polishing'
Benteng Ma
committed
Added adjust camera into the state machine.
Benteng Ma
committed
fixed a small bug that parameters of GetCroppedImage is now different.
Benteng Ma
committed
wip: load of shit
jws-1
committed
fixed some little bugs
Benteng Ma
committed
Merge remote-tracking branch 'upstream/receptionist-polishing'
Benteng Ma
committed
Let's see if this change of CDRequest works.
Benteng Ma
committed
haha find this bug of Matt's
Benteng Ma
committed
Do not use mask for feature detection!
Benteng Ma
committed
Preload the bodipix model so that hopefully now it's quicker.
Benteng Ma
committed
quick fix of load model
Benteng Ma
committed
Handle known guests
haiwei-luo
committed
Refactor: FindAndLookAt
haiwei-luo
committed
I MEANT KNOWN HOST NOT NAMED GUEST MY BRAIN IS FRIED
haiwei-luo
committed
Fix bug
haiwei-luo
committed

Commits on Jul 4, 2024

Commits on Jul 5, 2024

Commits on Jul 6, 2024

refactor: black
jws-1
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
Merge branch 'main' of https://github.com/MBTMBTMBT/LASR_ben
Benteng Ma
committed

Commits on Jul 7, 2024

Have a quick fix of hat-hair issue, and a quick remove of the dress (but doesn't change any code structure).
Benteng Ma
committed
a quick fix of hat-hair penalty.
Benteng Ma
committed
modified adjust_camera a little such as it generally is lowered down a bit.
Benteng Ma
committed
I feel that the 'closest' and 'futherest' of cropped_detection is kind of revered, so I corrected it.
Benteng Ma
committed
probably the most common usage of GetCroppedImage is 'closest' so make it the default.
Benteng Ma
committed
modified all the 'reverse' parts.
Benteng Ma
committed

Commits on Jul 8, 2024

corrected a small mistake of removing the 'dress' category.
Benteng Ma
committed

Commits on Jul 9, 2024

Changed matt's reverse list back.
Benteng Ma
committed
Added new colour estimation of cloth.
Benteng Ma
committed
Merge remote-tracking branch 'upstream/main'
Benteng Ma
committed
up to date to the main.
Benteng Ma
committed
reformatted some files.
Benteng Ma
committed
correct the launch file, didn't find any issues that cause adjust camera not truncated?
Benteng Ma
committed
Added some test information outputs, seems everything is fine. Shouldn't be this slow though.
Benteng Ma
committed