Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1215 → Rev 1214

/demos/trunk/loader/loader.c
411,7 → 411,6
nrt_task_def_ctrl_jet(nrt);
nrt_task_def_level(nrt,current->task_level);
nrt_task_def_group(nrt,total_group);
nrt_task_def_usemath(nrt);
 
sprintf(tmp,"NRT %d:%d",current->group,i);
p = task_create(tmp,nrt_test_task,&nrt,NULL);
433,7 → 432,6
nrt_task_def_ctrl_jet(nrt);
nrt_task_def_level(nrt,current->task_level);
nrt_task_def_group(nrt,total_group);
nrt_task_def_usemath(nrt);
 
sprintf(tmp,"BACK %d:%d",current->group,i);
p = task_create(tmp,back_task,&nrt,NULL);
455,7 → 453,6
hard_task_def_ctrl_jet(ht);
hard_task_def_level(ht,current->task_level);
hard_task_def_group(ht,total_group);
hard_task_def_usemath(ht);
 
if (current->act_type != PAR_ACT_PERIODIC) {
hard_task_def_mit(ht,TIMESPEC2USEC(&current->deadline));
489,7 → 486,6
soft_task_def_ctrl_jet(st);
soft_task_def_level(st,current->task_level);
soft_task_def_group(st,total_group);
soft_task_def_usemath(st);
 
if (current->act_type == PAR_ACT_PERIODIC) {
soft_task_def_period(st,TIMESPEC2USEC(&current->act_par_2));
527,7 → 523,6
nrt_task_default_model(nrt);
nrt_task_def_save_arrivals(nrt);
nrt_task_def_ctrl_jet(nrt);
nrt_task_def_usemath(nrt);
err = fsf_create_thread(current->server,&j,NULL,back_task,(void *)current,&nrt);
if (err) {
545,7 → 540,6
hard_task_def_ctrl_jet(ht);
hard_task_def_mit(ht,TIMESPEC2USEC(&current->deadline));
hard_task_def_wcet(ht,TIMESPEC2USEC(&current->wcet));
hard_task_def_usemath(ht);
 
err = fsf_create_thread(current->server,&j,NULL,test_task,(void *)current,&ht);
if (err) {
564,7 → 558,6
hard_task_def_mit(ht,TIMESPEC2USEC(&current->deadline));
hard_task_def_wcet(ht,TIMESPEC2USEC(&current->wcet));
hard_task_def_ctrl_jet(ht);
hard_task_def_usemath(ht);
 
err = fsf_create_thread(current->server,&j,NULL,test_task,(void *)current,&ht);
if (err) {
/demos/trunk/servo/leg.c
File deleted
/demos/trunk/servo/leg.h
File deleted
/demos/trunk/servo/servo.c
3,15 → 3,14
#include "drivers/keyb.h"
 
#include "servo.h"
#include "leg.h"
 
int main () {
 
int res;
char ch;
 
servo_open(SERVO_COM2);
/*
servo_open(SERVO_COM2);
 
cprintf("servo_set_RS232_baudrate\n");
res = servo_set_RS232_baudrate(9600);
cprintf("Res = %d\n",res);
23,7 → 22,7
cprintf("servo_store_RS232_baudrate\n");
res = servo_store_RS232_baudrate();
cprintf("Res = %d\n",res);
 
*/
cprintf("servo_set_period\n");
res = servo_set_period(20000);
cprintf("Res = %d\n",res);
79,7 → 78,7
ch = keyb_getch(BLOCK);
 
cprintf("servo_set_levels\n");
res = servo_set_levels(0x00,0x01);
res = servo_set_levels(0x01);
cprintf("Res = %d\n",res);
 
ch = keyb_getch(BLOCK);
121,9 → 120,6
ch = keyb_getch(BLOCK);
 
servo_close();
*/
set_leg_position(8.0,-5.0,0.0);
set_leg_position(8.0,0.0,0.0);
 
return 0;
 
/demos/trunk/servo/initfile.c
57,7 → 57,7
struct multiboot_info *mb = (struct multiboot_info *)arg;
 
EDF_register_level(EDF_ENABLE_ALL);
//CBS_register_level(CBS_ENABLE_ALL, 0);
CBS_register_level(CBS_ENABLE_ALL, 0);
RR_register_level(RRTICK, RR_MAIN_YES, mb);
dummy_register_level();
 
74,7 → 74,7
 
HARTPORT_init();
 
//KEYB_init(NULL);
KEYB_init(NULL);
 
__call_main__(mb);
 
/demos/trunk/servo/makefile
12,5 → 12,5
include $(BASE)/config/example.mk
 
servo:
make -f $(SUBMAKE) APP=servo INIT= OTHEROBJS="initfile.o leg.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __SERVO__"
make -f $(SUBMAKE) APP=servo INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__OLDCHAR__ __SERVO__"