Skip to content
Browse files

Merge branch 'testing' into statelut

* testing:
  using input-type in conf structure
  • Loading branch information...
2 parents baf23e4 + 170bdcf commit 0556126746b2865169ffe7c5a0896794019a4a52 @modul committed May 25, 2012
Showing with 5 additions and 3 deletions.
  1. +5 −3 conf.h
View
8 conf.h
@@ -52,10 +52,12 @@
#define p AIN1
#define s AIN2
+#include "input.h"
+
typedef struct _conf_t {
- uint16_t pmax;
- uint16_t smax;
- uint16_t fmax;
+ input_t pmax;
+ input_t smax;
+ input_t fmax;
uint8_t gainid;
} conf_t;

0 comments on commit 0556126

Please sign in to comment.
Something went wrong with that request. Please try again.