hostsim enhancements, some bugs remaining (freeze sometimes)

[aversive.git] / projects / microb2010 / tests / hostsim / cs.c

diff --git a/projects/microb2010/tests/hostsim/cs.c b/projects/microb2010/tests/hostsim/cs.c
index 8632a23..c2d0ff4 100644 (file)
--- a/projects/microb2010/tests/hostsim/cs.c
+++ b/projects/microb2010/tests/hostsim/cs.c
@@ -43,6 +43,8 @@
 #include <rdline.h>
 
 #include "robotsim.h"
 #include <rdline.h>
 
 #include "robotsim.h"

+#include "strat.h"
+#include "actuator.h"

 #include "main.h"
 
 /* called every 5 ms */
 #include "main.h"
 
 /* called every 5 ms */


@@ -88,11 +90,11 @@ static void do_cs(void *dummy)
                 * compensation) */
                position_manage(&mainboard.pos);
        }
                 * compensation) */
                position_manage(&mainboard.pos);
        }

-#if 0

        if (mainboard.flags & DO_BD) {
                bd_manage_from_cs(&mainboard.angle.bd, &mainboard.angle.cs);
                bd_manage_from_cs(&mainboard.distance.bd, &mainboard.distance.cs);
        }
        if (mainboard.flags & DO_BD) {
                bd_manage_from_cs(&mainboard.angle.bd, &mainboard.angle.cs);
                bd_manage_from_cs(&mainboard.distance.bd, &mainboard.distance.cs);
        }

+#if 0

        if (mainboard.flags & DO_TIMER) {
                uint8_t second;
                /* the robot should stop correctly in the strat, but
        if (mainboard.flags & DO_TIMER) {
                uint8_t second;
                /* the robot should stop correctly in the strat, but


@@ -152,8 +154,8 @@ void microb_cs_init(void)
 {
        /* ROBOT_SYSTEM */
        rs_init(&mainboard.rs);
 {
        /* ROBOT_SYSTEM */
        rs_init(&mainboard.rs);

-       rs_set_left_pwm(&mainboard.rs, robotsim_pwm, LEFT_PWM);
-       rs_set_right_pwm(&mainboard.rs,  robotsim_pwm, RIGHT_PWM);
+       rs_set_left_pwm(&mainboard.rs, pwm_set_and_save, LEFT_PWM);
+       rs_set_right_pwm(&mainboard.rs,  pwm_set_and_save, RIGHT_PWM);

        /* increase gain to decrease dist, increase left and it will turn more left */
        rs_set_left_ext_encoder(&mainboard.rs, robotsim_encoder_get,
                                LEFT_ENCODER, IMP_COEF);
        /* increase gain to decrease dist, increase left and it will turn more left */
        rs_set_left_ext_encoder(&mainboard.rs, robotsim_encoder_get,
                                LEFT_ENCODER, IMP_COEF);