Diff: TFT_ILI9163C.h

Revision:

6:83f3605478ab

Parent:

4:90798975c496

Child:

7:3dcb98ecf29f

--- a/TFT_ILI9163C.h	Tue Jan 27 06:23:31 2015 +0000
+++ b/TFT_ILI9163C.h	Wed Jan 28 13:35:18 2015 +0000
@@ -100,11 +100,10 @@
 	x&0x1000000?24:x&0x2000000?25:x&0x4000000?26:x&0x8000000?27:\
 	x&0x10000000?28:x&0x20000000?29:x&0x40000000?30:x&0x80000000?31:32)
 
-#if defined(TARGET_NUCLEO_F411RE)	//#if defined(STM32F411xE)
-#define BITBAND_PERIPH(addr, bit) \
-    (volatile uint32_t*)(PERIPH_BB_BASE+((uint32_t)addr-PERIPH_BASE)*32+(bit*4))
-// use DMA
-	#define __F411RE_DMA__
+#if defined(TARGET_NUCLEO_F411RE) | defined(TARGET_NUCLEO_F302R8)
+	#define BITBAND_PERIPH(addr, bit) \
+	    (volatile uint32_t*)(PERIPH_BB_BASE+((uint32_t)addr-PERIPH_BASE)*32+(bit*4))
+	#define __NUCLEO_DMA__
 #endif
 
 //----- Define here witch display you own
@@ -278,7 +277,7 @@
 	DigitalOut _dc;
 	PinName _resetPinName;
 	
-#if defined(TARGET_NUCLEO_F411RE)
+#if defined(TARGET_NUCLEO_F411RE) | defined(TARGET_NUCLEO_F302R8)
 	void		selectSlave();
 	void		deselectSlave();
 	void		setCommandMode();
@@ -299,14 +298,16 @@
 	volatile uint32_t *bb_spi_txe;
 	volatile uint32_t *bb_spi_bsy;
 	volatile uint32_t *bb_spi_spe;
-	volatile uint32_t *bb_spi_dff;
-	
-#if defined(__F411RE_DMA__)
-	DMA_HandleTypeDef hdma;
-	volatile uint32_t *bb_spi_txdmaen;
-	volatile uint32_t *bb_dma_sxcr_en;
+	#if defined(TARGET_NUCLEO_F411RE)
+		volatile uint32_t *bb_spi_dff;
+	#endif
+
+	#if defined(__NUCLEO_DMA__)
+		DMA_HandleTypeDef hdma;
+		volatile uint32_t *bb_spi_txdmaen;
+		volatile uint32_t *bb_dma_sxcr_en;
+	#endif
+
 #endif
-#endif
-
 };
 #endif