Revision 47:8d2e26e2345c, committed 2018-09-18

Comitter:

TUATBM

Date:

Tue Sep 18 08:03:54 2018 +0000

Parent:

46:2ed98fd82186

Commit message:

401????

Changed in this revision

diff -r 2ed98fd82186 -r 8d2e26e2345c Device/MODSERIAL_NUCLEO_F401RE.cpp
--- a/Device/MODSERIAL_NUCLEO_F401RE.cpp	Tue Sep 18 05:53:15 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#ifdef TARGET_NUCLEO_F401RE
-#include "MODSERIAL.h"
-
-void MODSERIAL::setBase(void ) {
-#if DEVICE_SERIAL_ASYNCH
-switch( _serial.serial.index ) {
-#else
-switch( _serial.index ) {
-#endif
-        case 0: _base = USART1; _IRQ = USART1_IRQn; break;
-        case 1: _base = USART2; _IRQ = USART2_IRQn; break;
-        case 2: _base = USART6; _IRQ = USART6_IRQn; break;
-        default: _base = NULL; _IRQ = (IRQn_Type)NULL; break;
-    }
-}
-
-void MODSERIAL::initDevice(void) {};
-
-bool MODSERIAL::txIsBusy( void ) 
-{ 
-    return ( (((USART_TypeDef*)_base)->SR & ( 1UL << 6 )) == 0 ) ? true : false; 
-} 
-
-#endif
\ No newline at end of file

diff -r 2ed98fd82186 -r 8d2e26e2345c Device/MODSERIAL_NUCLEO_F401RE.h
--- a/Device/MODSERIAL_NUCLEO_F401RE.h	Tue Sep 18 05:53:15 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#if defined(TARGET_NUCLEO_F401RE)
-
-#define MODSERIAL_IRQ_REG ((USART_TypeDef*)_base)->CR1
-#define DISABLE_TX_IRQ MODSERIAL_IRQ_REG &= ~USART_CR1_TXEIE
-#define DISABLE_RX_IRQ MODSERIAL_IRQ_REG &= ~USART_CR1_RXNEIE
-#define ENABLE_TX_IRQ MODSERIAL_IRQ_REG |= USART_CR1_TXEIE
-#define ENABLE_RX_IRQ MODSERIAL_IRQ_REG |= USART_CR1_RXNEIE
-
-#define MODSERIAL_READ_REG ((USART_TypeDef*)_base)->DR
-#define MODSERIAL_WRITE_REG ((USART_TypeDef*)_base)->DR
-#define MODSERIAL_READABLE ((((USART_TypeDef*)_base)->SR & USART_SR_RXNE) != 0)
-#define MODSERIAL_WRITABLE ((((USART_TypeDef*)_base)->SR & USART_SR_TXE) != 0)
-
-#define RESET_TX_FIFO while(0 == 1)
-#define RESET_RX_FIFO while(MODSERIAL_READABLE) char dummy = MODSERIAL_READ_REG
-
-#define RX_IRQ_ENABLED ((MODSERIAL_IRQ_REG & USART_CR1_RXNEIE) != 0)
-#define TX_IRQ_ENABLED ((MODSERIAL_IRQ_REG & USART_CR1_TXEIE) != 0)
-
-#endif
\ No newline at end of file

diff -r 2ed98fd82186 -r 8d2e26e2345c Device/MODSERIAL_NUCLEO_F411RE.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Device/MODSERIAL_NUCLEO_F411RE.cpp	Tue Sep 18 08:03:54 2018 +0000
@@ -0,0 +1,24 @@
+#ifdef TARGET_NUCLEO_F411RE
+#include "MODSERIAL.h"
+
+void MODSERIAL::setBase(void ) {
+#if DEVICE_SERIAL_ASYNCH
+switch( _serial.serial.index ) {
+#else
+switch( _serial.index ) {
+#endif
+        case 0: _base = USART1; _IRQ = USART1_IRQn; break;
+        case 1: _base = USART2; _IRQ = USART2_IRQn; break;
+        case 2: _base = USART6; _IRQ = USART6_IRQn; break;
+        default: _base = NULL; _IRQ = (IRQn_Type)NULL; break;
+    }
+}
+
+void MODSERIAL::initDevice(void) {};
+
+bool MODSERIAL::txIsBusy( void ) 
+{ 
+    return ( (((USART_TypeDef*)_base)->SR & ( 1UL << 6 )) == 0 ) ? true : false; 
+} 
+
+#endif
\ No newline at end of file

diff -r 2ed98fd82186 -r 8d2e26e2345c Device/MODSERIAL_NUCLEO_F411RE.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Device/MODSERIAL_NUCLEO_F411RE.h	Tue Sep 18 08:03:54 2018 +0000
@@ -0,0 +1,20 @@
+#if defined(TARGET_NUCLEO_F411RE)
+
+#define MODSERIAL_IRQ_REG ((USART_TypeDef*)_base)->CR1
+#define DISABLE_TX_IRQ MODSERIAL_IRQ_REG &= ~USART_CR1_TXEIE
+#define DISABLE_RX_IRQ MODSERIAL_IRQ_REG &= ~USART_CR1_RXNEIE
+#define ENABLE_TX_IRQ MODSERIAL_IRQ_REG |= USART_CR1_TXEIE
+#define ENABLE_RX_IRQ MODSERIAL_IRQ_REG |= USART_CR1_RXNEIE
+
+#define MODSERIAL_READ_REG ((USART_TypeDef*)_base)->DR
+#define MODSERIAL_WRITE_REG ((USART_TypeDef*)_base)->DR
+#define MODSERIAL_READABLE ((((USART_TypeDef*)_base)->SR & USART_SR_RXNE) != 0)
+#define MODSERIAL_WRITABLE ((((USART_TypeDef*)_base)->SR & USART_SR_TXE) != 0)
+
+#define RESET_TX_FIFO while(0 == 1)
+#define RESET_RX_FIFO while(MODSERIAL_READABLE) char dummy = MODSERIAL_READ_REG
+
+#define RX_IRQ_ENABLED ((MODSERIAL_IRQ_REG & USART_CR1_RXNEIE) != 0)
+#define TX_IRQ_ENABLED ((MODSERIAL_IRQ_REG & USART_CR1_TXEIE) != 0)
+
+#endif
\ No newline at end of file

diff -r 2ed98fd82186 -r 8d2e26e2345c MACROS.h
--- a/MACROS.h	Tue Sep 18 05:53:15 2018 +0000
+++ b/MACROS.h	Tue Sep 18 08:03:54 2018 +0000
@@ -28,7 +28,7 @@
 #include "MODSERIAL_KL25Z.h"
 #include "MODSERIAL_KL05Z.h"
 #include "MODSERIAL_KSDK.h"
-#include "MODSERIAL_NUCLEO_F401RE.h"
+#include "MODSERIAL_NUCLEO_F411RE.h"
 #include "MODSERIAL_PAC_F401RB.h"
 #include "MODSERIAL_NUCLEO_F746ZG.h"
 

diff -r 2ed98fd82186 -r 8d2e26e2345c MODSERIAL.h
--- a/MODSERIAL.h	Tue Sep 18 05:53:15 2018 +0000
+++ b/MODSERIAL.h	Tue Sep 18 08:03:54 2018 +0000
@@ -37,7 +37,7 @@
 #define MODSERIAL_DEFAULT_RX_BUFFER_SIZE    256
 #endif
 
-#define TARGET_NUCLEO_F401RE
+#define TARGET_NUCLEO_F411RE
 
 #ifndef MODSERIAL_DEFAULT_TX_BUFFER_SIZE
 #define MODSERIAL_DEFAULT_TX_BUFFER_SIZE    256