]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
vidle: Initialize fsm positions in a more understandable way
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 28 Apr 2010 23:03:27 +0000 (01:03 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 28 Apr 2010 23:03:27 +0000 (01:03 +0200)
src/eb_vidle/fsm_vidle.c
src/eb_vidle/main.c

index 7529e5c0c9a35b9eaca52bd40697a755304a3cb2..94ba41ed399325df2033719f6817f59e9422c8e1 100644 (file)
@@ -24,6 +24,7 @@ void fsm_vidle_init(struct fsm *fsm, enum event event)
        switch (event) {
        case EVENT_ENTRY:
                DBG_ENTRY();
+               fsm->can_req_position = fsm->act_pos;
                fsm->flags |= CAN_VIDLE_INITIALIZING;
                break;
        case EVENT_DO:
index 80b129fcea49059a4b3dd386ac9585367eea416a..0821690f964c44b51c452e4003b9c9bd2d1da9df 100644 (file)
@@ -296,8 +296,6 @@ int main(void)
 
        init_periphery();
        
-       init_fsm(&fsm_vidle, &fsm_vidle_init);
-
        /* TODO: Add comment FIXME: zkusit smazat, mam moct ze to melo neco spojeneho s chelae z eb09  */
        //SET_PIN(PINSEL1, 1, PINSEL_0);
        //SET_PIN(PINSEL1, 3, PINSEL_0);
@@ -315,7 +313,9 @@ int main(void)
        
        send_rs_str("Vidle started\n");
        // The above send_rs_str is importat - we wait for the first AD conversion to be finished
-       fsm_vidle.can_req_position = adc_val[0];
+       fsm_vidle.act_pos = adc_val[0];
+       init_fsm(&fsm_vidle, &fsm_vidle_init);
+
        
        while(1){
                if(timer_usec >= main_time + 1000)