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

Pps with modulations dev multi event #32

Merged
merged 25 commits into from
Oct 20, 2016
Merged

Pps with modulations dev multi event #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2df867a
improving projectIncomingEvents on vtRFthread side
matejhof Aug 26, 2016
6080b83
changes to respond to multi-events implemented; testing pending
matejhof Aug 26, 2016
5e91bb2
improved debugging outputs
matejhof Aug 29, 2016
ec12cfe
mini formatting edit
matejhof Aug 29, 2016
0db2377
Merge branch 'pps-with-modulations-devMultiEvent' of https://github.c…
matejhof Aug 29, 2016
cfbf17a
cleaning taxels' event vector every iteration
matejhof Aug 29, 2016
107df38
solved segfault with dumpedVector and improving debug outputs
matejhof Aug 29, 2016
1697cf9
small improvements and improving debug outputs
matejhof Aug 30, 2016
81b343b
mini - removing unneccessary clear() command
matejhof Aug 30, 2016
e80f01d
new taxel RF checking - no cylinder, only shifted positive and negati…
matejhof Sep 7, 2016
453e6af
mini edit - debug output
matejhof Sep 7, 2016
d1c62e2
some fixes to insideRFcheck() - not finished yet
matejhof Sep 7, 2016
3262ba0
making taxel RF fatter
matejhof Sep 13, 2016
b9d3257
small improvements, commented out some debug printfs
matejhof Sep 14, 2016
e345019
scripts cleanup - moving many to bonus so they are not installed
matejhof Sep 14, 2016
85c88cd
updating master script
matejhof Sep 14, 2016
ffc861c
fixed assigning multiple events if relying on memory - not immediate …
matejhof Oct 11, 2016
0bc8c89
removing saving to taxels file by default + improving some comments
matejhof Oct 11, 2016
bf8dc50
working nicely; fixed important bug in nr torso joints initialization
matejhof Oct 13, 2016
9484c20
renaming manageSkinEvents() to managePPSevents()
matejhof Oct 13, 2016
84da4a4
training only if stimulus inside RF of corresponding taxel
matejhof Oct 13, 2016
66714b0
keeping redundant 2nd RF check during add/remove sample as warning fo…
matejhof Oct 13, 2016
565509a
learning works - fixed important bug in IncomingEvent4TaxelPWE::getNR…
matejhof Oct 13, 2016
d54c42d
removing redundant insideRF check
matejhof Oct 13, 2016
9f115f8
Update taxelPWE.h
matejhof Oct 14, 2016
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
0 app/scripts/PPS_Dumper.xml → app/scripts/bonus/PPS_Dumper.xml
View file
Open in desktop
File renamed without changes.
0 app/scripts/iCub_Log.xml → app/scripts/bonus/iCub_Log.xml
View file
Open in desktop
File renamed without changes.
80 changes: 40 additions & 40 deletions app/scripts/bonus/iCub_Log_tx_rx_time.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,100 +6,100 @@

<module>
<name>dataDumper</name>
<parameters>--name /data/skin/skin_events --txTime --rxTime</parameters>
<parameters>--name /data/skin_events --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinContact</tag>
</module>

<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_left_hand --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_left_hand --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinLeftHandComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_left_forearm --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_left_forearm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinLeftForearmComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_left_arm --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_left_arm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinLeftArmComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_right_hand --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_right_hand --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinRightHandComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_right_forearm --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_right_forearm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinRightForearmComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_right_arm --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_right_arm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinRightArmComp</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/skin/tactile_comp_torso --txTime --rxTime</parameters>
<parameters>--name /data/skin_tactile_comp_torso --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperSkinTorsoComp</tag>
</module>

<module>
<name>dataDumper</name>
<parameters>--name /data/joints/head_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_head --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperHeadJoints</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/joints/torso_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_torso --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperTorsoJoints</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/joints/leftArm_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_leftArm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperLeftArmJoints</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/joints/rightArm_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_rightArm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperRightArmJoints</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/joints/leftLeg_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_leftLeg --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperLeftLegJoints</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/joints/rightLeg_joints --txTime --rxTime</parameters>
<parameters>--name /data/joints_rightLeg --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperRightLegJoints</tag>
Expand Down Expand Up @@ -130,116 +130,116 @@

