X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fbbb_pin_defines.h;h=cb77dac87c2268947b793a9db0f43cae6920b931;hb=797dd747d118bdfb374d220017b035382c4ec3c7;hp=05eb5a9b93e9ea5f9604d2a4c145845b703bcee1;hpb=53c6c3f79e2fc17b44b64ca16379f19d9bd26baf;p=matches%2FMCTX3420.git

diff --git a/server/bbb_pin_defines.h b/server/bbb_pin_defines.h
index 05eb5a9..cb77dac 100644
--- a/server/bbb_pin_defines.h
+++ b/server/bbb_pin_defines.h
@@ -6,6 +6,9 @@
 #ifndef _BBB_PIN_DEFINES_H
 #define _BBB_PIN_DEFINES_H
 
+/** The number of expansion pins on the BBB **/
+#define BBB_PIN_COUNT 92
+
 /** GPIO0 defines **/
 
 #define GPIO0_1 1
@@ -111,18 +114,17 @@
 #define GPIO2_31 95
 #define GPIO2_32 96
 
+/** Export path **/
+#define GPIO_DEVICE_PATH "/sys/class/gpio"
+
 /** Number of useable GPIO pins **/
-#define GPIO_NUM_PINS 50
+#define GPIO_NUM_PINS 43
+/** The max usable GPIO number **/
+#define GPIO_MAX_NUMBER 115
 
 /* Luts */
-#define GPIO_LUT_SIZE 93
-#define GPIO_INDEX_SIZE 128
-extern const unsigned char g_pin_to_gpio[GPIO_LUT_SIZE];
-extern const unsigned char g_gpio_to_index[GPIO_INDEX_SIZE];
-extern const unsigned char g_index_to_gpio[GPIO_NUM_PINS];
-
-/** Export path **/
-#define GPIO_DEVICE_PATH "/sys/class/gpio"
+extern const unsigned char g_pin_gpio_to_index[GPIO_MAX_NUMBER+1];
+extern const unsigned char g_pin_index_to_gpio[GPIO_NUM_PINS];
 
 #define ADC_BITS 12
 #define ADC_DIGITS 5
@@ -134,6 +136,9 @@ extern const unsigned char g_index_to_gpio[GPIO_NUM_PINS];
 #define ADC5 5
 #define ADC6 6
 #define ADC7 7
+#define ADC_VOLTAGE_MAX 1800
+#define ADC_RAW_MAX (2 << ADC_BITS)
+#define ADC_TO_MVOLTS(x) ((double)((x)/2 << ADC_BITS) * (double)ADC_VOLTAGE_MAX)
 
 /** Number of ADC pins **/
 #define ADC_NUM_PINS 8
@@ -153,15 +158,9 @@ extern const unsigned char g_index_to_gpio[GPIO_NUM_PINS];
 /** Number of PWM pins **/
 #define PWM_NUM_PINS 8
 
-/** Number of PWM pins which are guaranteed not to interfere with one another **/
-#define PWM_NUM_SAFE_PINS 5
-
 /** Path to PWM sysfs **/
 #define PWM_DEVICE_PATH "/sys/class/pwm"
 
-/** Maps internal pin number to safe 'pwmX' number **/
-extern const unsigned char g_pin_safe_pwm[PWM_NUM_SAFE_PINS];
-
 #endif //_BBB_PIN_DEFINES_H