From aa9ec0683eb4a59e9b644879d8b981702774b0b4 Mon Sep 17 00:00:00 2001 From: StaY <stephane.yang@ensea.fr> Date: Wed, 11 Oct 2023 17:18:03 +0200 Subject: [PATCH] Adjusted some displays in themis scripts --- Promethe_scripts/hardware/cam_usb.hwc | 4 +- .../navigation/cam_f_out/cam_f_out.gcd | 4 +- Promethe_scripts/navigation/drone/drone.gcd | 10 +- Promethe_scripts/navigation/drone/drone.res | Bin 19556 -> 19556 bytes .../navigation/drone/drone.script | 212 +++++++++--------- Promethe_scripts/navigation/drone/drone.symb | 10 +- .../navigation/navigation_flot.net | 6 +- .../navigation/navigation_tracking.net | 6 +- 8 files changed, 126 insertions(+), 126 deletions(-) diff --git a/Promethe_scripts/hardware/cam_usb.hwc b/Promethe_scripts/hardware/cam_usb.hwc index 77760e7..0b24094 100644 --- a/Promethe_scripts/hardware/cam_usb.hwc +++ b/Promethe_scripts/hardware/cam_usb.hwc @@ -11,8 +11,8 @@ type = 7 width = 720 height = 576 - #width = 640 - #height = 480 + %width = 640 + %height = 480 COLOR = 1 AUTOCHECK = 0 THREADING = 1 diff --git a/Promethe_scripts/navigation/cam_f_out/cam_f_out.gcd b/Promethe_scripts/navigation/cam_f_out/cam_f_out.gcd index 47a3ab4..5c9259f 100644 --- a/Promethe_scripts/navigation/cam_f_out/cam_f_out.gcd +++ b/Promethe_scripts/navigation/cam_f_out/cam_f_out.gcd @@ -2,7 +2,7 @@ begin dimensions fenetre1 841 300 0 fenetre2 400 300 0 -image1 671 401 0 +image1 756 617 0 image2 400 300 0 end dimensions groupe = 1 @@ -29,6 +29,6 @@ debug = 1 Begin positions fenetre1 434 78 fenetre2 774 434 -image1 0 333 +image1 0 117 image2 729 434 End positions diff --git a/Promethe_scripts/navigation/drone/drone.gcd b/Promethe_scripts/navigation/drone/drone.gcd index c05cc7f..43e8564 100644 --- a/Promethe_scripts/navigation/drone/drone.gcd +++ b/Promethe_scripts/navigation/drone/drone.gcd @@ -2,8 +2,8 @@ begin dimensions fenetre1 881 676 0 fenetre2 400 300 0 -image1 612 300 0 -image2 400 300 0 +image1 612 329 0 +image2 610 305 0 end dimensions groupe = 30 p_posx = 24 , p_posy = 28 @@ -294,8 +294,8 @@ groupe = 5 p_posx = 664 , p_posy = 2212 debug = 0 Begin positions -fenetre1 417 55 +fenetre1 475 27 fenetre2 0 677 -image1 745 47 -image2 929 398 +image1 744 27 +image2 748 393 End positions diff --git a/Promethe_scripts/navigation/drone/drone.res b/Promethe_scripts/navigation/drone/drone.res index 310c61b8da289ea2bbecddcd580993274c86aa6e..451e2d104a27fde869ef1bf2f0cd42ce9e555422 100644 GIT binary patch delta 981 zcmYk(y-or_5C`z=v1cMVR8&5cYAX;yAAka<Fq%;F0B7TCFwbxeEtRdwJ;A($ogpZS z8Wk0_b`IIysdj$(|K~ok)1jIU)%8W7OXK-XLd{x&f$<;-l@kdt%B!6ebCXb4+!NM~ zu3C_U%8LXTx3mAZrkIbF9<P+B$asJRMkdT^{p2d@gm=qn7IkzsEk7R$#sejYac^sC zLjWXDf*4b`vnc=)C_#(|x3eVx5-358N4HZHfZ{~YYy#WH10`sCq@QdJcZ>%~s9mF< zZ4D$)f*3Ehrb+@JffB@cbvtE`6v}+JZ#JSz>;YBdfz?>Q+nU;&IHYPnE`)QA`pIRz zqqAvw*;J1`pb_g2mo!EmcwqFWOC(fNB*6HxHIyKMR2}l~EL^W;Jg61xZ<|2dcwjr$ sKQ>WE#sef!f*8N6om3q!YPmr-NT7EX47$ll@0_VK@)@qqH9k-O0HW>JYybcN delta 981 zcmYk(OHKko5C&js=rNHDDyWFE>W!d)Br3k}F{Pp=?Af=8;x+0Fvti51t;w9A_g;d8 z!~=K%dvLnDR$X8Izvhu%OkpvFuh&4l?SJ<ZXg3lHq=)8!B1_QVJ>N;GI1k0dJz-Uf z4-3r!C6=H;xA*_nlu8OjFINJQ^gs@ZWSG^)$!9bOkC)R=G!WUe{Cq4+58}`UC$<J_ z49Gzo+ThgftTP}7acG0S+u2}14&u-TXKts$fR(v8w+U9I2XW}?OkCI+ZAuT#0b5dB z+8S~Yhc>vfHP~iA4&u-T*KVigkz&o<?TwA}j`F~|^q{&Dx3&hmbB7f6R5`pe(Kwkj z2O^u6m#v%116xYOE@{m?=s*f|2?rdq1P$(OjW{$z3T^W{53bjd9=fB%qfM|YJ*cb1 r&?aysJ&=Pqw82xplS1#eQ7ptkf}`i45GV2I#ZY84XPBQW<{bV3H5CpJ diff --git a/Promethe_scripts/navigation/drone/drone.script b/Promethe_scripts/navigation/drone/drone.script index 02d587d..2fffef5 100644 --- a/Promethe_scripts/navigation/drone/drone.script +++ b/Promethe_scripts/navigation/drone/drone.script @@ -9,7 +9,7 @@ groupe = f_display_frame_rate posx = 1133 , posy = 105 reverse = -2 p_posx = 24 , p_posy = 28 -debug = 0 +debug = -4 ech_temps = 0 % @@ -21,8 +21,8 @@ type2 = 0 groupe = f_out posx = 1270 , posy = 156 reverse = -1 -p_posx = 20 , p_posy = 202 -debug = 1 +p_posx = 184 , p_posy = 28 +debug = -3 ech_temps = 0 % @@ -34,8 +34,8 @@ type2 = 0 groupe = f_in posx = 976 , posy = 105 reverse = -1 -p_posx = 145 , p_posy = 28 -debug = 1 +p_posx = 344 , p_posy = 28 +debug = -3 ech_temps = 0 % @@ -48,7 +48,7 @@ groupe = f_sum_no_seuil posx = 1164 , posy = 209 reverse = 0 p_posx = 504 , p_posy = 28 -debug = 1 +debug = -4 ech_temps = 0 % @@ -61,7 +61,7 @@ groupe = f_display_image_activity posx = 1224 , posy = 385 reverse = -2 p_posx = 664 , p_posy = 28 -debug = 0 +debug = -4 ech_temps = 0 % @@ -74,7 +74,7 @@ groupe = f_out posx = 1074 , posy = 777 reverse = 0 p_posx = 824 , p_posy = 28 -debug = 1 +debug = -4 ech_temps = 0 % @@ -87,7 +87,7 @@ groupe = f_out posx = 1083 , posy = 342 reverse = 0 p_posx = 984 , p_posy = 28 -debug = 1 +debug = -4 ech_temps = 0 % @@ -100,7 +100,7 @@ groupe = f_display_image_activity posx = 1182 , posy = 593 reverse = -2 p_posx = 24 , p_posy = 196 -debug = 0 +debug = -4 ech_temps = 0 % @@ -113,7 +113,7 @@ groupe = f_concatenation posx = 976 , posy = 877 reverse = 0 p_posx = 184 , p_posy = 196 -debug = 1 +debug = -4 ech_temps = 0 % @@ -126,7 +126,7 @@ groupe = f_concatenation posx = 976 , posy = 270 reverse = 0 p_posx = 344 , p_posy = 196 -debug = 1 +debug = -4 ech_temps = 0 % @@ -139,7 +139,7 @@ groupe = f_sum_no_seuil posx = 1043 , posy = 542 reverse = 0 p_posx = 504 , p_posy = 196 -debug = 1 +debug = -4 ech_temps = 0 % @@ -152,7 +152,7 @@ groupe = f_sum_no_seuil posx = 928 , posy = 169 reverse = 0 p_posx = 664 , p_posy = 196 -debug = 1 +debug = -4 ech_temps = 0 % @@ -164,8 +164,8 @@ type2 = 0 groupe = f_start posx = 970 , posy = 39 reverse = 1 -p_posx = 986 , p_posy = 200 -debug = 0 +p_posx = 824 , p_posy = 196 +debug = -4 ech_temps = 1 % @@ -178,7 +178,7 @@ groupe = f_load_mask posx = 856 , posy = 39 reverse = 1 p_posx = 984 , p_posy = 196 -debug = 0 +debug = -4 ech_temps = 1 % @@ -191,7 +191,7 @@ groupe = f_multiply posx = 860 , posy = 225 reverse = 0 p_posx = 24 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -204,7 +204,7 @@ groupe = threshold posx = 856 , posy = 737 reverse = 0 p_posx = 184 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -217,7 +217,7 @@ groupe = threshold posx = 856 , posy = 808 reverse = 0 p_posx = 344 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -230,7 +230,7 @@ groupe = threshold posx = 856 , posy = 877 reverse = 0 p_posx = 504 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -243,7 +243,7 @@ groupe = f_sum_no_seuil posx = 813 , posy = 290 reverse = 0 p_posx = 664 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -256,7 +256,7 @@ groupe = f_multiply posx = 947 , posy = 616 reverse = 0 p_posx = 824 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -269,7 +269,7 @@ groupe = f_multiply posx = 947 , posy = 512 reverse = 0 p_posx = 984 , p_posy = 364 -debug = 1 +debug = -4 ech_temps = 0 % @@ -282,7 +282,7 @@ groupe = f_multiply posx = 947 , posy = 572 reverse = 0 p_posx = 24 , p_posy = 532 -debug = 1 +debug = -4 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -295,7 +295,7 @@ groupe = f_display_image_activity posx = 890 , posy = 347 reverse = -2 p_posx = 184 , p_posy = 532 -debug = 0 +debug = -4 ech_temps = 0 % @@ -307,8 +307,8 @@ type2 = 0 groupe = f_bias posx = 867 , posy = 453 reverse = 0 -p_posx = 499 , p_posy = 536 -debug = 0 +p_posx = 344 , p_posy = 532 +debug = -4 ech_temps = 1 % @@ -321,7 +321,7 @@ groupe = f_bias posx = 867 , posy = 675 reverse = 0 p_posx = 504 , p_posy = 532 -debug = 0 +debug = -4 ech_temps = 1 % @@ -334,7 +334,7 @@ groupe = threshold_mask posx = 848 , posy = 616 reverse = 0 p_posx = 664 , p_posy = 532 -debug = 1 +debug = -4 ech_temps = 0 % @@ -347,7 +347,7 @@ groupe = mask posx = 848 , posy = 572 reverse = 0 p_posx = 824 , p_posy = 532 -debug = 1 +debug = -4 ech_temps = 0 % @@ -360,7 +360,7 @@ groupe = mask posx = 848 , posy = 512 reverse = 0 p_posx = 984 , p_posy = 532 -debug = 1 +debug = -4 ech_temps = 0 % @@ -373,7 +373,7 @@ groupe = f_checkbox posx = 673 , posy = 224 reverse = 0 p_posx = 24 , p_posy = 700 -debug = 1 +debug = -4 ech_temps = 0 % @@ -386,7 +386,7 @@ groupe = f_display_image_activity posx = 713 , posy = 672 reverse = -2 p_posx = 184 , p_posy = 700 -debug = 0 +debug = -4 ech_temps = 0 % @@ -400,7 +400,7 @@ groupe = ??? posx = 607 , posy = 808 reverse = 0 p_posx = 344 , p_posy = 700 -debug = 1 +debug = -4 ech_temps = 0 % @@ -414,7 +414,7 @@ groupe = ??? posx = 607 , posy = 737 reverse = 0 p_posx = 504 , p_posy = 700 -debug = 1 +debug = -4 ech_temps = 0 % @@ -427,7 +427,7 @@ groupe = f_sum_no_seuil posx = 567 , posy = 171 reverse = -1 p_posx = 664 , p_posy = 700 -debug = 1 +debug = -3 ech_temps = 0 % @@ -440,7 +440,7 @@ groupe = f_sum_no_seuil posx = 550 , posy = 290 reverse = 0 p_posx = 824 , p_posy = 700 -debug = 1 +debug = -4 ech_temps = 0 % @@ -453,7 +453,7 @@ groupe = f_sum_no_seuil posx = 725 , posy = 579 reverse = -1 p_posx = 984 , p_posy = 700 -debug = 1 +debug = -3 ech_temps = 0 % @@ -466,7 +466,7 @@ groupe = f_bias posx = 550 , posy = 848 reverse = 0 p_posx = 24 , p_posy = 868 -debug = 0 +debug = -4 ech_temps = 1 % @@ -479,7 +479,7 @@ groupe = f_bias posx = 550 , posy = 697 reverse = 0 p_posx = 184 , p_posy = 868 -debug = 0 +debug = -4 ech_temps = 1 % @@ -492,7 +492,7 @@ groupe = f_bias posx = 507 , posy = 39 reverse = 0 p_posx = 344 , p_posy = 868 -debug = 0 +debug = -4 ech_temps = 1 % @@ -505,7 +505,7 @@ groupe = f_display_image_activity posx = 498 , posy = 356 reverse = -2 p_posx = 504 , p_posy = 868 -debug = 0 +debug = -4 ech_temps = 0 % @@ -518,7 +518,7 @@ groupe = f_display_image_activity posx = 715 , posy = 441 reverse = -2 p_posx = 664 , p_posy = 868 -debug = 0 +debug = -4 ech_temps = 0 % @@ -531,7 +531,7 @@ groupe = f_sum_no_seuil posx = 411 , posy = 356 reverse = -2 p_posx = 824 , p_posy = 868 -debug = 1 +debug = -4 ech_temps = 0 % @@ -544,7 +544,7 @@ groupe = f_display_image_activity posx = 497 , posy = 230 reverse = -2 p_posx = 984 , p_posy = 868 -debug = 0 +debug = -3 ech_temps = 0 % @@ -557,7 +557,7 @@ groupe = f_sum_no_seuil posx = 597 , posy = 482 reverse = -2 p_posx = 24 , p_posy = 1036 -debug = 1 +debug = -3 ech_temps = 0 % @@ -570,7 +570,7 @@ groupe = f_sum_no_seuil posx = 384 , posy = 426 reverse = -2 p_posx = 184 , p_posy = 1036 -debug = 1 +debug = -3 ech_temps = 0 % @@ -583,7 +583,7 @@ groupe = f_display_image_activity posx = 791 , posy = 403 reverse = -2 p_posx = 344 , p_posy = 1036 -debug = 0 +debug = -4 ech_temps = 0 % @@ -596,7 +596,7 @@ groupe = OR posx = 379 , posy = 991 reverse = -2 p_posx = 504 , p_posy = 1036 -debug = 1 +debug = -4 ech_temps = 0 % @@ -609,7 +609,7 @@ groupe = f_vue_metres posx = 351 , posy = 261 reverse = 0 p_posx = 664 , p_posy = 1036 -debug = 1 +debug = -4 ech_temps = 0 % @@ -622,7 +622,7 @@ groupe = f_in posx = 351 , posy = 321 reverse = 0 p_posx = 824 , p_posy = 1036 -debug = 1 +debug = -4 ech_temps = 0 % @@ -635,7 +635,7 @@ groupe = f_in posx = 240 , posy = 424 reverse = -1 p_posx = 984 , p_posy = 1036 -debug = 1 +debug = -3 ech_temps = 0 % @@ -648,7 +648,7 @@ groupe = f_sum_no_seuil posx = 356 , posy = 684 reverse = 0 p_posx = 24 , p_posy = 1204 -debug = 1 +debug = -4 ech_temps = 0 % @@ -661,7 +661,7 @@ groupe = f_in posx = 240 , posy = 479 reverse = -1 p_posx = 184 , p_posy = 1204 -debug = 1 +debug = -3 ech_temps = 0 % @@ -674,7 +674,7 @@ groupe = f_checkbox posx = 291 , posy = 1017 reverse = -2 p_posx = 344 , p_posy = 1204 -debug = 1 +debug = -4 ech_temps = 0 % @@ -687,7 +687,7 @@ groupe = f_in posx = 291 , posy = 967 reverse = -2 p_posx = 504 , p_posy = 1204 -debug = 1 +debug = -4 ech_temps = 0 % @@ -698,9 +698,9 @@ simulation speed = 1.000000 type2 = 0 groupe = f_joystick_buttons_to_neurons posx = 291 , posy = 877 -reverse = 0 +reverse = -1 p_posx = 664 , p_posy = 1204 -debug = 1 +debug = -3 ech_temps = 0 % @@ -713,7 +713,7 @@ groupe = f_joystick_axe_to_single_neuron posx = 296 , posy = 772 reverse = 0 p_posx = 824 , p_posy = 1204 -debug = 1 +debug = -4 ech_temps = 0 %avant/arrière [0-1] | gauche/droite [0-1] | tourne gauche/tourne droite [0-1] | haut/bas [0-1] @@ -726,7 +726,7 @@ groupe = f_joystick_axe_to_single_neuron posx = 291 , posy = 171 reverse = -1 p_posx = 984 , p_posy = 1204 -debug = 1 +debug = -3 ech_temps = 0 % @@ -739,7 +739,7 @@ groupe = f_bias posx = 43 , posy = 684 reverse = 0 p_posx = 24 , p_posy = 1372 -debug = 0 +debug = -4 ech_temps = 1 % @@ -747,12 +747,12 @@ groupe = 12 , type = 29 , nbre neurones = 1 , seuil = 0.000000 taillex = 1 , tailley = 1 learning rate = 1.000000 simulation speed = 1.000000 -type2 = 10000 +type2 = 0 groupe = mon_token posx = 141 , posy = 341 reverse = 0 p_posx = 184 , p_posy = 1372 -debug = 1 +debug = -4 ech_temps = 0 % @@ -765,7 +765,7 @@ groupe = f_debut posx = 46 , posy = 341 reverse = 0 p_posx = 344 , p_posy = 1372 -debug = 0 +debug = -4 ech_temps = 1 % @@ -778,7 +778,7 @@ groupe = f_clock posx = 134 , posy = 281 reverse = 1 p_posx = 504 , p_posy = 1372 -debug = 1 +debug = -4 ech_temps = 0 % @@ -791,7 +791,7 @@ groupe = f_joystick posx = 231 , posy = 281 reverse = 0 p_posx = 664 , p_posy = 1372 -debug = 1 +debug = -4 ech_temps = 0 % @@ -804,7 +804,7 @@ groupe = f_in posx = 291 , posy = 1096 reverse = 0 p_posx = 824 , p_posy = 1372 -debug = 0 +debug = -4 ech_temps = 0 % @@ -817,7 +817,7 @@ groupe = f_in posx = 291 , posy = 1155 reverse = 0 p_posx = 984 , p_posy = 1372 -debug = 1 +debug = -4 ech_temps = 0 % @@ -830,7 +830,7 @@ groupe = f_in posx = 289 , posy = 1213 reverse = 0 p_posx = 24 , p_posy = 1540 -debug = 0 +debug = -4 ech_temps = 0 % @@ -843,7 +843,7 @@ groupe = f_display_image_activity posx = 602 , posy = 1098 reverse = -2 p_posx = 184 , p_posy = 1540 -debug = 0 +debug = -4 ech_temps = 0 % @@ -856,7 +856,7 @@ groupe = f_in posx = 286 , posy = 1360 reverse = 0 p_posx = 344 , p_posy = 1540 -debug = 1 +debug = -4 ech_temps = 0 % @@ -869,7 +869,7 @@ groupe = f_display_image_activity posx = 602 , posy = 1158 reverse = -2 p_posx = 504 , p_posy = 1540 -debug = 0 +debug = -4 ech_temps = 0 % @@ -882,7 +882,7 @@ groupe = f_display_image_activity posx = 606 , posy = 1220 reverse = -2 p_posx = 664 , p_posy = 1540 -debug = 0 +debug = -4 ech_temps = 0 % @@ -895,7 +895,7 @@ groupe = f_save_images_to_disk posx = 618 , posy = 1361 reverse = -2 p_posx = 824 , p_posy = 1540 -debug = 0 +debug = -3 ech_temps = 0 % @@ -908,7 +908,7 @@ groupe = f_out posx = 595 , posy = 993 reverse = -2 p_posx = 984 , p_posy = 1540 -debug = 1 +debug = -4 ech_temps = 0 % @@ -921,7 +921,7 @@ groupe = f_in posx = 289 , posy = 1284 reverse = 0 p_posx = 24 , p_posy = 1708 -debug = 1 +debug = -4 ech_temps = 0 % @@ -934,7 +934,7 @@ groupe = f_display_image_activity posx = 604 , posy = 1285 reverse = -2 p_posx = 184 , p_posy = 1708 -debug = 0 +debug = -4 ech_temps = 0 % @@ -947,7 +947,7 @@ groupe = f_sum_no_seuil posx = 732 , posy = 290 reverse = 0 p_posx = 344 , p_posy = 1708 -debug = 1 +debug = -4 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -960,7 +960,7 @@ groupe = f_modulo posx = 630 , posy = 289 reverse = 0 p_posx = 504 , p_posy = 1708 -debug = 1 +debug = -4 ech_temps = 0 % @@ -972,8 +972,8 @@ type2 = 0 groupe = f_bias posx = 637 , posy = 348 reverse = 1 -p_posx = 684 , p_posy = 1738 -debug = 0 +p_posx = 664 , p_posy = 1708 +debug = -4 ech_temps = 1 % @@ -986,7 +986,7 @@ groupe = f_sum_no_seuil posx = 411 , posy = 230 reverse = -114 p_posx = 824 , p_posy = 1708 -debug = 1 +debug = -4 ech_temps = 0 % @@ -999,7 +999,7 @@ groupe = f_display_image_activity posx = 447 , posy = 457 reverse = -100 p_posx = 984 , p_posy = 1708 -debug = 0 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1012,7 +1012,7 @@ groupe = f_sum_no_seuil posx = 517 , posy = 427 reverse = -1 p_posx = 24 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 % @@ -1025,7 +1025,7 @@ groupe = f_display_image_activity posx = 714 , posy = 500 reverse = -107 p_posx = 184 , p_posy = 1876 -debug = 0 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1038,7 +1038,7 @@ groupe = f_checkbox posx = 140 , posy = 534 reverse = -1 p_posx = 344 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1051,7 +1051,7 @@ groupe = f_sum_no_seuil posx = 509 , posy = 563 reverse = -1 p_posx = 504 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1064,7 +1064,7 @@ groupe = front+ posx = 258 , posy = 567 reverse = -1 p_posx = 664 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1077,7 +1077,7 @@ groupe = f_z-1 posx = 206 , posy = 518 reverse = -1 p_posx = 824 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1090,7 +1090,7 @@ groupe = f_multiply posx = 387 , posy = 631 reverse = -1 p_posx = 984 , p_posy = 1876 -debug = 1 +debug = -3 ech_temps = 0 %Delay so that memory is first reset, then added by the new altitude value @@ -1103,7 +1103,7 @@ groupe = f_z-1 posx = 325 , posy = 606 reverse = -1 p_posx = 24 , p_posy = 2044 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1116,7 +1116,7 @@ groupe = f_concatenation posx = 709 , posy = 390 reverse = -1 p_posx = 184 , p_posy = 2044 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1129,7 +1129,7 @@ groupe = f_display_image_activity posx = 437 , posy = 703 reverse = -1 p_posx = 344 , p_posy = 2044 -debug = 0 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1142,7 +1142,7 @@ groupe = f_sum_no_seuil posx = 598 , posy = 547 reverse = -1 p_posx = 504 , p_posy = 2044 -debug = 1 +debug = -3 ech_temps = 0 %display altitude_2 unfiltered (not the mean) @@ -1155,7 +1155,7 @@ groupe = f_sum_no_seuil posx = 627 , posy = 404 reverse = -1 p_posx = 664 , p_posy = 2044 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1167,8 +1167,8 @@ type2 = 0 groupe = f_bias posx = 283 , posy = 511 reverse = -1 -p_posx = 832 , p_posy = 2149 -debug = 0 +p_posx = 824 , p_posy = 2044 +debug = -3 ech_temps = 1 %Les commentaires doivent etre mis ici. @@ -1181,7 +1181,7 @@ groupe = f_sum_no_seuil posx = 343 , posy = 535 reverse = -1 p_posx = 984 , p_posy = 2044 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1194,7 +1194,7 @@ groupe = f_multiply posx = 436 , posy = 541 reverse = -1 p_posx = 24 , p_posy = 2212 -debug = 1 +debug = -3 ech_temps = 0 % @@ -1207,7 +1207,7 @@ groupe = f_checkbox posx = 201 , posy = 134 reverse = -121 p_posx = 184 , p_posy = 2212 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -1219,8 +1219,8 @@ type2 = 0 groupe = f_multiply posx = 1043 , posy = 135 reverse = -1 -p_posx = 360 , p_posy = 45 -debug = 1 +p_posx = 344 , p_posy = 2212 +debug = -3 ech_temps = 0 % @@ -1233,7 +1233,7 @@ groupe = f_out posx = 705 , posy = 104 reverse = -128 p_posx = 504 , p_posy = 2212 -debug = 0 +debug = -4 ech_temps = 0 % @@ -1246,7 +1246,7 @@ groupe = f_out posx = 381 , posy = 925 reverse = -135 p_posx = 664 , p_posy = 2212 -debug = 0 +debug = -4 ech_temps = 0 nombre de liaisons = 132 @@ -1267,7 +1267,7 @@ liaison entre motors et 7 , type = 5 , nbre = 1 , norme = 0.100000 nom = -bpixhawk.control-s1-v proba = 1.000000 %Les commentaires doivent etre mis ici. -liaison entre v_motors et 95 , type = 3 , nbre = 1 , norme = 2.000000 +liaison entre v_motors et 95 , type = 3 , nbre = 1 , norme = 1.000000 temps de memorisation entree= 0.000000 temps de memorisation sortie= 0.000000 mode de calcul = 0 diff --git a/Promethe_scripts/navigation/drone/drone.symb b/Promethe_scripts/navigation/drone/drone.symb index e630f56..5461917 100644 --- a/Promethe_scripts/navigation/drone/drone.symb +++ b/Promethe_scripts/navigation/drone/drone.symb @@ -35,7 +35,7 @@ groupe = f_in posx = 976 , posy = 105 reverse = -1 p_posx = 344 , p_posy = 28 -debug = 1 +debug = -3 ech_temps = 0 % @@ -698,9 +698,9 @@ simulation speed = 1.000000 type2 = 0 groupe = f_joystick_buttons_to_neurons posx = 291 , posy = 877 -reverse = 0 +reverse = -1 p_posx = 664 , p_posy = 1204 -debug = -4 +debug = -3 ech_temps = 0 % @@ -1220,7 +1220,7 @@ groupe = f_multiply posx = 1043 , posy = 135 reverse = -1 p_posx = 344 , p_posy = 2212 -debug = 1 +debug = -3 ech_temps = 0 % @@ -1267,7 +1267,7 @@ liaison entre motors et 7 , type = 5 , nbre = 1 , norme = 0.100000 nom = -bpixhawk.control-s1-v proba = 1.000000 %Les commentaires doivent etre mis ici. -liaison entre v_motors et 95 , type = 3 , nbre = 1 , norme = 2. +liaison entre v_motors et 95 , type = 3 , nbre = 1 , norme = 1. temps de memorisation entree= 0.000000 temps de memorisation sortie= 0.000000 mode de calcul = 0 diff --git a/Promethe_scripts/navigation/navigation_flot.net b/Promethe_scripts/navigation/navigation_flot.net index 59a67f7..0d9f8f2 100644 --- a/Promethe_scripts/navigation/navigation_flot.net +++ b/Promethe_scripts/navigation/navigation_flot.net @@ -12,7 +12,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S1</options> + <options>-S1 -D0 -W8</options> <path> <script>cam_f_out.script</script> <symb>cam_f_out.symb</symb> @@ -36,7 +36,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S1</options> + <options>-S1 -W27</options> <path> <script>flot.script</script> <symb>flot.symb</symb> @@ -60,7 +60,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S1</options> + <options>-S1 -W27</options> <path> <script>drone.script</script> <symb>drone.symb</symb> diff --git a/Promethe_scripts/navigation/navigation_tracking.net b/Promethe_scripts/navigation/navigation_tracking.net index 0334988..5132bfe 100644 --- a/Promethe_scripts/navigation/navigation_tracking.net +++ b/Promethe_scripts/navigation/navigation_tracking.net @@ -12,7 +12,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S1 -D0 -W4</options> + <options>-S1 -D0 -W8</options> <path> <script>cam_f_out.script</script> <symb>cam_f_out.symb</symb> @@ -36,7 +36,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S0</options> + <options>-S0 -D0 -W27</options> <path> <script>tracking.script</script> <symb>tracking.symb</symb> @@ -60,7 +60,7 @@ <keyboard></keyboard> <synchronize_files></synchronize_files> <synchronize_directories></synchronize_directories> - <options>-S1</options> + <options>-S1 -W27</options> <path> <script>drone.script</script> <symb>drone.symb</symb> -- GitLab