From 65ef635d6d0d23fe7025c38a504892daccfb9df7 Mon Sep 17 00:00:00 2001 From: Eloy Retamino Date: Mon, 2 Dec 2019 12:05:21 +0000 Subject: [PATCH 1/3] Merged in NRRPLT-7700-tf-execution-order (pull request #53) [NRRPLT-7700] Added order attribute to transfer function type definition Approved-by: Michael Zechmair Approved-by: Ugo Albanese --- bibi_configuration.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bibi_configuration.xsd b/bibi_configuration.xsd index bcb4850..b5c49ed 100644 --- a/bibi_configuration.xsd +++ b/bibi_configuration.xsd @@ -244,6 +244,11 @@ The 'src' attribute denotes the path of a python file that contains the entire transfer function. If this attribute is present, the actual contents of the transfer function element is ignored and only the contents of the specified Python file are taken into account. + + + The 'priority' attribute is used to specify the order in which transfer functions are executed at every simulation step. Transfer functions with higher priority are executed first. + + From 2ff42f17c189c45e7928864add0f027a1da91dd2 Mon Sep 17 00:00:00 2001 From: Michael Zechmair Date: Tue, 17 Dec 2019 16:04:04 +0000 Subject: [PATCH 2/3] Added IBA Experiment --- iba_holodeck/brainvisualizer.json | 1 + iba_holodeck/iba.launch | 6 ++ iba_holodeck/iba_holodeck.bibi | 12 +++ iba_holodeck/iba_holodeck.exc | 23 ++++++ iba_holodeck/iba_holodeck.ini | 92 +++++++++++++++++++++++ iba_holodeck/iba_holodeck.jpg | Bin 0 -> 17834 bytes iba_holodeck/iba_holodeck.uis | 9 +++ iba_holodeck/move_target.py | 37 +++++++++ iba_holodeck/resources/textures/1146.png | Bin 0 -> 219 bytes iba_holodeck/resources/textures/307.png | Bin 0 -> 242 bytes iba_holodeck/resources/textures/3150.png | Bin 0 -> 222 bytes iba_holodeck/resources/textures/4442.png | Bin 0 -> 226 bytes iba_holodeck/tf_results.py | 23 ++++++ 13 files changed, 203 insertions(+) create mode 100644 iba_holodeck/brainvisualizer.json create mode 100644 iba_holodeck/iba.launch create mode 100644 iba_holodeck/iba_holodeck.bibi create mode 100644 iba_holodeck/iba_holodeck.exc create mode 100644 iba_holodeck/iba_holodeck.ini create mode 100644 iba_holodeck/iba_holodeck.jpg create mode 100644 iba_holodeck/iba_holodeck.uis create mode 100644 iba_holodeck/move_target.py create mode 100644 iba_holodeck/resources/textures/1146.png create mode 100644 iba_holodeck/resources/textures/307.png create mode 100644 iba_holodeck/resources/textures/3150.png create mode 100644 iba_holodeck/resources/textures/4442.png create mode 100644 iba_holodeck/tf_results.py diff --git a/iba_holodeck/brainvisualizer.json b/iba_holodeck/brainvisualizer.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/iba_holodeck/brainvisualizer.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/iba_holodeck/iba.launch b/iba_holodeck/iba.launch new file mode 100644 index 0000000..f36b4ce --- /dev/null +++ b/iba_holodeck/iba.launch @@ -0,0 +1,6 @@ + + + + + + diff --git a/iba_holodeck/iba_holodeck.bibi b/iba_holodeck/iba_holodeck.bibi new file mode 100644 index 0000000..f444e30 --- /dev/null +++ b/iba_holodeck/iba_holodeck.bibi @@ -0,0 +1,12 @@ + + + + brain_model/braitenberg.py + + + + + icub_model/model.sdf + + + diff --git a/iba_holodeck/iba_holodeck.exc b/iba_holodeck/iba_holodeck.exc new file mode 100644 index 0000000..be36a97 --- /dev/null +++ b/iba_holodeck/iba_holodeck.exc @@ -0,0 +1,23 @@ + + + Holodeck IBA experiment + iba_holodeck.jpg + In this experiment, we show how data can be shared and synchronization can be achieved in IBA. + iba robotics holodeck + 840 + + + + production + + + + + + + + + + diff --git a/iba_holodeck/iba_holodeck.ini b/iba_holodeck/iba_holodeck.ini new file mode 100644 index 0000000..ea6d64c --- /dev/null +++ b/iba_holodeck/iba_holodeck.ini @@ -0,0 +1,92 @@ +{ + "dynamicEnvMap": true, + "shadows": true, + "antiAliasing": true, + "ssao": false, + "ssaoDisplay": false, + "ssaoClamp": "0.94", + "ssaoLumInfluence": "1", + "rgbCurve": { + "red": [ + [ + 0, + 0 + ], + [ + 0.410400390625, + 0.4481201171875 + ], + [ + 0.761962890625, + 0.7957763671875 + ], + [ + 1, + 1 + ] + ], + "green": [ + [ + 0, + 0 + ], + [ + 0.261962890625, + 0.2801513671875 + ], + [ + 0.718994140625, + 0.7371826171875 + ], + [ + 1, + 1 + ] + ], + "blue": [ + [ + 0, + 0 + ], + [ + 0.265869140625, + 0.2606201171875 + ], + [ + 0.840087890625, + 0.7645263671875 + ], + [ + 1, + 1 + ] + ] + }, + "levelsInBlack": "0.09", + "levelsInGamma": 0.52, + "levelsInWhite": "0.8", + "levelsOutBlack": 0, + "levelsOutWhite": 1, + "skyBox": "forest", + "sun": "", + "bloom": false, + "bloomStrength": "0.83", + "bloomRadius": "0.29", + "bloomThreshold": "0.91", + "fog": true, + "fogDensity": "0.02", + "fogColor": "#97a2af", + "pbrMaterial": true, + "shadowSettings": [ + { + "lightName": "sun", + "mapSize": 4096, + "cameraBottom": -10, + "cameraLeft": -10, + "cameraRight": 10, + "cameraTop": 25, + "bias": 0.0003, + "radius": 1.2 + } + ] +} \ No newline at end of file diff --git a/iba_holodeck/iba_holodeck.jpg b/iba_holodeck/iba_holodeck.jpg new file mode 100644 index 0000000000000000000000000000000000000000..deffd863df517d553b653f0650c2832df2ed03b3 GIT binary patch literal 17834 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 literal 0 HcmV?d00001 diff --git a/iba_holodeck/iba_holodeck.uis b/iba_holodeck/iba_holodeck.uis new file mode 100644 index 0000000..cca085f --- /dev/null +++ b/iba_holodeck/iba_holodeck.uis @@ -0,0 +1,9 @@ +{ + "camera": { + "defaultMode": "free-camera", + "sensitivity": { + "translation": 1.0, + "rotation": 1.0 + } + } +} diff --git a/iba_holodeck/move_target.py b/iba_holodeck/move_target.py new file mode 100644 index 0000000..1e103b0 --- /dev/null +++ b/iba_holodeck/move_target.py @@ -0,0 +1,37 @@ +# Imported Python Transfer Function +# +from gazebo_msgs.srv import SetModelState +import rospy +rospy.wait_for_service("/gazebo/set_model_state") +service_proxy = rospy.ServiceProxy('/gazebo/set_model_state', SetModelState, persistent=True) +@nrp.MapVariable("target_freq", initial_value=0.3) +@nrp.MapVariable("target_ampl", initial_value=0.3) +@nrp.MapVariable("target_center", initial_value={'x': 0, 'y': 2.42, 'z': 1.2}) +@nrp.MapVariable("set_model_state_srv", initial_value=service_proxy) +@nrp.Robot2Neuron() # dummy R2N +def move_target(t, target_freq, target_ampl, target_center, set_model_state_srv): + ms_msg = gazebo_msgs.msg.ModelState() + frequency = target_freq.value + amplitude = target_ampl.value + center = target_center.value + ms_msg.model_name = 'Target' + # set orientation RYP axes + ms_msg.pose.orientation.x = 0 + ms_msg.pose.orientation.y = 1 + ms_msg.pose.orientation.z = 1 + # reference frame + ms_msg.reference_frame = 'world' + #pose + ms_msg.pose.position.x = \ + center['x'] + np.sin(t * frequency * 2 * np.pi) * (float(amplitude) / 2) + ms_msg.pose.position.y = center['y'] + ms_msg.pose.position.z = center['z'] + #scale + ms_msg.scale.x = ms_msg.scale.y = ms_msg.scale.z = 1.0 + #call service + response = set_model_state_srv.value(ms_msg) + #check response + if not response.success: + clientLogger.info(response.status_message) +# + diff --git a/iba_holodeck/resources/textures/1146.png b/iba_holodeck/resources/textures/1146.png new file mode 100644 index 0000000000000000000000000000000000000000..682540545f692b03ccb33ef740573e9c3c20544c GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^G9b(WBpAZe8a#m1B2O2`kcv6U2@-n_?D_g^SF6JX zrFPBopU?N#@6T&Gkn72Fa^B+q|3sQ1)v9Jhng6qHyM2!P|EI!JE9-x!w+CN(a9=TP z&ZJfG|K7abDsotH^|l`u+w1kUSPEZ;70mkfUe9l{q=bx}T>4Sn+yDFpx2s&=A5=5x z`N=6J2i0%>vlpK(QvdXR{h^2>!P!|^e0D#-Ycod+nCt)e`~Ln!&u=?&mk2R1q&Ydg TeHX*B8sutES3j3^P6+>q_2ei2{w+`osWrfqynSuWUm*DP`|kq`xoLmSN|gHa^)34QcNK=@lfSp5L3GOB zzlj)<`G3nnl)<;ZYq>Ba?G0E#)Uv;Sqj9=<``-^Xxa15!{#}PlPI&9zn}WC`flkG# z(ct3W9U?g71h4-6Xo*W>`rnVSxa2I~|J{R2jv@5#-_^L}xK{rCW`av{<=?-Vxa2H8 s{JkiSOLFPo-x)ZaWAJtbPC0A<02WtGT9Kg>_5c6?07*qoM6N<$g8DFYT>t<8 literal 0 HcmV?d00001 diff --git a/iba_holodeck/resources/textures/3150.png b/iba_holodeck/resources/textures/3150.png new file mode 100644 index 0000000000000000000000000000000000000000..97594856daedd0bbf6ae037d2acc48a1b851ad75 GIT binary patch literal 222 zcmV<403rX0P)3NZkcv6U2@-o8>^}Vc{r&2$ z8%zFF_y1vTl#O`eWY3^_FXrd>_t~1-ZBKsJ|K~IPy=fh@*2E(ddMY33@-9)@=;g$4 z`VLUy!{Z6BfeQV#$}HFIw20wmag=T>5`MGs)J;e|Nr`K0mF2WxUbtzUz-+wDvWuze!Cq5 Y!#1O)cQ@x=z6)}^r>mdKI;Vst09NN>YybcN literal 0 HcmV?d00001 diff --git a/iba_holodeck/tf_results.py b/iba_holodeck/tf_results.py new file mode 100644 index 0000000..135dcb1 --- /dev/null +++ b/iba_holodeck/tf_results.py @@ -0,0 +1,23 @@ +# Imported Python Transfer Function +# +from std_msgs.msg import Float64 +@nrp.MapVariable("eye_position", scope=nrp.GLOBAL) +@nrp.MapSpikeSink("result_0_dv", nrp.brain.actors[1], nrp.leaky_integrator_alpha) +@nrp.MapSpikeSink("result_1_dv", nrp.brain.actors[2], nrp.leaky_integrator_alpha) +@nrp.Neuron2Robot(Topic('/icub/eye_version/pos', Float64)) +def tf_results(t, eye_position, result_0_dv, result_1_dv): + def deg2rad(deg): + """ + Degrees to radians conversion function. + :param deg: value in degrees + :return: value of deg in radians + """ + return (float(deg) / 360.) * (2. * np.pi) + if eye_position.value is None: + return 0.0 + d = result_1_dv.voltage - result_0_dv.voltage + max_mov = 1.0 + ret = eye_position.value + deg2rad(-((d + 0.03) / 0.09 * 2 * max_mov - max_mov)) + return ret +# + From 30f2a48c7aeb3d03a30c37163b7dc1e4c212f377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 16:20:58 +0000 Subject: [PATCH 3/3] Bump pillow from 5.0.0 to 6.2.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.0.0 to 6.2.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/5.0.0...6.2.0) Signed-off-by: dependabot[bot] --- template_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template_requirements.txt b/template_requirements.txt index d0a3e3e..3d03442 100644 --- a/template_requirements.txt +++ b/template_requirements.txt @@ -1 +1 @@ -pillow==5.0.0 \ No newline at end of file +pillow==6.2.0 \ No newline at end of file