Merge branch 'patch-1' of https://github.com/MusicalCreeper01/Edison_OLED_Block into MusicalCreeper01-patch-1

Toni Klopfenstein · Toni Klopfenstein · commit b51beedbd463 · 2016-03-08T15:36:38.000-07:00
diff --git a/Firmware/pong/oled/Edison_OLED.cpp b/Firmware/pong/oled/Edison_OLED.cpp
@@ -439,14 +439,14 @@ void edOLED::line(unsigned char x0, unsigned char y0, unsigned char x1, unsigned
 	unsigned char steep = abs(y1 - y0) > abs(x1 - x0);
 	if (steep)
 	{
-		swap(x0, y0);
-		swap(x1, y1);
+		swapOLED(x0, y0);
+		swapOLED(x1, y1);
 	}
 
 	if (x0 > x1)
 	{
-		swap(x0, x1);
-		swap(y0, y1);
+		swapOLED(x0, x1);
+		swapOLED(y0, y1);
 	}
 
 	unsigned char dx, dy;
diff --git a/Firmware/pong/oled/Edison_OLED.h b/Firmware/pong/oled/Edison_OLED.h
@@ -26,7 +26,7 @@
 #ifndef EDISON_OLED_H
 #define EDISON_OLED_H
 
-#define swap(a, b) { unsigned char t = a; a = b; b = t; }
+#define swapOLED(a, b) { unsigned char t = a; a = b; b = t; }
 
 #define BLACK 0
 #define WHITE 1

Original file line number	Diff line number	Diff line change
`@@ -439,14 +439,14 @@ void edOLED::line(unsigned char x0, unsigned char y0, unsigned char x1, unsigned`
`439`	`439`	`unsigned char steep = abs(y1 - y0) > abs(x1 - x0);`
`440`	`440`	`if (steep)`
`441`	`441`	`{`
`442`		`- swap(x0, y0);`
`443`		`- swap(x1, y1);`
	`442`	`+ swapOLED(x0, y0);`
	`443`	`+ swapOLED(x1, y1);`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`if (x0 > x1)`
`447`	`447`	`{`
`448`		`- swap(x0, x1);`
`449`		`- swap(y0, y1);`
	`448`	`+ swapOLED(x0, x1);`
	`449`	`+ swapOLED(y0, y1);`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`unsigned char dx, dy;`