Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 482 → Rev 483

/Riddim/Makefile
1,8 → 1,12
# Makefile for Riddim
#
#
CC=gcc
CFLAGS+=-Wall -g
LDFLAGS+=-g -lusb -lbluetooth -lconfuse
 
riddim: config.o statistics.o fc.o evdev_handler.o bluetooth_handler.o riddim.o lib/x52/x52.o
riddim: config.o statistics.o fc.o joy_handler.o evdev_handler.o bluetooth_handler.o riddim.o lib/x52/x52.o
 
 
clean:
-rm *.o riddim *~ lib/*/*.o
rm -f *.o riddim *~ lib/*/*.o
/Riddim/bluetooth_handler.c
52,7 → 52,7
return 1;
}
 
struct timeval timeout;
//struct timeval timeout;
fd_set readfds, writefds;
int s;
struct sockaddr_rc loc_addr = { 0 }, rem_addr = { 0 };
106,8 → 106,8
// try to accept connection if none yet
if (!bt_host_connected)
{
timeout.tv_sec = 0;
timeout.tv_usec = 100;
// timeout.tv_sec = 0;
// timeout.tv_usec = 100;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_SET(s, &readfds);
114,7 → 114,8
maxfd = s;
printf("waiting for connection\n");
status = select(maxfd + 1, &readfds, &writefds, 0, &timeout);
// status = select(maxfd + 1, &readfds, &writefds, 0, &timeout);
status = select(maxfd + 1, &readfds, &writefds, 0,& (struct timeval) { 0, 100 });
if( status > 0 && FD_ISSET( s, &readfds ) ) {
// incoming connection
client = accept( s, (struct sockaddr*)&rem_addr, &opt );
145,8 → 146,8
int count=0;
int r=0;
 
timeout.tv_sec = 0;
timeout.tv_usec = 100;
// timeout.tv_sec = 0;
//timeout.tv_usec = 100;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_SET(client, &readfds);
153,7 → 154,7
maxfd = client;
printf("waiting for connection\n");
status = select(maxfd + 1, &readfds, 0, 0, &timeout);
//status = select(maxfd + 1, &readfds, 0, 0, &timeout);
if( status >0 )
{
send(mk_fd,"\r",1,0);
/Riddim/bluetooth_handler.h
9,7 → 9,6
#include <bluetooth/hci_lib.h>
 
#include <unistd.h>//for close() for socket
 
#include <stdlib.h>
 
 
22,6 → 21,8
#include <errno.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/time.h>
 
#include <unistd.h>//for close() for socket
 
#include <string.h>
/Riddim/config.c
1,16 → 1,16
#include "config.h"
 
 
char *input_evdev_name;
char *input_joydev_name;
 
char *bluetooth_mac;
char *mk_tty;
 
int mk_socket_port=0;
int loop_delay=0;
 
 
 
double nick_mul=0.3f;
double roll_mul=0.3f;
double gier_mul=0.3f;
22,24 → 22,57
double gier_add=0.3f;
double gas_add=0.3f;
 
int rel_axis_nick;
int rel_axis_roll;
int rel_axis_gier;
int rel_axis_gas;
 
int rel_axis_nick=1;
int rel_axis_roll=0;
int rel_axis_gier=5;
int rel_axis_gas=2;
cfg_bool_t exit_after_init = cfg_false;
 
 
cfg_bool_t exit_after_init = cfg_false;
int input_count=0;
 
 
int parse_config(char* fname)
{
 
 
static cfg_opt_t input_opts[] = {
CFG_STR("name", 0, CFGF_NONE),
 
CFG_FLOAT("nick_mul", 1.0,CFGF_NONE),
CFG_FLOAT("roll_mul", 1.0,CFGF_NONE),
CFG_FLOAT("gier_mul", 1.0,CFGF_NONE),
CFG_FLOAT("gas_mul", 1.0,CFGF_NONE),
 
CFG_FLOAT("nick_add", 0,CFGF_NONE),
CFG_FLOAT("roll_add", 0,CFGF_NONE),
CFG_FLOAT("gier_add", 0,CFGF_NONE),
CFG_FLOAT("gas_add", 0,CFGF_NONE),
CFG_INT("rel_axis_nick", -1,CFGF_NONE),
CFG_INT("rel_axis_roll", -1,CFGF_NONE),
CFG_INT("rel_axis_gier", -1,CFGF_NONE),
CFG_INT("rel_axis_gas", -1,CFGF_NONE),
 
CFG_INT("nick_up_btn", -1,CFGF_NONE),
CFG_INT("nick_down_btn", -1,CFGF_NONE),
CFG_INT("roll_left_btn", -1,CFGF_NONE),
CFG_INT("roll_right_btn", -1,CFGF_NONE),
 
 
 
 
 
 
CFG_END()
};
 
cfg_opt_t opts[] = {
CFG_SEC("input", input_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SIMPLE_STR("bluetooth_mac", &bluetooth_mac),
 
CFG_SIMPLE_STR("mk_tty", &mk_tty),
 
CFG_SIMPLE_BOOL("exit_after_init", &exit_after_init),
CFG_SIMPLE_STR("input_evdev", &input_evdev_name),
CFG_SIMPLE_STR("input_joydev", &input_joydev_name),
60,9 → 93,6
CFG_SIMPLE_INT("rel_axis_roll", &rel_axis_roll),
CFG_SIMPLE_INT("rel_axis_gier", &rel_axis_gier),
CFG_SIMPLE_INT("rel_axis_gas", &rel_axis_gas),
 
 
 
CFG_END()
};
77,5 → 107,62
cfg_parse(cfg,fname);
 
 
input_count=cfg_size(cfg,"input");
printf("%d inputs configured\n", input_count);
int i;
int act_input=0;
for (i=0;i<input_count;i++)
{
cfg_t *input_sect=cfg_getnsec(cfg,"input",i);
 
 
printf("processing input: %s\n",cfg_getstr( input_sect, "name"));
int evdev_i=0;
for (evdev_i=0;evdev_i<evdevs_count;evdev_i++)
if (!strcmp(cfg_getstr( input_sect, "name"),evdevs[evdev_i].name))
{
sprintf( inputs[act_input].fname,"%s",evdevs[evdev_i].fname);
// todo check lengt
sprintf(inputs[act_input].name,"processing input: %s\n",cfg_getstr( input_sect, "name"));
inputs[act_input].nick_mul=cfg_getfloat(input_sect,"nick_mul");
inputs[act_input].roll_mul=cfg_getfloat(input_sect,"roll_mul");
inputs[act_input].gier_mul=cfg_getfloat(input_sect,"gier_mul");
inputs[act_input].gas_mul=cfg_getfloat(input_sect,"gas_mul");
inputs[act_input].nick_add=cfg_getfloat(input_sect,"nick_add");
inputs[act_input].roll_add=cfg_getfloat(input_sect,"roll_add");
inputs[act_input].gier_add=cfg_getfloat(input_sect,"gier_add");
inputs[act_input].gas_add=cfg_getfloat(input_sect,"gas_add");
 
 
inputs[act_input].nick_up_btn=cfg_getint(input_sect,"nick_up_btn");
inputs[act_input].nick_down_btn=cfg_getint(input_sect,"nick_down_btn");
 
inputs[act_input].roll_left_btn=cfg_getint(input_sect,"roll_left_btn");
inputs[act_input].roll_right_btn=cfg_getint(input_sect,"roll_right_btn");
 
 
inputs[act_input].rel_axis_nick=cfg_getint(input_sect,"rel_axis_nick");
inputs[act_input].rel_axis_roll=cfg_getint(input_sect,"rel_axis_roll");
 
inputs[act_input].rel_axis_gier=cfg_getint(input_sect,"rel_axis_gier");
inputs[act_input].rel_axis_gas=cfg_getint(input_sect,"rel_axis_gas");
 
 
 
act_input++;
}
 
 
}
 
input_count=act_input;
printf("%d inputs matching\n", input_count);
return 0;
}
 
 
/Riddim/config.h
1,7 → 1,11
#if !defined(CONFIG_H)
#define CONFIG_H
 
 
#define MAX_INPUTS 5
 
#include <confuse.h>
#include "evdev_handler.h"
 
// values from config
extern char *input_evdev_name;
8,6 → 12,7
extern char *input_joydev_name;
extern char *bluetooth_mac;
extern int mk_socket_port;
extern char *mk_tty;
extern int loop_delay;
 
extern double nick_mul;
29,7 → 34,51
extern cfg_bool_t exit_after_init ;
 
 
extern int input_count;
struct {
 
 
int *evdev_rel_axis;
char *evdev_button;
 
double nick_mul;
double roll_mul;
double gier_mul;
double gas_mul;
 
double nick_add;
double roll_add;
double gier_add;
double gas_add;
 
int rel_axis_nick;
int rel_axis_roll;
int rel_axis_gier;
int rel_axis_gas;
 
 
 
int nick_up_btn;
int nick_down_btn;
 
int roll_left_btn;
int roll_right_btn;
 
char name[255];
char fname[255];
 
 
int evdev_id;
 
 
 
int evdev_out_fd;
int evdev_in_fd;
 
} inputs[MAX_INPUTS];
 
 
int parse_config(char* fname);
 
 
#endif
/Riddim/definitions.h
0,0 → 1,0
#define MAX_INPUTS=2
/Riddim/evdev_handler.c
1,7 → 1,6
#include "evdev_handler.h"
#include "config.h"
 
int evdev_fd;
int evdev_out_fd;
int retval;
size_t read_bytes; /* how many bytes were read */
struct input_event ev[64]; /* the events (up to 64 at once) */
9,16 → 8,118
 
 
 
int *evdev_rel_axis=NULL;
char *evdev_button=NULL;
 
int counter;
 
int connect_evdev(char* input_evdev_name)
int evdevs_count=0;
int file_select(struct direct *entry)
{
if ((strncmp(entry->d_name, "event",5))==0)
return (TRUE);
else
return(FALSE);
}
 
 
void collect_evdev_devices()
{
 
char event_dev_path[]="/dev/input/";
struct direct **files;
evdevs_count = scandir(event_dev_path, &files, file_select, NULL);
 
printf("%d inputs found in %s\n" , evdevs_count,event_dev_path);
 
int i=0;
for (i=1;i<evdevs_count+1;++i)
{
 
printf("%s",files[i-1]->d_name);
sprintf(evdevs[i].fname,"%s%s",event_dev_path,files[i-1]->d_name);
int act_fd;
 
if ((act_fd = open(evdevs[i].fname, O_RDONLY)) < 0)
{
printf(" cant open %s for reading!",evdevs[i].name);
}
else
{
if(ioctl(act_fd , EVIOCGNAME(sizeof(evdevs[i].name)), evdevs[i].name) < 0) {
perror("evdev ioctl");
}
printf("EVDEV reports name: %s\n", evdevs[i].name);
close(act_fd);
}
 
 
/*
FILE *fp=NULL ;
 
sprintf(evdevs[i].fname,"/sys/class/input/%s/name",files[i-1]->d_name);
fp = fopen ( evdevs[i].fname, "r") ;
 
if (fp==NULL)
{
printf("cannot read %s\n",evdevs[i].fname);
// exit(1);
}
int ch=-2;
int str_pos=0;
while ( (ch!=-1) && (ch!='\n') )
{
 
ch = fgetc ( fp ) ;
if ((ch!=13)&&(ch!=10))evdevs[i].name[str_pos++]=ch;
printf("%c",ch);
}
 
fclose(fp);
evdevs[i].name[str_pos++]=0;
*/
 
}
}
 
 
void print_event_str(int id)
{
switch ( id)
{
case EV_KEY :
printf("Keys or Button\n");
break;
case EV_ABS :
printf("Absolute Axis\n");
break;
case EV_LED :
printf("LED(s)\n");
break;
case EV_REP :
printf("Repeat\n");
break;
case EV_SYN :
printf("Sync?\n");
break;
case EV_REL :
printf("Relative Axis\n");
break;
case EV_MSC :
printf("Misc\n");
break;
default:
printf("Unknown event type ( 0x%04hx)\n", id);
}
return "";
}
 
int connect_evdev()
{
evdev_rel_axis = (int *) calloc( 100, sizeof( int ) );
evdev_button = (char *)calloc( 100, sizeof( char ) );
 
 
struct input_devinfo {
uint16_t bustype;
uint16_t vendor;
27,82 → 128,51
};
struct input_devinfo device_info;
 
if ((evdev_out_fd = open(input_evdev_name, O_WRONLY)) < 0)
int i;
for ( i =0 ; i< input_count;i++)
{
printf(" cant open %s for writing\n",input_evdev_name);
}
inputs[i].evdev_rel_axis = (int *) calloc( 100, sizeof( int ) );
inputs[i].evdev_button = (char *)calloc( 500, sizeof( char ) );
 
if ((evdev_fd = open(input_evdev_name, O_RDONLY)) < 0)
{
printf(" cant open %s for reading!",input_evdev_name);
return 0;
}
if ((inputs[i].evdev_out_fd = open(inputs[i].fname, O_WRONLY)) < 0)
{
printf(" cant open %s for writing\n",inputs[i].fname);
}
 
if ((inputs[i].evdev_in_fd = open(inputs[i].fname, O_RDONLY)) < 0)
{
printf(" cant open %s for reading!",inputs[i].fname);
return 0;
}
ioctl(evdev_fd,EVIOCGID,&device_info);
ioctl(inputs[i].evdev_in_fd ,EVIOCGID,&device_info);
printf("vendor 0x%04hx product 0x%04hx version 0x%04hx \n",
device_info.vendor, device_info.product,
device_info.version);
printf("vendor 0x%04hx product 0x%04hx version 0x%04hx \n",
device_info.vendor, device_info.product,
device_info.version);
 
 
char name[256]= "Unknown";
 
if(ioctl(evdev_fd, EVIOCGNAME(sizeof(name)), name) < 0) {
perror("evdev ioctl");
}
 
printf("EVDEV reports name: %s\n", name);
 
/* this macro is used to tell if "bit" is set in "array"
* it selects a byte from the array, and does a boolean AND
* operation with a byte that only has the relevant bit set.
* eg. to check for the 12th bit, we do (array[1] & 1<<4)
*/
 
 
uint8_t evtype_bitmask[EV_MAX/8 + 1];
 
if(ioctl(evdev_fd, EVIOCGBIT(0, sizeof(evtype_bitmask)), evtype_bitmask) < 0)
perror("evdev ioctl");
 
printf("Supported event types:\n");
 
int i;
for (i = 0; i < EV_MAX; i++) {
if (test_bit(i, evtype_bitmask)) {
/* this means that the bit is set in the event types list */
printf(" Event type 0x%02x ", i);
switch ( i)
{
case EV_KEY :
printf(" (Keys or Buttons)\n");
break;
case EV_ABS :
printf(" (Absolute Axes)\n");
break;
case EV_LED :
printf(" (LEDs)\n");
break;
case EV_REP :
printf(" (Repeat)\n");
break;
case EV_SYN :
printf(" (Sync?)\n");
break;
case EV_REL :
printf(" (Relative Axis)\n");
break;
case EV_MSC :
printf(" (Misc)\n");
break;
default:
printf(" (Unknown event type: 0x%04hx)\n", i);
}}}
 
uint8_t evtype_bitmask[EV_MAX/8 + 1];
if(ioctl(inputs[i].evdev_in_fd , EVIOCGBIT(0, sizeof(evtype_bitmask)), evtype_bitmask) < 0)
perror("evdev ioctl");
printf("Supported event types:\n");
int i;
for (i = 0; i < EV_MAX; i++) {
if (test_bit(i, evtype_bitmask)) {
/* this means that the bit is set in the event types list */
printf(" Event type 0x%02x ", i);
print_event_str(i);
}}
}
return 1;
}
 
/*
int init_evdevstatus_led()
{
led_event.type=EV_LED;
120,7 → 190,7
{
if (led_event.value)
led_event.value = 0;
else
else
led_event.value = 1 ;
retval = write(evdev_out_fd, &led_event, sizeof(struct input_event));
127,54 → 197,59
}
return 1;
}
*/
 
int poll_evdev()
{
 
struct timeval tv;
 
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(evdev_fd,&rfds);
 
tv.tv_sec = 0;
tv.tv_usec = 5;
retval = select(evdev_fd+1, &rfds, NULL, NULL, &tv);
if (retval==-1)
printf("error in select!!!!!!!!\n");
else if (retval)
printf("polling evdev\n");
int i;
for ( i =0 ; i< input_count;i++)
{
read_bytes = read(evdev_fd, ev, sizeof(struct input_event) * 64);
struct timeval tv = {0,5};
if (read_bytes < (int) sizeof(struct input_event)) {
perror("evtest: short read");
exit (1);
}
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(inputs[i].evdev_in_fd,&rfds);
 
for (counter = 0; counter < (int) (read_bytes / sizeof(struct input_event)); counter++)
retval = select(inputs[i].evdev_in_fd+1, &rfds, NULL, NULL, &tv);
if (retval==-1)
printf("error in select!!!!!!!!\n");
else if (retval)
{
read_bytes = read(inputs[i].evdev_in_fd, ev, sizeof(struct input_event) * 64);
if (read_bytes < (int) sizeof(struct input_event)) {
perror("evtest: short read");
exit (1);
printf("%d type:%d code:%d val:%d \n",counter,ev[counter].type,ev[counter].code,ev[counter].value);
 
// if (ev[counter].type==EV_REL) evdev_rel_axis[ ev[counter].code]= ev[counter].value;
// for logitech problem
if (ev[counter].type==EV_REL) evdev_rel_axis[ ev[counter].code]= ev[counter].value;
if (ev[counter].type==EV_KEY) evdev_button[ ev[counter].code-256]= ev[counter].value;
}
for (counter = 0; counter < (int) (read_bytes / sizeof(struct input_event)); counter++)
{
//print_event_str(ev[counter].type);
// printf(" code:%d val:%d \n",ev[counter].code,ev[counter].value);
// if (ev[counter].type==EV_REL) evdev_rel_axis[ ev[counter].code]= ev[counter].value;
// for logitech problem
if (ev[counter].type==EV_REL) inputs[i].evdev_rel_axis[ ev[counter].code]= ev[counter].value;
if (ev[counter].type==EV_KEY) inputs[i].evdev_button[ ev[counter].code]= ev[counter].value;
}
for (counter=0;counter<20;counter++)
printf("A%d %d -" , counter, inputs[i].evdev_rel_axis[counter] );
printf("\n");
for (counter=0;counter<10;counter++)
printf("B%d %d -" , counter, inputs[i].evdev_button[counter] );
// printf("input read done: nick:%d roll:%d gier:%d gas:%d\n",axis[3] , axis[4] , axis[5] , axis[2]);
}
for (counter=0;counter<20;counter++)
printf("A%d %d -" , counter, evdev_rel_axis[counter] );
printf("\n");
for (counter=0;counter<10;counter++)
printf("B%d %d -" , counter, evdev_button[counter] );
// printf("input read done: nick:%d roll:%d gier:%d gas:%d\n",axis[3] , axis[4] , axis[5] , axis[2]);
else
printf("no data from evdev data from evdev: \n");
}
else
printf("no data from evdev data from evdev: \n");
return 1;
}
/Riddim/evdev_handler.h
10,17 → 10,36
#include <linux/joystick.h>
#include <netinet/in.h>
 
#include <sys/types.h>
#include <sys/dir.h>
#include <sys/param.h>
 
#define MAX_EVDEVS 20
 
#define test_bit(bit, array) (array[bit/8] & (1<<(bit%8)))
 
int connect_evdev(char* input_evdev_name);
int connect_evdev();
int blink_evdev_led();
int init_evdevstatus_led();
int poll_evdev();
void collect_evdev_devices();
 
extern int *evdev_rel_axis;
extern char *evdev_button;
 
 
 
typedef struct
{
char name[255];
char fname[255];
} evdevs_t ;
 
evdevs_t evdevs[MAX_EVDEVS];
extern int evdevs_count;
 
 
#define FALSE 0
#define TRUE 1
 
#endif
/Riddim/fc.c
1,14 → 1,15
#include "fc.h"
 
 
unsigned char TxBuffer[150];
unsigned char _TxBuffer[150];
 
unsigned char RxBuffer[150];
char PrintableRxBuffer[150];
unsigned char TxBuffer[MAX_BUFF_LEN];
unsigned char _TxBuffer[MAX_BUFF_LEN];
 
unsigned char RxBuffer[MAX_BUFF_LEN];
char PrintableRxBuffer[MAX_BUFF_LEN];
 
 
 
int mk_socket;
 
int status;
29,6 → 30,7
 
void SendOutData(unsigned char cmd,unsigned char modul, unsigned char *snd, unsigned char len)
{
// return;
int status =0;
unsigned int pt = 0;
unsigned char a,b,c;
115,12 → 117,16
int r=0;
int i=0;
 
int p=0;
printf("starting read\n");
while(in_char!='\n')
while(in_char!='\r')
{
p++;
// printf("b read\n");
count=read(mk_socket,&in_char,1);
//printf("a read %d\n",count);
// if ( count ==-1) exit(0);
printf("a read %d %d %c \n",p,count,in_char);
if (count!=-1)
{
// printf("%c\n",in_char);
149,7 → 155,6
 
int connect_mk_bluetooth(char dest[18])
{
struct sockaddr_rc addr ;
 
// allocate a socket
165,16 → 170,88
 
printf("connection status %d\n",status);
return status;
}
 
 
int connect_mk_tty(char* tty_filename)
{
mk_socket = open(tty_filename,O_RDWR);
 
 
 
struct termios termattr;
speed_t baudRate;
 
/* Make a copy of the termios structure. */
tcgetattr(mk_socket, &termattr);
 
termattr.c_iflag = IGNBRK | IGNPAR;
termattr.c_cflag=CS8 | CREAD | CLOCAL;
// termattr.speed_t=B57600;
 
 
tcsetattr(mk_socket, TCSANOW, &termattr);
 
 
/*
usleep(1000000);
char in_char='#';
int count=0;
int r=0;
int i=0;
 
int p=0;
printf("starting read %d\n",mk_socket);
while (1)
{
p=0;
r=0;
char in_char='#';
while((in_char!='\r'))//&&(r<MAX_BUFF_LEN))
{
// p++;
// printf("b read\n");
count=read(mk_socket,&in_char,1);
// tcflush( mk_socket, TCOFLUSH );
// printf("\np !read %d %d %c \n",p,count,in_char);
 
//count=read(mk_socket,&in_char,1);
// tcflush( mk_socket, TCOFLUSH );
// printf("\np !read %d %d %d %c \n",r,p,count,in_char);
printf("%d %c \n",r, in_char);
if (count==1)
{
// printf("%c\n",in_char);
RxBuffer[r]=in_char;
if (in_char!=0)
PrintableRxBuffer[r]=in_char;
else
PrintableRxBuffer[r]='0';
r++;
}
//else
//printf("%d/%d",errno,EBADF);
}
PrintableRxBuffer[r]=0;
printf("buff> %d\n %s\n", r, PrintableRxBuffer);
}
*/
if (mk_socket<0)
return 0;
else
return 1;
 
}
 
 
int connect_mk_localhost_socket(int port)
{
 
int status;
struct sockaddr_in sa;
sa.sin_family = AF_INET;
181,19 → 258,9
sa.sin_addr.s_addr = htonl(0x0);
sa.sin_port = htons(port);
// allocate a socket
// s = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
mk_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
//);
 
// set the connection parameters (who to connect to)
return connect(mk_socket,(struct sockaddr*) &sa, sizeof(struct sockaddr_in));
 
// connect to server
// status = connect(s, (struct sockaddr *)&addr, sizeof(addr));
status = connect(mk_socket,(struct sockaddr*) &sa, sizeof(struct sockaddr_in));
 
printf("connection status %d\n",status);
return status;
 
}
 
/Riddim/fc.h
1,6 → 1,7
 
 
#include <stdio.h>
#include <termios.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
41,10 → 42,14
//int connect_mk_bluetooth(char dest[18]);
int connect_mk_localhost_socket(int port);
int connect_mk_bluetooth(char dest[18]);
int connect_mk_tty(char* tty_filename);
 
void SendOutData(unsigned char cmd,unsigned char modul, unsigned char *snd, unsigned char len);
int read_from_mk();
 
extern unsigned char RxBuffer[150];
extern char PrintableRxBuffer[150];
 
#define MAX_BUFF_LEN 150
 
extern unsigned char RxBuffer[MAX_BUFF_LEN ];
extern char PrintableRxBuffer[MAX_BUFF_LEN ];
extern int rx_last_length;
/Riddim/riddim.c
75,24 → 75,28
int input=INPUT_NONE;
 
 
 
int main(int argc, char**argv)
{
 
printf("Starting Riddim \n");
printf("Starting Riddim %d.%d \n",RIDDIM_VERSION_MAJOR,RIDDIM_VERSION_MINOR );
printf("\tRemote Interactive Digital Drone Interface Mashup\n");
printf("\nusage:\n");
printf("\t riddim [config_file]\n\n");
 
// bt_host_init();
 
 
collect_evdev_devices();
 
bt_host_init();
 
if (argv[1])
parse_config(argv[1]);
else
parse_config("/etc/riddim.conf");
 
// exit(0);
 
 
printf("input %s:\n",input_evdev_name);
/*
if (bluetooth_mac)
103,9 → 107,22
connected=TRUE;
}
*/
 
if (mk_tty)
{
printf("connecting to mk via tty: %s\n",mk_tty);
if (!connect_mk_tty(mk_tty))
printf("cant connect !!");
else
{
printf("connected !-)");
connected=TRUE;
}
}
 
if (mk_socket_port)
{
printf("connecting to local port: %i\n",mk_socket_port);
printf("connecting to mk via local port: %i\n",mk_socket_port);
if (connect_mk_localhost_socket(mk_socket_port)==-1)
printf("cant connect !!");
118,6 → 135,9
 
// todo reenable bluetooth connection
 
connect_evdev();
 
/*
if ((input_evdev_name))
{
printf("\nInitializing evdev input (%s) ..\n",input_evdev_name);
130,7 → 150,7
else
printf(".. ERROR ");//
}
 
*/
if (input_joydev_name)
{
printf("\nInitializing joystick input from %s ..\n",input_joydev_name);
188,14 → 208,19
 
 
 
init_evdevstatus_led();
// init_evdevstatus_led();
 
while( TRUE )
{
 
blink_evdev_led();
// bt_host_tick(mk_socket);
// blink_evdev_led();
bt_host_tick(mk_socket);
usleep(loop_delay);
 
 
 
poll_evdev();
 
switch (input)
{
 
206,7 → 231,7
 
case INPUT_EVDEV:
printf("processing input evdev\n");
poll_evdev();
 
break;
 
297,23 → 322,21
 
confirm_misses=0;
 
RxBuffer[1]=0;
RxBuffer[2]=0;
if (connected)
 
 
while (RxBuffer[1]!='t')
while (RxBuffer[2]!='B')
{
 
RxBuffer[1]=0;
read_from_mk();
// bt_host_send(RxBuffer,rx_last_length);
printf("sending to host: %s",PrintableRxBuffer);
bt_host_send(RxBuffer,rx_last_length);
printf("sending to host: %s",PrintableRxBuffer);
 
 
// ftime(&time_struct);
 
printf("waiting for confirm frame ( confirmed:%d misses:%d )\n",complete_matches,complete_misses);
RxBuffer[2]=0;
printf("waiting for confirm frame ( confirmed:%d misses:%d %c)\n",complete_matches,complete_misses,RxBuffer[2]);
// RxBuffer[2]=0;
 
// r=0;
 
350,15 → 373,74
 
 
 
/* Mix input values */
 
act_gas=0;
act_nick=0;
act_roll=0;
act_gier=0;
 
int act_input=0;
for (act_input=0;act_input<input_count;act_input++)
{
//process buttons
if (inputs[act_input].nick_up_btn!=-1)
{
if (inputs[act_input].evdev_button[inputs[act_input].nick_up_btn]!=0)
act_nick=100;
}
 
if (inputs[act_input].nick_down_btn!=-1)
{
if (inputs[act_input].evdev_button[inputs[act_input].nick_down_btn]!=0)
act_nick=-100;
}
 
if (inputs[act_input].roll_left_btn!=-1)
{
if (inputs[act_input].evdev_button[inputs[act_input].roll_left_btn]!=0)
act_roll=100;
}
 
if (inputs[act_input].roll_right_btn!=-1)
{
if (inputs[act_input].evdev_button[inputs[act_input].roll_right_btn]!=0)
act_roll=-100;
}
 
// process axis
if (inputs[act_input].rel_axis_nick!=-1)
act_nick=inputs[act_input].evdev_rel_axis[inputs[act_input].rel_axis_nick]*inputs[act_input].nick_mul;
 
if (inputs[act_input].rel_axis_roll!=-1)
act_roll=inputs[act_input].evdev_rel_axis[inputs[act_input].rel_axis_roll]*inputs[act_input].roll_mul;
 
 
if (inputs[act_input].rel_axis_gier!=-1)
act_gier=inputs[act_input].evdev_rel_axis[inputs[act_input].rel_axis_gier]*inputs[act_input].gier_mul;
 
 
if (inputs[act_input].rel_axis_gas!=-1)
act_gas=inputs[act_input].evdev_rel_axis[inputs[act_input].rel_axis_gas]*inputs[act_input].gas_mul;
 
 
 
}
 
switch(input)
{
case INPUT_EVDEV:
 
/*
act_nick=(evdev_rel_axis[rel_axis_nick]-nick_add)*nick_mul;
act_roll=(evdev_rel_axis[rel_axis_roll]-nick_add)*roll_mul;
act_gier=(evdev_rel_axis[rel_axis_gier]-nick_add)*gier_mul;
act_gas=(evdev_rel_axis[rel_axis_gas]-nick_add)*gas_mul;
*/
 
break;
 
428,6 → 510,7
ExternControl.Roll=act_roll*(-1); //(axis[0]>>8)*(-1)/2;
ExternControl.Gier=act_gier; // ************
ExternControl.Gas=act_gas; // ************
ExternControl.Gas=255; // ************
 
 
/Riddim/riddim.h
9,6 → 9,14
*
**************************************************/
 
#if !defined(RIDDIM_H)
#define RIDDIM_H
 
 
 
#define RIDDIM_VERSION_MAJOR 0
#define RIDDIM_VERSION_MINOR 7
 
// for config file parsing
#include <confuse.h>
#include <string.h>
40,9 → 48,14
 
 
 
#include <sys/types.h>
#include <sys/dir.h>
#include <sys/param.h>
#include <stdio.h>
 
 
 
 
#include <errno.h>
#include <sys/types.h>
#include <netinet/in.h>
60,11 → 73,6
#define FALSE 0
#define TRUE 1
 
 
 
 
 
 
#define STATEID_SCANNING 0
#define STATEID_CONNECTING 1
 
108,3 → 116,6
#define INPUT_NONE 0
#define INPUT_JOYDEV 1
#define INPUT_EVDEV 2
 
 
#endif