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

Roboto #10

Closed
wants to merge 89 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
e52b9d2
added spi and raspicam... not done yet
smigad Sep 16, 2017
a8ca4bb
fix spi
smigad Sep 18, 2017
5d6e99d
clean up
smigad Sep 18, 2017
b6aadff
minor mod
smigad Sep 18, 2017
0afb984
add gpio sig in spi
smigad Sep 20, 2017
2ee5d55
gpio int for spi
smigad Sep 20, 2017
172b464
add face landmark
smigad Nov 7, 2017
b109914
Merge branch 'master' of https://github.com/Dagiopia/OpenCogER
smigad Nov 7, 2017
36c75de
bla bla
smigad Nov 7, 2017
ad6f2c2
flm detect done
smigad Nov 8, 2017
447b5f8
lil mod
smigad Nov 8, 2017
3bd385d
eyes closed/open detect
smigad Nov 9, 2017
3e7b247
nod
smigad Feb 21, 2018
a9a0639
some
smigad Feb 21, 2018
781a3e6
head
smigad Feb 21, 2018
32383ef
mod
smigad Mar 2, 2018
5840e02
lil mod
smigad Mar 2, 2018
1d5b6ae
refac
smigad Mar 7, 2018
8117c28
rm old
smigad Mar 8, 2018
49e65ab
begin facial expression
smigad Mar 17, 2018
eb774ea
hand det & finger count
smigad Mar 27, 2018
9ab344f
hand haar model
smigad Mar 27, 2018
3331879
mods
smigad Mar 27, 2018
850b056
lil mod
smigad Apr 2, 2018
e61fb0a
saliency wrapper
smigad Apr 2, 2018
77d164a
lil mod
smigad Apr 3, 2018
a61fdb1
some debug info
smigad Apr 3, 2018
f81bbb6
fix on pi
smigad Apr 4, 2018
393aa00
raspi
smigad Apr 19, 2018
4450e0d
raspi src
smigad Apr 19, 2018
4d02890
func times
smigad Apr 19, 2018
271d61b
test
smigad Apr 19, 2018
443e49c
Merge pull request #1 from Dagiopia/master
smigad Apr 19, 2018
add5e8c
mod
smigad Apr 23, 2018
701027e
merg
smigad Apr 23, 2018
d2e3076
all
smigad Apr 23, 2018
9064b39
dbg info
smigad Apr 23, 2018
c75eec1
Merge pull request #2 from Dagiopia/master
smigad Apr 23, 2018
755dba2
update readme
smigad Apr 24, 2018
61ecf3f
readme
smigad Apr 24, 2018
d7c5913
Merge pull request #4 from Dagiopia/master
smigad Apr 24, 2018
decc66a
new model
smigad Apr 24, 2018
d26112f
Merge branch 'master' of https://github.com/opencog/OpenCogER
smigad Apr 24, 2018
4fb39d2
landmark model numbers were wrong
smigad Apr 25, 2018
f2c94d1
begin rpc
smigad May 1, 2018
d287909
lil
smigad May 1, 2018
16d5984
git ignore
smigad May 1, 2018
531d26b
sal on rpc
smigad May 2, 2018
079d649
some mod
smigad May 3, 2018
aac7b6e
mod
smigad May 4, 2018
62336c8
includes
smigad May 4, 2018
04b8940
rpc work
smigad May 4, 2018
e18c96f
rpc example... nothing is tested
smigad May 5, 2018
2d1bab4
rpc
smigad May 7, 2018
b0afebe
rm unwanted
smigad May 7, 2018
83430d5
fix
smigad May 7, 2018
d24dda7
Merge pull request #5 from Dagiopia/master
smigad May 7, 2018
00efce4
Merge branch 'master' of https://github.com/opencog/OpenCogER
smigad May 16, 2018
cc75a54
scm wrapper
smigad May 16, 2018
f313304
fix
smigad May 16, 2018
c14be2c
scm script
smigad May 16, 2018
daf2c8d
fix
smigad May 16, 2018
2bb5077
add ghost integration from https://github.com/Eskender-B/dr-roboto.git
smigad May 20, 2018
58c615f
update readme
smigad May 20, 2018
1de0e34
Merge pull request #6 from Dagiopia/master
smigad May 20, 2018
354a36a
General README cleanup
linas May 20, 2018
c19da85
some wrapping
smigad May 24, 2018
946d6e4
the 26 facial landmark to be used
Geta-meko May 25, 2018
622b623
26 markup flms
Geta-meko May 25, 2018
c1f2cbd
Merge pull request #7 from Geta-meko/master
smigad May 25, 2018
f37f8e0
some mods
smigad May 25, 2018
128d6fa
begin stt
smigad May 28, 2018
df42d0e
Merge branch 'master' of https://github.com/opencog/TinyCog
smigad May 28, 2018
df16ea7
stt
smigad May 28, 2018
a96b793
work on stt and some mods on dr roboto
smigad May 29, 2018
c179feb
fix error
smigad May 29, 2018
121751f
Merge pull request #8 from Dagiopia/master
smigad May 29, 2018
dfc22ac
Fix cmake var ON_RPI_3
Eskender-B May 29, 2018
452d95a
Organize code structure
Eskender-B May 29, 2018
0abe968
minor and readme
smigad May 29, 2018
f198214
facial expression
Geta-meko Jun 1, 2018
a823361
Fix cmake file and stt
Eskender-B Jun 5, 2018
4385b86
Make basic demo; Need to fix
Eskender-B Jun 6, 2018
03a015e
Merge branch 'master' into mine
Geta-meko Jun 7, 2018
be8c43f
Merge pull request #9 from Geta-meko/mine
smigad Jun 7, 2018
728bc97
Make a working demo; still need fixing
Eskender-B Jun 11, 2018
10c5a30
Merge branch 'master' of https://github.com/opencog/TinyCog
Eskender-B Jun 11, 2018
9cb6429
Demo face smile detection and chat
Eskender-B Jun 18, 2018
f0ed444
smile added
Geta-meko Jun 28, 2018
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
Prev Previous commit
Next Next commit
Fix cmake file and stt
  • Loading branch information
