Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1397 → Rev 1396

/demos/trunk/chimera/chimera.c
58,7 → 58,6
e.pwm = 7;
event = insert_action_event(&(e));
cprintf("Event num = %d\n",event);
 
ADDUSEC2TIMESPEC(1000000,&(e.time));
 
70,7 → 69,6
e.pwm = 7;
event = insert_action_event(&(e));
cprintf("Event num = %d\n",event);
}
 
/demos/trunk/chimera/send.c
241,18 → 241,18
if (new_pos || new_pwm || new_power) {
changes++;
#ifdef DEBUG_SEND
print_status(n);
#endif
}
}
 
if (!new_pos) {
 
 
#ifdef SERIAL_ON
task_nopreempt();
status.cfg[actual_leg].adc_in = servo_get_analog(COM1, actual_leg);
TRACER_LOGEVENT(FTrace_EVT_ipoint,actual_leg,status.cfg[actual_leg].adc_in);
task_preempt();
#endif
 
sys_gettime(&t);
printf_xy(1,20,WHITE,"(%d) (%d) (%d) (%d) (%d) (%d) ",
/demos/trunk/chimera/action.c
20,8 → 20,7
 
int init_action_event(int number_of_events) {
 
action_event_list = malloc(number_of_events * sizeof(struct action_event));
memset(action_event_list,0,number_of_events * sizeof(struct action_event));
action_event_list = calloc(number_of_events * sizeof(struct action_event),0);
total_events = number_of_events;
 
if (action_event_list != NULL) return 0;