<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/leftArm_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_leftArm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperLeftArmForces</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/rightArm_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_rightArm --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperRightArmForces</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/leftLeg_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_leftLeg --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperLeftLegForces</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/rightLeg_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_rightLeg --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperRightLegForces</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/leftFoot_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_leftFoot --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperLeftFootForces</tag>
</module>
<module>
<name>dataDumper</name>
<parameters>--name /data/forces_and_torques/rightFoot_forces --txTime --rxTime</parameters>
<parameters>--name /data/forces_rightFoot --txTime --rxTime</parameters>
<node>localhost</node>
<stdio></stdio>
<tag>dataDumperRightFootForces</tag>
</module>

<connection>
<from>/skinManager/skin_events:o</from>
<to>/data/skin/skin_events</to>
<to>/data/skin_events</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/left_hand_comp</from>
<to>/data/skin/tactile_comp_left_hand</to>
<to>/data/skin_tactile_comp_left_hand</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/left_forearm_comp</from>
<to>/data/skin/tactile_comp_left_forearm</to>
<to>/data/skin_tactile_comp_left_forearm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/left_arm_comp</from>
<to>/data/skin/tactile_comp_left_arm</to>
<to>/data/skin_tactile_comp_left_arm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/right_hand_comp</from>
<to>/data/skin/tactile_comp_right_hand</to>
<to>/data/skin_tactile_comp_right_hand</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/right_forearm_comp</from>
<to>/data/skin/tactile_comp_right_forearm</to>
<to>/data/skin_tactile_comp_right_forearm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/right_arm_comp</from>
<to>/data/skin/tactile_comp_right_arm</to>
<to>/data/skin_tactile_comp_right_arm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/skin/torso_comp</from>
<to>/data/skin/tactile_comp_torso</to>
<to>/data/skin_tactile_comp_torso</to>
<protocol>udp</protocol>
</connection>

<connection>
<from>/icub/head/state:o</from>
<to>/data/joints/head_joints</to>
<to>/data/joints_head</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/torso/state:o</from>
<to>/data/joints/torso_joints</to>
<to>/data/joints_torso</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/left_arm/state:o</from>
<to>/data/joints/leftArm_joints</to>
<to>/data/joints_leftArm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/right_arm/state:o</from>
<to>/data/joints/rightArm_joints</to>
<to>/data/joints_rightArm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/left_leg/state:o</from>
<to>/data/joints/leftLeg_joints</to>
<to>/data/joints_leftLeg</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/right_leg/state:o</from>
<to>/data/joints/rightLeg_joints</to>
<to>/data/joints_rightLeg</to>
<protocol>udp</protocol>
</connection>

Expand All @@ -262,32 +262,32 @@

<connection>
<from>/icub/left_arm/analog:o</from>
<to>/data/forces_and_torques/leftArm_forces</to>
<to>/data/forces_leftArm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/right_arm/analog:o</from>
<to>/data/forces_and_torques/rightArm_forces</to>
<to>/data/forces_rightArm</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/left_leg/analog:o</from>
<to>/data/forces_and_torques/leftLeg_forces</to>
<to>/data/forces_leftLeg</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/right_leg/analog:o</from>
<to>/data/forces_and_torques/rightLeg_forces</to>
<to>/data/forces_rightLeg</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/left_foot/analog:o</from>
<to>/data/forces_and_torques/leftFoot_forces</to>
<to>/data/forces_leftFoot</to>
<protocol>udp</protocol>
</connection>
<connection>
<from>/icub/right_foot/analog:o</from>
<to>/data/forces_and_torques/rightFoot_forces</to>
<to>/data/forces_rightFoot</to>
<protocol>udp</protocol>
</connection>

Expand Down
Loading