git.droids-corp.org
/
aversive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9b20b69
)
split graph in several dirs
author
Olivier MATZ
<zer0@droids-corp.org>
Sun, 7 Mar 2010 19:38:15 +0000
(20:38 +0100)
committer
Olivier MATZ
<zer0@droids-corp.org>
Sun, 7 Mar 2010 19:38:15 +0000
(20:38 +0100)
projects/microb2010/tests/tourel_beacon/.config
patch
|
blob
|
history
projects/microb2010/tests/tourel_beacon/.config.old
patch
|
blob
|
history
projects/microb2010/tests/tourel_beacon/graph.py
patch
|
blob
|
history
diff --git
a/projects/microb2010/tests/tourel_beacon/.config
b/projects/microb2010/tests/tourel_beacon/.config
index
0182964
..
0db9b78
100644
(file)
--- a/
projects/microb2010/tests/tourel_beacon/.config
+++ b/
projects/microb2010/tests/tourel_beacon/.config
@@
-1,5
+1,5
@@
#
#
-# Automatically generated
by make menu
config: don't edit
+# Automatically generated
make
config: don't edit
#
#
#
#
@@
-74,6
+74,10
@@
CONFIG_FORMAT_BINARY=y
#
# Base modules
#
#
# Base modules
#
+
+#
+# Enable math library in generation options to see all modules
+#
# CONFIG_MODULE_CIRBUF is not set
# CONFIG_MODULE_CIRBUF_LARGE is not set
# CONFIG_MODULE_FIXED_POINT is not set
# CONFIG_MODULE_CIRBUF is not set
# CONFIG_MODULE_CIRBUF_LARGE is not set
# CONFIG_MODULE_FIXED_POINT is not set
@@
-94,6
+98,10
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Communication modules
#
#
# Communication modules
#
+
+#
+# uart needs circular buffer, mf2 client may need scheduler
+#
# CONFIG_MODULE_UART is not set
# CONFIG_MODULE_UART_9BITS is not set
# CONFIG_MODULE_UART_CREATE_CONFIG is not set
# CONFIG_MODULE_UART is not set
# CONFIG_MODULE_UART_9BITS is not set
# CONFIG_MODULE_UART_CREATE_CONFIG is not set
@@
-178,6
+186,10
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
# Control system modules
#
# CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set
# Control system modules
#
# CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set
+
+#
+# Filters
+#
# CONFIG_MODULE_PID is not set
# CONFIG_MODULE_PID_CREATE_CONFIG is not set
# CONFIG_MODULE_RAMP is not set
# CONFIG_MODULE_PID is not set
# CONFIG_MODULE_PID_CREATE_CONFIG is not set
# CONFIG_MODULE_RAMP is not set
@@
-188,12
+200,20
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Radio devices
#
#
# Radio devices
#
+
+#
+# Some radio devices require SPI to be activated
+#
# CONFIG_MODULE_CC2420 is not set
# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set
#
# Crypto modules
#
# CONFIG_MODULE_CC2420 is not set
# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set
#
# Crypto modules
#
+
+#
+# Crypto modules depend on utils module
+#
# CONFIG_MODULE_AES is not set
# CONFIG_MODULE_AES_CTR is not set
# CONFIG_MODULE_MD5 is not set
# CONFIG_MODULE_AES is not set
# CONFIG_MODULE_AES_CTR is not set
# CONFIG_MODULE_MD5 is not set
@@
-203,12
+223,20
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Encodings modules
#
#
# Encodings modules
#
+
+#
+# Encoding modules depend on utils module
+#
# CONFIG_MODULE_BASE64 is not set
# CONFIG_MODULE_HAMMING is not set
#
# Debug modules
#
# CONFIG_MODULE_BASE64 is not set
# CONFIG_MODULE_HAMMING is not set
#
# Debug modules
#
+
+#
+# Debug modules depend on utils module
+#
# CONFIG_MODULE_DIAGNOSTIC is not set
# CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set
CONFIG_MODULE_ERROR=y
# CONFIG_MODULE_DIAGNOSTIC is not set
# CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set
CONFIG_MODULE_ERROR=y
diff --git
a/projects/microb2010/tests/tourel_beacon/.config.old
b/projects/microb2010/tests/tourel_beacon/.config.old
index
b47777e
..
0182964
100644
(file)
--- a/
projects/microb2010/tests/tourel_beacon/.config.old
+++ b/
projects/microb2010/tests/tourel_beacon/.config.old
@@
-1,5
+1,5
@@
#
#
-# Automatically generated
make
config: don't edit
+# Automatically generated
by make menu
config: don't edit
#
#
#
#
@@
-56,11
+56,11
@@
CONFIG_QUARTZ=16000000
#
# Generation options
#
#
# Generation options
#
-# CONFIG_OPTM_0 is not set
+CONFIG_OPTM_0=y
# CONFIG_OPTM_1 is not set
# CONFIG_OPTM_2 is not set
# CONFIG_OPTM_3 is not set
# CONFIG_OPTM_1 is not set
# CONFIG_OPTM_2 is not set
# CONFIG_OPTM_3 is not set
-CONFIG_OPTM_S=y
+# CONFIG_OPTM_S is not set
CONFIG_MATH_LIB=y
# CONFIG_FDEVOPEN_COMPAT is not set
# CONFIG_NO_PRINTF is not set
CONFIG_MATH_LIB=y
# CONFIG_FDEVOPEN_COMPAT is not set
# CONFIG_NO_PRINTF is not set
@@
-74,10
+74,6
@@
CONFIG_FORMAT_BINARY=y
#
# Base modules
#
#
# Base modules
#
-
-#
-# Enable math library in generation options to see all modules
-#
# CONFIG_MODULE_CIRBUF is not set
# CONFIG_MODULE_CIRBUF_LARGE is not set
# CONFIG_MODULE_FIXED_POINT is not set
# CONFIG_MODULE_CIRBUF is not set
# CONFIG_MODULE_CIRBUF_LARGE is not set
# CONFIG_MODULE_FIXED_POINT is not set
@@
-98,10
+94,6
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Communication modules
#
#
# Communication modules
#
-
-#
-# uart needs circular buffer, mf2 client may need scheduler
-#
# CONFIG_MODULE_UART is not set
# CONFIG_MODULE_UART_9BITS is not set
# CONFIG_MODULE_UART_CREATE_CONFIG is not set
# CONFIG_MODULE_UART is not set
# CONFIG_MODULE_UART_9BITS is not set
# CONFIG_MODULE_UART_CREATE_CONFIG is not set
@@
-186,10
+178,6
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
# Control system modules
#
# CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set
# Control system modules
#
# CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set
-
-#
-# Filters
-#
# CONFIG_MODULE_PID is not set
# CONFIG_MODULE_PID_CREATE_CONFIG is not set
# CONFIG_MODULE_RAMP is not set
# CONFIG_MODULE_PID is not set
# CONFIG_MODULE_PID_CREATE_CONFIG is not set
# CONFIG_MODULE_RAMP is not set
@@
-200,20
+188,12
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Radio devices
#
#
# Radio devices
#
-
-#
-# Some radio devices require SPI to be activated
-#
# CONFIG_MODULE_CC2420 is not set
# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set
#
# Crypto modules
#
# CONFIG_MODULE_CC2420 is not set
# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set
#
# Crypto modules
#
-
-#
-# Crypto modules depend on utils module
-#
# CONFIG_MODULE_AES is not set
# CONFIG_MODULE_AES_CTR is not set
# CONFIG_MODULE_MD5 is not set
# CONFIG_MODULE_AES is not set
# CONFIG_MODULE_AES_CTR is not set
# CONFIG_MODULE_MD5 is not set
@@
-223,20
+203,12
@@
CONFIG_MODULE_SCHEDULER_TIMER0=y
#
# Encodings modules
#
#
# Encodings modules
#
-
-#
-# Encoding modules depend on utils module
-#
# CONFIG_MODULE_BASE64 is not set
# CONFIG_MODULE_HAMMING is not set
#
# Debug modules
#
# CONFIG_MODULE_BASE64 is not set
# CONFIG_MODULE_HAMMING is not set
#
# Debug modules
#
-
-#
-# Debug modules depend on utils module
-#
# CONFIG_MODULE_DIAGNOSTIC is not set
# CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set
CONFIG_MODULE_ERROR=y
# CONFIG_MODULE_DIAGNOSTIC is not set
# CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set
CONFIG_MODULE_ERROR=y
diff --git
a/projects/microb2010/tests/tourel_beacon/graph.py
b/projects/microb2010/tests/tourel_beacon/graph.py
index
f1e175e
..
af8edf8
100644
(file)
--- a/
projects/microb2010/tests/tourel_beacon/graph.py
+++ b/
projects/microb2010/tests/tourel_beacon/graph.py
@@
-253,13
+253,13
@@
def graph(filename, real_x, real_y, real_a):
def do_random_test():
random.seed(0)
def do_random_test():
random.seed(0)
- for i in range(
21
):
+ for i in range(
100
):
print "---- random %d"%i
x = random.randint(0, 3000)
y = random.randint(0, 2100)
a = random.random()*2*math.pi
print "---- random %d"%i
x = random.randint(0, 3000)
y = random.randint(0, 2100)
a = random.random()*2*math.pi
- graph("test%d.png"%i, x, y, a)
- graph_da("test_da%d.png"%i, x, y, a)
+ graph("
angle/
test%d.png"%i, x, y, a)
+ graph_da("
da/
test_da%d.png"%i, x, y, a)
def do_graph_2d(data, filename, title):
# Make plot with vertical (default) colorbar
def do_graph_2d(data, filename, title):
# Make plot with vertical (default) colorbar
@@
-310,7
+310,7
@@
def do_graph_2d_simple_error():
else:
title = 'Erreur de position en mm, pour une erreur\n'
title += 'de mesure de %s deg sur les 3 balises'%(j)
else:
title = 'Erreur de position en mm, pour une erreur\n'
title += 'de mesure de %s deg sur les 3 balises'%(j)
- do_graph_2d(data, "error_a%d_%s.png"%(i,j), title)
+ do_graph_2d(data, "
simple_error/
error_a%d_%s.png"%(i,j), title)
def do_graph_2d_ad_error():
for d in ["0.0", "0.1", "0.5"]:
def do_graph_2d_ad_error():
for d in ["0.0", "0.1", "0.5"]:
@@
-320,7
+320,7
@@
def do_graph_2d_ad_error():
data = get_data("./main da_error %s %s %s"%(i, d, a))
title = 'Erreur de position en mm, pour une erreur\n'
title += "d'angle de %s deg et dist de %s %% (algo %s)"%(a, d, i)
data = get_data("./main da_error %s %s %s"%(i, d, a))
title = 'Erreur de position en mm, pour une erreur\n'
title += "d'angle de %s deg et dist de %s %% (algo %s)"%(a, d, i)
- do_graph_2d(data, "error_da_%s_%s_%s.png"%(i, d, a), title)
+ do_graph_2d(data, "
da_error/
error_da_%s_%s_%s.png"%(i, d, a), title)
def do_graph_2d_move_error():
i = 0
def do_graph_2d_move_error():
i = 0
@@
-331,7
+331,7
@@
def do_graph_2d_move_error():
while angle_deg < 360:
angle_rad = angle_deg * (math.pi/180.)
data = get_data("./main move_error %f %f %f"%(speed, period, angle_rad))
while angle_deg < 360:
angle_rad = angle_deg * (math.pi/180.)
data = get_data("./main move_error %f %f %f"%(speed, period, angle_rad))
- do_graph_2d(data, "error_move_error_%d.png"%(i),
+ do_graph_2d(data, "
move_error/
error_move_error_%d.png"%(i),
'Erreur de mesure si le robot se deplace a %2.2f m/s\n'
'vers %d deg (periode tourelle = %d ms)'%(speed, angle_deg, period))
angle_deg += 45
'Erreur de mesure si le robot se deplace a %2.2f m/s\n'
'vers %d deg (periode tourelle = %d ms)'%(speed, angle_deg, period))
angle_deg += 45