move definition of NC input range to src_nunchuk.c

wertarbyte · Jul 2, 2012 · 48200b8 · 48200b8
1 parent 02e5530
commit 48200b8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/input.c b/input.c
@@ -23,7 +23,7 @@ int16_t get_input_range(uint8_t src, uint8_t max) {
 #endif
 #ifdef USE_NUNCHUK
 		case SRC_NUNCHUK:
-			val = (max ? -1 : 1)*(SRC_NUM(src) == 0 ? 180 : 90);
+			val = nunchuk_get_range(SRC_NUM(src), max);
 			break;
 #endif
 		case SRC_DS: /* SRC_DS will not yield a return value */

diff --git a/src_nunchuk.c b/src_nunchuk.c
@@ -116,6 +116,22 @@ void nunchuk_query(void) {
 	}
 }
 
+int16_t nunchuk_get_range(uint8_t i, uint8_t max) {
+	switch (i) {
+		case NC_PITCH:
+			return max ? 90 : -90;
+			break;
+		case NC_ROLL:
+			return max ? 180 : -180;
+			break;
+		case NC_JOY_X:
+		case NC_JOY_Y:
+			return max ? 255 : 0;
+		default:
+			return 0;
+	}
+}
+
 void nunchuk_init(void) {
 	twi_start(NUNCHUK_ADDR<<1);
 	twi_write(0xF0);

diff --git a/src_nunchuk.h b/src_nunchuk.h
@@ -2,3 +2,4 @@ void nunchuk_init(void);
 void nunchuk_query(void);
 int16_t nunchuk_get(uint8_t n);
 int16_t nunchuk_get_raw(uint8_t n);
+int16_t nunchuk_get_range(uint8_t i, uint8_t max);