X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_pad.c;h=f3975dbc1b21b42d9e0265b51e79d0388fb71b08;hb=refs%2Fheads%2Fbranch-1.8;hp=e9b54b047c944713dd3cfcad70d9fe9bdf7b8a13;hpb=674aa468a859808661d53725de5a871d7ce9b0cd;p=fw%2Faltos

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index e9b54b04..f3975dbc 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -334,6 +334,7 @@ ao_pad_read_box(void)
 	uint8_t		byte = ao_74hc165_read();
 	uint8_t		h, l;
 
+	PRINTD("box %02x\n", byte);
 	h = byte >> 4;
 	l = byte & 0xf;
 	return h * 10 + l;
@@ -357,10 +358,6 @@ static int ao_pad_read_box(void) {
 }
 #else
 
-#if HAS_FIXED_PAD_BOX
-#define ao_pad_read_box()	ao_config.pad_box
-#endif
-
 #ifdef PAD_BOX
 #define ao_pad_read_box()	PAD_BOX
 #endif
@@ -384,7 +381,11 @@ ao_pad(void)
 			continue;
 		ao_pad_packet_time = ao_time();
 
-		ao_pad_box = ao_pad_read_box();
+		ao_pad_box = ao_config.pad_box;
+#ifndef HAS_FIXED_PAD_BOX
+		if (ao_pad_box == 0 || ao_pad_box == 0xff)
+			ao_pad_box = ao_pad_read_box();
+#endif
 
 		PRINTD ("tick %d box %d (me %d) cmd %d channels %02x\n",
 			command.tick, command.box, ao_pad_box, command.cmd, command.channels);