In the previous patch there is big problem in handling 0 as button
number(-u). It still sets buttons even if there is no proper axmap. This patch
fixes
this. It also eliminates one global variable.
diff -rup ~joystick-20051019/utils/jscal.c joystick-20051019/utils/jscal.c
--- ~joystick-20051019/utils/jscal.c 2009-05-19 12:07:27.000000000 +0200
+++ joystick-20051019/utils/jscal.c 2009-05-24 21:16:48.000000000 +0200
@@ -62,6 +62,7 @@ struct correction_data {
int fd;
struct js_corr corr[MAX_AXES];
__u8 axmap[ABS_MAX + 1];
+__u8 axmap2[ABS_MAX + 1];
__u16 buttonmap[(KEY_MAX - BTN_MISC + 1)];
char axes, buttons, fuzz;
int version;
@@ -354,8 +355,7 @@ void print_mappings(char *devicename)
exit(1);
}
if (ioctl(fd, JSIOCGBTNMAP, &buttonmap)) {
- perror("jscal: error getting button map");
- exit(1);
+ buttons=0;
}
printf("jscal -u %d", axes);
@@ -373,6 +373,44 @@ void print_mappings(char *devicename)
printf(" %s\n",devicename);
}
+
+void get_axmap2(void)
+{
+ if (ioctl(fd, JSIOCGAXMAP, &axmap2)) {
+ perror("jscal: error getting axis map");
+ exit(1);
+ }
+}
+
+void correct_axes(void)
+{
+ int axmes[ABS_MAX + 1];
+ struct js_corr corr_tmp[MAX_AXES];
+ int i;
+ int ax[axes];
+ //Create remapping table
+ for(i=0;i<axes;++i){
+ axmes[(axmap2[i])]=i;
+ }
+ for(i=0;i<axes;++i){
+ ax[i]=axmes[(axmap[i])];
+ }
+ //Read again current callibration settings
+ if (ioctl(fd, JSIOCGCORR, &corr)) {
+ perror("jscal: error getting correction");
+ exit(1);
+ }
+ //Remap callibration settings
+ for (i = 0; i < axes; i++) {
+ corr_tmp[i]=corr[(ax[i])];
+ }
+ if (ioctl(fd, JSIOCSCORR, &corr_tmp)) {
+ perror("jscal: error setting correction");
+ exit(1);
+ }
+
+}
+
void print_settings(char *devicename)
{
int i,j;
@@ -425,7 +463,7 @@ void set_mappings(char *p)
exit(1);
}
- //axes
+ //axes
sscanf(p, "%d", &axes_on_cl);
p = strstr(p, ",");
@@ -457,15 +495,15 @@ void set_mappings(char *p)
sscanf(++p, "%d", &btns_on_cl);
p = strstr(p, ",");
- if (btns_on_cl != buttons) {
+ if ((btns_on_cl != buttons)&&(btns_on_cl!=0)) {
fprintf(stderr, "jscal: joystick has %d buttons and not %d as specified on command line\n",
buttons, btns_on_cl);
exit(1);
}
- for (i = 0; i < buttons; i++)
- {
+ for (i = 0; i < btns_on_cl; i++)
+ {
if (!p) {
fprintf(stderr, "jscal: missing mapping for button %d\n", i);
exit(1);
@@ -483,21 +521,28 @@ void set_mappings(char *p)
exit(1);
}
buttonmap[i] = btn_mapping;
- }
+ }
if (p) {
fprintf(stderr, "jscal: too many values\n");
exit(1);
}
+ get_axmap2();
if (ioctl(fd, JSIOCSAXMAP, &axmap)) {
perror("jscal: error setting axis map");
exit(1);
}
- if (ioctl(fd, JSIOCSBTNMAP, &buttonmap)) {
- perror("jscal: error setting button map");
- exit(1);
- }
+
+ correct_axes();
+
+ if (btns_on_cl!=0){
+ if (ioctl(fd, JSIOCSBTNMAP, &buttonmap)) {
+ perror("jscal: error setting button map");
+ exit(1);
+ }
+ }
+
}
void set_correction(char *p)
