git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dilatometer.c
[matches/MCTX3420.git]
/
server
/
bbb_pin_defines.h
diff --git
a/server/bbb_pin_defines.h
b/server/bbb_pin_defines.h
index
868636b
..
cb77dac
100644
(file)
--- a/
server/bbb_pin_defines.h
+++ b/
server/bbb_pin_defines.h
@@
-123,7
+123,6
@@
#define GPIO_MAX_NUMBER 115
/* Luts */
#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];
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 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
/** 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 **/
#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"
/** 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
#endif //_BBB_PIN_DEFINES_H
UCC
git Repository :: git.ucc.asn.au