[Jderobot-admin] jderobot-r4 - in jdec/trunk: . core schemas/hsituner

[barrera en jderobot.org]

Author: barrera
Date: 2006-11-24 19:12:39 +0100 (vie 24 de nov de 2006)
New Revision: 4

Modified:
   jdec/trunk/ChangeLog
   jdec/trunk/core/jde.c
   jdec/trunk/core/jde.conf
   jdec/trunk/schemas/hsituner/Makefile
Log:
Move ChangeLog information


Modificado: jdec/trunk/ChangeLog
===================================================================
--- jdec/trunk/ChangeLog	2006-11-24 17:40:24 UTC (rev 3)
+++ jdec/trunk/ChangeLog	2006-11-24 18:12:39 UTC (rev 4)
@@ -0,0 +1,30 @@
+Changelog
+
+****4.1: from 4.0
+1.- avoids the "multiply defined symbol" problem, changing the name of different key symbols like robot->jde_robot, laser->jde_laser, width->jde_width, height->jde_height. Those names are used by player library. The name collision is silent when using dynamic libraries, but it exists. (Antonio Pineda)
+2.- schemas are loaded WITHOUT exporting their symbol tables. There is a list of exported variables. Each schema must export the variables it provides, and import the variables it needs during its execution
+
+****4.0: from 3.12
+1.- includes mouse shortcuts to update scale, move the display_window on sensorsmotorsgui (Antonio Pineda)
+
+****3.12: from 3.11
+1.- hierarchy oscilloscope to display the state of the set of schemas
+
+****3.11: from 3.10
+1.- drivers as plugins
+
+****3.10: from 3.9
+1.- schemas as dynamic libraries, as PLUGINS
+2.- before launching jde, run "source ponpath" to update the LD_LIBRARY_PATH environment variable. The p list of places to look at when loading dynamic libraries.
+
+****3.9: from 3.4
+1.- schema stalling solved in myschema, guixforms, motors, pantiltmotors and pantiltencoders
+2.- cronometro real para guixforms y myschema
+3.- eliminados greyA y greyB. updategreyA se mantiene como muestra de la conversión necesaria para pasar correctamente a escala de grises
+4.- myschema_cycle y guixforms_cycle se eliminan de jde.c, se ponen exclusivamente en el codigo de su esquema respectivo
+5.- VISUALIZACIÓN DISTRIBUIDA y reorganizada: la hebra jdegui centraliza el mantenimiento de dos guis de sistema (mastergui y sensorsandmotorsgui) y los de aquellos esquemas no dormidos. Cada esquema debe registrar su myschema_buttons y su myshema_display. Mastergui se encarga de la activación de esquemas y de seleccionar su visualización a voluntad. Sensorsandmotorsgui se encarga de visualizar los datos sensoriales básicos y poder teleoperar los actuadores del robot.
+
+****3.4: jmplaza local pantilt support
+- -D CONFIGDIR='"/etc/jde-robot"', the directory in which searches config 
+  files (jde.conf) can be changed at compile time
+

Modificado: jdec/trunk/core/jde.c
===================================================================
--- jdec/trunk/core/jde.c	2006-11-24 17:40:24 UTC (rev 3)
+++ jdec/trunk/core/jde.c	2006-11-24 18:12:39 UTC (rev 4)
@@ -1,36 +1,5 @@
 #define thisrelease "JDE 4.1"
 
-/* Changelog:
-
-****4.1: from 4.0
-1.- avoids the "multiply defined symbol" problem, changing the name of different key symbols like robot->jde_robot, laser->jde_laser, width->jde_width, height->jde_height. Those names are used by player library. The name collision is silent when using dynamic libraries, but it exists. (Antonio Pineda)
-2.- schemas are loaded WITHOUT exporting their symbol tables. There is a list of exported variables. Each schema must export the variables it provides, and import the variables it needs during its execution
-
-****4.0: from 3.12
-1.- includes mouse shortcuts to update scale, move the display_window on sensorsmotorsgui (Antonio Pineda)
-
-****3.12: from 3.11
-1.- hierarchy oscilloscope to display the state of the set of schemas
-
-****3.11: from 3.10
-1.- drivers as plugins
-
-****3.10: from 3.9
-1.- schemas as dynamic libraries, as PLUGINS
-2.- before launching jde, run "source ponpath" to update the LD_LIBRARY_PATH environment variable. The p list of places to look at when loading dynamic libraries.
-
-****3.9: from 3.4
-1.- schema stalling solved in myschema, guixforms, motors, pantiltmotors and pantiltencoders
-2.- cronometro real para guixforms y myschema
-3.- eliminados greyA y greyB. updategreyA se mantiene como muestra de la conversión necesaria para pasar correctamente a escala de grises
-4.- myschema_cycle y guixforms_cycle se eliminan de jde.c, se ponen exclusivamente en el codigo de su esquema respectivo
-5.- VISUALIZACIÓN DISTRIBUIDA y reorganizada: la hebra jdegui centraliza el mantenimiento de dos guis de sistema (mastergui y sensorsandmotorsgui) y los de aquellos esquemas no dormidos. Cada esquema debe registrar su myschema_buttons y su myshema_display. Mastergui se encarga de la activación de esquemas y de seleccionar su visualización a voluntad. Sensorsandmotorsgui se encarga de visualizar los datos sensoriales básicos y poder teleoperar los actuadores del robot.
-
-****3.4: jmplaza local pantilt support
-- -D CONFIGDIR='"/etc/jde-robot"', the directory in which searches config 
-  files (jde.conf) can be changed at compile time
-*/
-
 #include "jde.h"
 #include "dlfcn.h"
 #include "jdegui.h"

Modificado: jdec/trunk/core/jde.conf
===================================================================
--- jdec/trunk/core/jde.conf	2006-11-24 17:40:24 UTC (rev 3)
+++ jdec/trunk/core/jde.conf	2006-11-24 18:12:39 UTC (rev 4)
@@ -27,7 +27,7 @@
 
 ### SCHEMA LOAD --------------------
 #load perceptive1
-load myschema
-#load hsituner
-load opengldemo
-load papito
+#load myschema
+load hsituner
+#load opengldemo
+#load papito

Modificado: jdec/trunk/schemas/hsituner/Makefile
===================================================================
--- jdec/trunk/schemas/hsituner/Makefile	2006-11-24 17:40:24 UTC (rev 3)
+++ jdec/trunk/schemas/hsituner/Makefile	2006-11-24 18:12:39 UTC (rev 4)
@@ -1,5 +1,6 @@
 JDEDIR = /usr/local
-INC-DIR = -I. -I/usr/include -I/usr/X11R6/include -I/usr/local/include -I/usr/X11R6/include/X11 -I$(JDEDIR)/include/jde-robot
+INC-DIR = -I. -I/usr/include -I/usr/X11R6/include -I/usr/local/include -I/usr/X11R6/include/X11 -I../../core
+
 LIB-DIR = -L. -L/usr/lib -L -L/usr/local/lib -L/usr/X11R6/lib 
 GCC = gcc
 CFLAGS = -g -pedantic -Wall $(INC-DIR)