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
failing to test before committing :3
[matches/MCTX3420.git]
/
server
/
bbb_pin.h
diff --git
a/server/bbb_pin.h
b/server/bbb_pin.h
index
ce91e5a
..
9eb011e
100644
(file)
--- a/
server/bbb_pin.h
+++ b/
server/bbb_pin.h
@@
-12,42
+12,47
@@
#if defined(_BBB) || defined(_BBB_PIN_SRC)
// Initialise / Deinitialise functions
#if defined(_BBB) || defined(_BBB_PIN_SRC)
// Initialise / Deinitialise functions
-extern
void
GPIO_Export(int pin);
+extern
bool
GPIO_Export(int pin);
extern void GPIO_Unexport(int pin);
extern void GPIO_Unexport(int pin);
-extern
void
PWM_Export(int pin);
+extern
bool
PWM_Export(int pin);
extern void PWM_Unexport(int pin);
extern void PWM_Unexport(int pin);
-extern
void
ADC_Export(int pin);
+extern
bool
ADC_Export(int pin);
extern void ADC_Unexport(int pin);
// Pin reading/setting functions
extern void ADC_Unexport(int pin);
// Pin reading/setting functions
-extern bool GPIO_Read(int pin);
-extern
void
GPIO_Set(int pin, bool value);
+extern bool GPIO_Read(int pin
, bool *result
);
+extern
bool
GPIO_Set(int pin, bool value);
-extern int ADC_Read(int pin);
+extern bool ADC_Read(int id, int *value);
+
+extern bool PWM_Set(int pin, bool polarity, long period, long duty); // period and duty are in ns
+extern bool PWM_Stop(int pin);
-extern void PWM_Set(int pin, bool polarity, long period, long duty); // period and duty are in ns
-extern void PWM_Stop(int pin);
#else
#else
-//Empty defines so it compiles on any platform that's not the BBB
-#define GPIO_Export(pin)
+//'Empty' defines so it compiles on any platform that's not the BBB
+
+extern bool GPIO_Export(int pin);
+extern void GPIO_Unexport(int pin);
+
+#define GPIO_Export(pin) true
#define GPIO_Unexport(pin)
#define GPIO_Unexport(pin)
-#define PWM_Export(pin)
+#define PWM_Export(pin)
true
#define PWM_Unexport(pin)
#define PWM_Unexport(pin)
-#define ADC_Export(pin)
+#define ADC_Export(pin)
true
#define ADC_Unexport(pin)
#define ADC_Unexport(pin)
-#define GPIO_Read(pin) 0
-#define GPIO_Set(pin, value)
-
-#define ADC_Read(pin) 0
+//Hack to both zero the result field (so it's never uninitialised) and return true
+#define GPIO_Read(pin, result) ((*(result) = 0) == 0)
+#define GPIO_Set(pin, value) true
-#define PWM_Set(pin, polarity, period, duty)
-#define PWM_Stop(Pin)
+#define ADC_Read(id, value) ((*(value) = 0) == 0)
+#define PWM_Set(pin, polarity, period, duty) true
+#define PWM_Stop(pin) true
#endif //_BBB
#endif //_BBB
UCC
git Repository :: git.ucc.asn.au