Merge branch 'master' into c4fmdemod

2017-01-21 18:37:46 +00:00 · 2017-01-21 18:37:46 +00:00 · a5568efd51
parent d4d1f8282b 850978a954
commit a5568efd51
3 changed files with 908 additions and 907 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+*.o
+bin/
+STM32F4XX_Lib/
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@ -611,4 +611,3 @@ void CIO::setP25Int(bool on)
 }

 #endif
-
--- a/SerialSTM.cpp
+++ b/SerialSTM.cpp
@ -908,4 +908,3 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
 }

 #endif
-