X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fbbb_pin_defines.h;h=cb77dac87c2268947b793a9db0f43cae6920b931;hb=828cdbf49f52572e93c5c5a48e05277525a4055f;hp=ea7de7e332fee1bdd941462f490011a5618956a0;hpb=6982a9002923c2297cd2e2e1ec10ccb331b01eb5;p=matches%2FMCTX3420.git

diff --git a/server/bbb_pin_defines.h b/server/bbb_pin_defines.h
index ea7de7e..cb77dac 100644
--- a/server/bbb_pin_defines.h
+++ b/server/bbb_pin_defines.h
@@ -118,12 +118,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,6 +136,9 @@ extern const unsigned char g_pin_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
@@ -156,15 +158,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