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

Latest MORSE changes #9

Open
wants to merge 119 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
7f19965
[doc] Document that the Environment must be created at the end
Jul 23, 2014
4f96c7e
[modifiers] add missing logger
PierrickKoch Jul 28, 2014
7b2806f
[modifier] Rework odometry_noise to work at the different odometry level
Jul 29, 2014
3a6fd00
[modifier] cleanup parameter method
PierrickKoch Jul 29, 2014
43a819c
[builder] fix excepthook w/Python3.4 on Ubuntu 14.04
PierrickKoch Jul 29, 2014
094e727
[core] Make get_properties return the real current value of properties
Aug 4, 2014
9c0aa4d
[core] Add a method set_property to object
Aug 4, 2014
e9ddcba
[ros/depth] new DepthCamera w/ 32FC1 encoding
pronobis Aug 6, 2014
a5ffd2b
[builder] Kinect = CompoundSensor
PierrickKoch Aug 7, 2014
d8ab499
[socket] fix get_local_data using MorseEncoder
PierrickKoch Aug 7, 2014
1ecd5a1
[pymorse] fix #552 unsafe ayncore.loop + close_all
PierrickKoch Aug 1, 2014
3f51eda
[pymorse] fix pymorse_testing was out of date
PierrickKoch Aug 14, 2014
3285a76
[pymorse] bump version 1.2.2
PierrickKoch Aug 14, 2014
eecbf9b
[tests] Updated multiple_humans to exhibit bug #558
Aug 20, 2014
df8d098
[pymorse] Check if asyncore_thread is still alive
Sep 1, 2014
b000fa7
[doc] Use https to access vimeo
Sep 3, 2014
5206052
[builder] /json.dumps/pprint.pformat/
PierrickKoch Sep 4, 2014
45e60b6
[doc] update ros install note for indigo
PierrickKoch Sep 4, 2014
c0bbe5a
[ros] fixed ros service return value
pronobis Aug 28, 2014
50de16a
[ros] add static tf publisher
Aug 26, 2014
5104811
[ros] video_camera: possibility to disable tf publisher
Sep 3, 2014
c0a291e
[builder] allow to call alter with only classpath
PierrickKoch Sep 8, 2014
db937ea
[builder] link_append dropped in 2.71.6
PierrickKoch Sep 15, 2014
3502658
[doc] update ros install w/setuptools
PierrickKoch Sep 18, 2014
774b110
[doc] update ros install w/setuptools (2)
PierrickKoch Sep 18, 2014
35c9b53
[bin] bump blender max version
PierrickKoch Sep 24, 2014
ecaa554
[testing] Restore test_movement and make it 'works'
Oct 1, 2014
a7d47a6
[builder] fullscren: add desktop arg
PierrickKoch Oct 2, 2014
8b061d8
[robots/grasping_robots] Initialize properly DraggedObject game property
Oct 7, 2014
1aae048
[builder] Add a method to enable the grasping capacity to a robot
Oct 7, 2014
f7b39e4
[sensors] Add a radar altimeter sensor
Oct 10, 2014
d94d584
[doc] Mention the addition of Radar Altimeter sensor
Oct 13, 2014
fa18e03
[basics.blend] Rotate the hud to display the image in the right sense
Oct 15, 2014
6e9b7a0
[mw/yarp] Fix the orientation of image
Oct 15, 2014
1bf55f9
[builder] fix few occurrences of removed method
PierrickKoch Oct 14, 2014
643bdfb
[builder] fix few occurrences of removed method
PierrickKoch Oct 15, 2014
adc2ea6
[builder] Fix fallout from the move of YarpImagePublisher in its own …
Oct 15, 2014
1e228a6
[pymorse] wait for publisher when closing
PierrickKoch Oct 17, 2014
9fa40da
[doc] fix camera vertical flip default doc
PierrickKoch Oct 27, 2014
0c390ae
[datastream] Allow to pass option configuration to stream manager
Oct 27, 2014
4654cfc
[core] Add an 'action' handler in datastream manager
Oct 27, 2014
0915c07
[doc] Note the addition of configure_stream_manager and action handler
Oct 28, 2014
2ec1fdc
[doc] Update argument_passing to document stream_manager dictionnary
Oct 28, 2014
3ad44c9
[doc] Document that one may want to override DatastreamManager.action
Oct 28, 2014
13750b6
[blender/main] Remove unused functions
Oct 28, 2014
a03c936
[core] Replace datastreamDict by stream_managers
Oct 28, 2014
8b50ddd
[builder] fix infrared sensor
PierrickKoch Nov 14, 2014
743e17b
[pymorse] mv poll thread class to stream module
PierrickKoch Nov 25, 2014
9a927a9
[tools] simplify hybrid node
PierrickKoch Nov 25, 2014
ff9b86e
[test] add infrared basic test
PierrickKoch Nov 27, 2014
cd7bf5e
[builder] add CameraFP focal length setter
PierrickKoch Dec 5, 2014
80befe1
[mw/moos] Multi-node now working ('moos_*' params)
SimonRohou Nov 5, 2014
41e2708
[mw/moos] Teleport actuator now working
SimonRohou Nov 5, 2014
353751e
[mw/moos] Add PoseReader from MotionReader
SimonRohou Nov 5, 2014
09fbe8d
[mw/moos] Light actuator now working
SimonRohou Nov 5, 2014
0acc831
[mw/moos] Multiple actuators on the same port, now working
SimonRohou Nov 7, 2014
aa6cf79
[mw/moos] Updated corresponding documentation
SimonRohou Nov 25, 2014
447ada1
[mw/moos] Retrieve moos_* parameters with dict.get method for code cl…
SimonRohou Nov 26, 2014
bb94a9c
[middleware] Introduce stuff for HLA as a middleware
Oct 22, 2014
02ced90
[blender/main] Be more robust in case of exception in Datastream Mana…
Oct 28, 2014
875f97a
[builder] Add an entry for hla stream manager
Oct 28, 2014
b525337
[multinode] Rework hla multinode to use stuff defined in hla_datastream
Oct 30, 2014
95694b9
[mw/hla] For now, provide a certi message_buffer with Morse
Nov 28, 2014
e223467
[doc] Mention MOOS improvement and new HLA stuff
Dec 15, 2014
cf888cc
[bin] multinode server check valid data
PierrickKoch Dec 15, 2014
7675878
[typo] fix 'received' typo in comments
PierrickKoch Dec 15, 2014
c0b5484
[cmake] morse_inspector is really in CMAKE_CURRENT_SOURCE_DIR
nicolaje Dec 16, 2014
6fe8aef
Added missing header data to accelerometer and infrared
cehberlin Jan 5, 2015
86d9c4b
[bin/morse.in] Mark Morse ready for blender 2.73
Jan 7, 2015
08e617b
[doc] Improve HLA installation doc
Jan 21, 2015
c0ff225
[builder] Import properly needed MorseBuilderException
Jan 23, 2015
d42cab6
[builder] add VideoCamera.hide_mesh method
PierrickKoch Jan 23, 2015
f399773
[builder] add the proper mesh to Velodyne
PierrickKoch Jan 23, 2015
2bcb161
[main] F9 don't switch into Velodyne's camera
PierrickKoch Jan 27, 2015
6bb45c1
[doc] Provides an initial documentation for HLA as middleware
Jan 30, 2015
94038fc
[doc] Add a tutorial for HLA as middleware
Jan 30, 2015
8a99c41
[doc] Add an hla tag and uses it accordingly
Jan 30, 2015
1795bd0
[mw/hla] Force the z to 0
Jan 30, 2015
5e7c209
[templates] Handle properly b2708d5641 in sensor/actuator template
Feb 11, 2015
9cdb729
[builder] add mist control to Environment
eirikhex Feb 19, 2015
8f330a7
[mw/ros] add error message link to install doc
PierrickKoch Feb 25, 2015
ff2c204
[doc] Fix typo in the version of CERTI and precise some compilation f…
Mar 2, 2015
2f65f3f
[doc] Document the addition of mist settings
Mar 2, 2015
9287ea4
[doc] Fix a typo in hla tutorial
Mar 6, 2015
3214df7
[sensors] Almost rewrite accelerometer
Mar 11, 2015
03ea164
[testing] Add a test for accelerometer
Mar 11, 2015
d2e2101
[gyroscope] Simplify (and don't write in robot_parent)
Mar 12, 2015
216f55d
[testing] Improve velocity_testing
Mar 12, 2015
efc8051
[sensor] Add a way to compute velocity for robot without physics
Mar 12, 2015
bdbd058
[bin] add morse --noaudio CLI option fix #601
PierrickKoch Mar 17, 2015
c0fcef5
[doc] Happy new year Morse!
PierrickKoch Jan 21, 2015
ee5849d
[sensors] Avoid exception if dt == 0.0 (at beginning or end of simula…
Mar 18, 2015
733e913
[sensors] Add a property ComputationMethod for accelero, imu, velocity
Mar 18, 2015
6479801
[doc] Document recents changes on accelero, velocity and imu sensor
Mar 18, 2015
34bf72b
[doc] Make the hla tutorial looks more like the poolroom
Mar 18, 2015
69ae1a6
[mw/hla] Allow Morse to register the sync point
Mar 18, 2015
8f4fcb9
[mw/hla] Rework attribute handling to not care too much about classname
Mar 19, 2015
8fa9f4f
[mw/hla] Provide some helpers for writing hla interfaces
Mar 19, 2015
4958cb8
[sensors] Add charging status to the battery sensor/message
HorvathJo Mar 24, 2015
8cc0e9e
[testing] Check battery status in battery_testing
Mar 24, 2015
4221824
[core] Introduce finalize in DatastreamManager and use it to release …
Mar 25, 2015
60b24a4
[mw/hla] Try to handle more smartly hla finalization handling
Mar 25, 2015
e33bfb3
[cmake] Fix linker issue on MacOSX
Mar 27, 2015
bbfa74e
[cmake] Improve detection of PythonLibs (particularly on MacOSX)
Mar 30, 2015
faf27fb
[bin] change order for setaudio, first
PierrickKoch Mar 18, 2015
051fa55
[modifier] add reset_noise service to OdometryNoiseModifier
PierrickKoch Mar 30, 2015
e704655
[testing/steer_force] Change a bit constants to match better new blen…
Mar 23, 2015
327b0b2
[testing] Increase a bit tolerenace to make test more happy on recent…
Mar 24, 2015
fd9a3ba
[testing] Increase a bit thresold for builder_wheeled_robot test
Mar 24, 2015
abec47e
[bin] Mark Blender 2.74 Ok for Morse
Mar 31, 2015
e69f3c3
[sensors] Add a model of barometer
Apr 7, 2015
11ee345
[doc] Rewritten (and simplified) installation notes
Apr 7, 2015
2ebbb33
[doc] Mention 'fastmode' in the builder documentation
Apr 7, 2015
be1cc3b
[doc] Update the ROS navigation tutorial to ROS Indigo
Apr 7, 2015
3cb863e
Fix fullscreen issue on retina Mac. fix #383
Dec 4, 2014
b026d5e
[mw/hla] Be more correct on finalization of Input datas
Apr 8, 2015
9386bfa
[multinode] fix SocketNode.finalize error
PierrickKoch Apr 8, 2015
c54567a
[sensor] Fix angular velocity computation for imu in 'simple mode'.
Apr 9, 2015
2043bba
Merge branch 'master' of https://github.com/morse-simulator/morse
hawesie Apr 10, 2015
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ CONFIGURE_FILE(
)
INSTALL(PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/bin/morserun.py
${CMAKE_CURRENT_BINARY_DIR}/bin/morse_inspector
${CMAKE_CURRENT_SOURCE_DIR}/bin/morse_inspector
${CMAKE_CURRENT_BINARY_DIR}/bin/multinode_server.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
)
Expand Down
10 changes: 5 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
===============================================================================
Modular OpenRobots Simulator Engine
(c) LAAS/ONERA 2009-2010 LAAS 2011-2014
(c) LAAS/ONERA 2009-2010 LAAS 2011-2015
===============================================================================


Expand Down Expand Up @@ -92,13 +92,13 @@ Prerequisites
If you decide to install Python by hand, the compilation must be done
according to your operating system, to match the Python compiled in
Blender:

- On **Linux** compile with the --with-wide-unicode flag. This will
provide you with 4-byte Unicode characters (max size: 1114111)

- On **Mac OS** do not use the --with-wide-unicode flag. This will
provide you with 2-byte Unicode characters (max size: 65535)

It the unicode sizes between Python and Blender do not match, you will get
errors about undefined symbols with names starting with PyUnicodeUCS4

Expand All @@ -109,8 +109,8 @@ Download the latest version of the source code. It is stored in a git
repository::

$ git clone https://github.com/laas/morse.git
You can also get a tarball version here.

You can also get a tarball version here.

Go to the directory where you have previously downloaded the MORSE source.
Then type these commands::
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The whole code of Morse is licensed under a BSD-3 clause license that you can
find below:

Copyright (c) 2009-2010, LAAS-CNRS / ONERA -- 2011-2014, LAAS-CNRS
Copyright (c) 2009-2010, LAAS-CNRS / ONERA -- 2011-2015, LAAS-CNRS
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OpenRobots Simulator
====================

(c) LAAS-CNRS/ONERA 2009-2010 LAAS-CNRS 2011-2014
(c) LAAS-CNRS/ONERA 2009-2010 LAAS-CNRS 2011-2015

[![Build Status](https://travis-ci.org/morse-simulator/morse.png?branch=master)](https://travis-ci.org/morse-simulator/morse)

Expand Down Expand Up @@ -63,4 +63,3 @@ The development of MORSE is partially funded by the Foundation RTRA
within the ROSACE project framework, and by DGA
<http://www.defense.gouv.fr/dga> through the ACTION
<http://action.onera.fr> project.

42 changes: 42 additions & 0 deletions RELEASE_NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,57 @@ Sensors
- Laser Scanner sensors gain the possibility to return also a
remission value at the `rssi` level.

- Introduce the new sensor "Radar Altimeter", allowing to retrieve the
distance to the ground.

- Improvement of Acceleromter, IMU and Velocity sensor. They now works
properly with robots with or without physics, and returns properly
information in the sensor frame. The computation method is configurable
using the `ComputationMode` property, counterpart of the `ControlType` in
several actuators.

- Introduce the new sensor "Barometer" allowing to compute the atmospheric pressure.

Middlewares
-----------

General
+++++++

- Each datastream manager now get an action handler, allowing them to run some
specific middleware behaviour once by simulation turn.

Socket
++++++

- Socket middleware now accepts the keyword 'port' to specify on which port
you want the socket binds itself.

Moos
++++

- Support for Moos has been enhanced, allowing to use multiples Moos nodes.
Moreover, it supports additional actuators such as teleport or light
actuator.

HLA
+++

- HLA can be now used as a general purpose middleware, i.e. it is possible to
import / export any actuator / sensor using the HLA interface. Through, for
moment, no Simulation Object Model (SOM) has been formally defined for
Morse.

Builder API
-----------

API addition
++++++++++++

- Add a method Environment.configure_stream_manager allowing to pass
option/information to each datastream manager.
It is now possible to control the mist settings in Morse, using
Environment.enable_mist`` and ``Environment.set_mist_settings.

MORSE 1.2
=========
Expand Down
8 changes: 4 additions & 4 deletions addons/io_export_morse_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ def scan_scene (file_out):

def scan_config(file_out):
""" Parse the contents of 'component_config.py'

Produce a configuration file that 'morsebuilder' can use to
configure the robot/middleware bindings in a scene.
configure the robot/middleware bindings in a scene.
"""
import component_config
file_out.write("# Scene configuration\n")
Expand Down Expand Up @@ -185,7 +185,7 @@ def scan_config(file_out):
for key,value in component_config.component_service.items():
component = re.sub('\.', '_', key)
mw = re.search('(\w+)_request_manager', value[0])
file_out.write("%s.configure_service('%s')\n" % (component, mw.group(1)))
file_out.write("%s.add_service('%s')\n" % (component, mw.group(1)))
except AttributeError as detail:
print ("\tNo services configured")

Expand All @@ -195,7 +195,7 @@ def scan_config(file_out):
for key,value in component_config.component_modifier.items():
component = re.sub('\.', '_', key)
mod = value[0]
file_out.write("%s.configure_modifier(%s)\n" % (component, mod))
file_out.write("%s.alter(%s)\n" % (component, mod))
except AttributeError as detail:
print ("\tNo modifiers configured")

Expand Down
Loading