X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fbbb_pin_defines.h;h=7ccda87de950b238026fc81a2b922d5979029ada;hb=a671f27ecb900f91bf32b8b13edb678009e319c1;hp=ea7de7e332fee1bdd941462f490011a5618956a0;hpb=a728759ad3fe0ba1fee614f7ad341d0d072627e3;p=matches%2FMCTX3420.git

diff --git a/server/bbb_pin_defines.h b/server/bbb_pin_defines.h
index ea7de7e..7ccda87 100644
--- a/server/bbb_pin_defines.h
+++ b/server/bbb_pin_defines.h
@@ -10,7 +10,6 @@
 #define BBB_PIN_COUNT 92
 
 /** GPIO0 defines **/
-
 #define GPIO0_1 1
 #define GPIO0_2 2 // Used for PWM
 #define GPIO0_3 3 // Used for PWM
@@ -118,12 +117,11 @@
 #define GPIO_DEVICE_PATH "/sys/class/gpio"
 
 /** Number of useable GPIO pins **/
-#define GPIO_NUM_PINS 44
+#define GPIO_NUM_PINS 43
 /** The max usable GPIO number **/
-#define GPIO_MAX_NUMBER 117
+#define GPIO_MAX_NUMBER 115
 
 /* Luts */
-extern const unsigned char g_pin_real_to_gpio[BBB_PIN_COUNT+1];
 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];
 
@@ -137,10 +135,16 @@ extern const unsigned char g_pin_index_to_gpio[GPIO_NUM_PINS];
 #define ADC5 5
 #define ADC6 6
 #define ADC7 7
+/** The maximum voltage input to the ADC **/
+#define ADC_VOLTAGE_MAX 1800
+/** The maximum raw value from the ADC **/
+#define ADC_RAW_MAX (2 << ADC_BITS)
+/** Converts the raw ADC value to a voltage in millivolts **/
+#define ADC_TO_MVOLTS(x) ((double)((x)/2 << ADC_BITS) * (double)ADC_VOLTAGE_MAX)
 
 /** Number of ADC pins **/
 #define ADC_NUM_PINS 8
-
+/** The path to the ADCs on the BBB **/
 #define ADC_DEVICE_PATH "/sys/bus/iio/devices/iio:device0/"
 
 /** PWM names to sysfs numbers **/
@@ -156,15 +160,9 @@ extern const unsigned char g_pin_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