diff include/Utilities.h @ 19:c98863e63174 matrix_gpio

Renamed matrixGpio to digital and matrix to analog

--- a/include/Utilities.h	Thu Apr 30 16:02:47 2015 +0100
+++ b/include/Utilities.h	Thu Apr 30 16:58:41 2015 +0100
@@ -9,18 +9,18 @@
 #define UTILITIES_H_
 
 extern int gNumAudioChannels;	// How many audio channels are present
-extern int gNumMatrixChannels;	// How many matrix channels are present
+extern int gNumAnalogChannels;	// How many analog channels are present
 
-// Macros for accessing the matrix values: usable _only_ within render()
+// Macros for accessing the analog values: usable _only_ within render()
 
-// Read an analog input from input pin p at frame f
-#define analogRead(p, f) (matrixIn[(f)*gNumMatrixChannels + (p)])
-// Write an analog output frame at output pin p, frame f, to value v
-#define analogWriteFrame(p, f, v) (matrixOut[(f)*gNumMatrixChannels + (p)] = (v))
-#define analogWrite(pin, frame, value) \
+// Read an Analog input from input pin p at frame f
+#define AnalogRead(p, f) (analogIn[(f)*gNumAnalogChannels + (p)])
+// Write an Analog output frame at output pin p, frame f, to value v
+#define AnalogWriteFrame(p, f, v) (analogOut[(f)*gNumAnalogChannels + (p)] = (v))
+#define AnalogWrite(pin, frame, value) \
 (({do {\
-	for (int _privateI=(frame); _privateI<numMatrixFrames; _privateI++){ \
-		analogWriteFrame(pin,_privateI,value); \
+	for (int _privateI=(frame); _privateI<numAnalogFrames; _privateI++){ \
+		AnalogWriteFrame(pin,_privateI,value); \
 	}\
 	} while (0);}),(void)0)\
 
@@ -28,19 +28,19 @@
 #define clearBit(word,bit) ((word)&~(1<<(bit)))
 #define getBit(word,bit) (((word)>>(bit))&1)
 #define changeBit(word,bit,value) ((clearBit((word),(bit))) | ((value)<<(bit)))
-//matrixGpio API:
-#define setDigitalDirectionFrame(pin,frame,direction) matrixGpio[(frame)]=changeBit(matrixGpio[(frame)],(pin),(direction))
-#define setDigitalDirection(pin,frame,direction) (for(int _privateI=(frame);_privateI<gNumGpioFrames;_privateI++) matrixGpio[_privateI]=changeBit(matrixGpio[(_privateI)],(pin),(direction))),void(0)
-#define digitalWriteAll(frame,value) matrixGpio[(frame)]=0xffff0000*(!(!value));
+//digital API:
+#define setDigitalDirectionFrame(pin,frame,direction) digital[(frame)]=changeBit(digital[(frame)],(pin),(direction))
+#define setDigitalDirection(pin,frame,direction) (for(int _privateI=(frame);_privateI<gNumGpioFrames;_privateI++) digital[_privateI]=changeBit(digital[(_privateI)],(pin),(direction))),void(0)
+#define digitalWriteAll(frame,value) digital[(frame)]=0xffff0000*(!(!value));
 //sets the bit in the high word, clears the bit in the low word (just in case the direction was not previously set)
-#define digitalWriteFrame(pin, frame, value) matrixGpio[(frame)]=( changeBit(matrixGpio[(frame)], (pin+16), (value)) & (0xffffffff-(1<<(pin))) ) //could have been done with two subsequent assignments
+#define digitalWriteFrame(pin, frame, value) digital[(frame)]=( changeBit(digital[(frame)], (pin+16), (value)) & (0xffffffff-(1<<(pin))) ) //could have been done with two subsequent assignments
 #define digitalWrite(pin, frame, value) \
 	(({do {\
-		for (int _privateI=(frame); _privateI<gNumMatrixGpioFrames; _privateI++) \
+		for (int _privateI=(frame); _privateI<gNumDigitalFrames; _privateI++) \
 			digitalWriteFrame(pin,_privateI,value); \
 		} while (0);}),(void)0)\
 
-#define digitalRead(pin, frame) ( getBit(matrixGpio[(frame)], pin+16) )
+#define digitalRead(pin, frame) ( getBit(digital[(frame)], pin+16) )
 
 float map(float x, float in_min, float in_max, float out_min, float out_max);
 float constrain(float x, float min_val, float max_val);