Eskender-B committed Jun 5, 2018
commit a823361de04856d727675eedd300f135abc48d1e
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ endif(${WIRINGPI_FOUND})


######SCM Binding
configure_file(${CMAKE_SOURCE_DIR}/dr-roboto/dr-roboto.cpp.in
${CMAKE_SOURCE_DIR}/dr-roboto/dr-roboto.cpp @ONLY)
if(raspicam_FOUND)
set(ON_RPI_3 "YES")
set(DR_ROBOTO_LIBS sensor_vision ${raspicam_CV_LIBS}
Expand All @@ -220,5 +218,8 @@ else(raspicam_FOUND)
${EXTRA_LIBS} ${dlib_LIBRARIES} act_audio)
endif(raspicam_FOUND)

configure_file(${CMAKE_SOURCE_DIR}/dr-roboto/dr-roboto.cpp.in
${CMAKE_SOURCE_DIR}/dr-roboto/dr-roboto.cpp @ONLY)

add_library(dr_roboto SHARED dr-roboto/dr-roboto.cpp)
target_link_libraries(dr_roboto ${DR_ROBOTO_LIBS})
10 changes: 5 additions & 5 deletions behavior/test.top
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ u: (~HI) [hi] [hello] [hey] [how are you] there


### Gambits
#goal: (curiosity=0.7)
t: what is your name?
##goal: (curiosity=0.7)
# t: what is your name?

### Match variable (start with _)
### User variables (start with $)
Expand Down Expand Up @@ -138,10 +138,10 @@ u: (looping detector function) Random looping number is ^func-looping-result

### Ordered Goal
# Goal of next rules decrease in a geometric sequence with a factor 0.5
ordered-goal: (curiosity=0.8)
## ordered-goal: (curiosity=0.8)

u: (what be _*) please define '_0
# u: (what be _*) please define '_0

u: (why be _*) why not
# u: (why be _*) why not

# and so on.. as there are more rules the geometric sum converges to 0.8
9 changes: 6 additions & 3 deletions dr-roboto/dr-roboto.cpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ float avg_time_pf, en_time, acc, avg_oh, avg_nh, avg_nf, avg_of;
uint64_t st_time;
int n_f, nh, oh, nf, of;
std::string ret;
std::string text = "";

#if _DR_ROBOTO_RPI_
RaspiCamCapture *cap;
Expand Down Expand Up @@ -84,7 +85,7 @@ const char *face_detect()
std::to_string(faces[i].width) + "." +
std::to_string(faces[i].height) + ";";
ret += ";";
cv::imshow("image", frame);
//cv::imshow("image", frame);
return ret.c_str();
}

Expand All @@ -109,7 +110,7 @@ const char *face_smile_detect()
ret += (smile.empty())? "false;" : "true;";
}
ret += ";";
cv::imshow("image", frame);
//cv::imshow("image", frame);
std::cout<<ret<<std::endl;
cv::imwrite("face_smile.jpg", frame);
return ret.c_str();
Expand Down Expand Up @@ -138,7 +139,9 @@ SCM scm_salient_point()
void say(char *data)
{
tts.setSpeaker(FestivalTTS::speaker::DON);
tts.speak(data);
text = data;
//printf("Speech output: %s\n", data);
tts.speak(text.c_str());
}

void scm_say(SCM txt)
Expand Down