Merge branch 'develop'

Author: gbmhunter

.gitignore

@@ -4,4 +4,7 @@ cmake-build-debug/
 .vscode/
 
 # Sphinx build dir
-docs/_build/
+docs/_build/
+
+# Build artifacts
+a.out

.vscode/c_cpp_properties.json

@@ -60,7 +60,8 @@
             },
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",
-            "cppStandard": "c++17"
+            "cppStandard": "c++17",
+            "configurationProvider": "ms-vscode.cmake-tools"
         },
         {
             "name": "Win32",

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v2.1.0] - 2020-11-08
+
+### Added
+- Support for custom baud rates.
+- Support for all standard UNIX baud rates.
+- Improved Doxygen documentation.
+- Improved README.md documentation.
+
+### Removed
+- Dependencies from the README, they weren't that useful and were not accurate anyway.
+
 ## [v2.0.3] - 2020-10-13
 
 ### Added

README.md

@@ -1,14 +1,16 @@
 # CppLinuxSerial
 
-Serial port library written in C++
+Linux serial port library written in C++.
 
 [![Build Status](https://travis-ci.org/gbmhunter/CppLinuxSerial.svg?branch=master)](https://travis-ci.org/gbmhunter/CppLinuxSerial)
 
 ## Description
 
 Library for communicating with COM ports on a Linux system.
 
-Uses fstream to the file I/O.
+* Simple API
+* Supports custom baud rates
+* cmake based build system
 
 ## Installation
 
@@ -66,18 +68,20 @@ using namespace mn::CppLinuxSerial;
 
 int main() {
 	// Create serial port object and open serial port
-	SerialPort serialPort0("/dev/ttyUSB0", BaudRate::B_57600);
-	serialPort0.Open();
+	SerialPort serialPort("/dev/ttyUSB0", BaudRate::B_57600);
+	// Use SerialPort serialPort("/dev/ttyACM0", 13000); instead if you want to provide a custom baud rate
+	serialPort.SetTimeout(-1); // Block when reading until any data is received
+	serialPort.Open();
 
 	// Write some ASCII datae
-	serialPort0.Write("Hello");
+	serialPort.Write("Hello");
 
-	// Read some data back
+	// Read some data back (will block until at least 1 byte is received due to the SetTimeout(-1) call above)
 	std::string readData;
-	serialPort0.Read(readData);
+	serialPort.Read(readData);
 
 	// Close the serial port
-	serialPort0.Close();
+	serialPort.Close();
 }
 ```
 
@@ -87,42 +91,15 @@ If the above code was in a file called `main.cpp` and you had installed `CppLinu
 g++ main.cpp -lCppLinuxSerial
 ```
 
-For more examples, see the `.cpp` files in `test/unit/`.
-
-## Dependencies
-
-The following table lists all of the libraries dependencies.
-
-<table>
-	<thead>
-		<tr>
-			<td>Dependency</td>
-			<td>Comments</td>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>C++14</td>
-			<td>C++14 used for strongly typed enums, `std::chrono` and literals.</td>
-		</tr>
-		<tr>
-			<td>stdio.h</td>
-			<td>snprintf()</td>
-		</tr>
-		<tr>
-			<td>stty</td>
-			<td>Used in unit tests to verify the serial port is configured correctly.</td>
-		</tr>
-	</tbody>
-</table>
+For more examples, see the files in `test/`.
 
 ## Issues
 
 See GitHub Issues.
 
 ## FAQ
 
-1. My code stalls when calling functions like `SerialPort::Read()`. This is probably because the library is set up to do a blocking read, and not enough characters have been received to allow `SerialPort::Read()` to return. Use `SerialPort::SetNumCharsToWait()` to determine how many characters to wait for before returning (set to 0 for non-blocking mode).
+1. My code stalls when calling functions like `SerialPort::Read()`. This is probably because the library is set up to do a blocking read, and not enough characters have been received to allow `SerialPort::Read()` to return. Call `SerialPort::SetTimeout(0)` before the serial port is open to set a non-blocking mode.
 
 ## Changelog
 

include/CppLinuxSerial/SerialPort.hpp

@@ -15,27 +15,56 @@
 #include <string>
 #include <fstream> // For file I/O (reading/writing to COM port)
 #include <sstream>
-#include <termios.h> // POSIX terminal control definitions (struct termios)
+// #include <termios.h> // POSIX terminal control definitions (struct termios)
+// #include <asm/termios.h> // Terminal control definitions (struct termios)
 #include <vector>
+#include <asm/ioctls.h>
+#include <asm/termbits.h>
 
 // User headers
 #include "Exception.hpp"
 
 namespace mn {
     namespace CppLinuxSerial {
 
+        /// \brief      Represents the baud rate "types" that can be used with the serial port. STANDARD represents all
+        ///             the standard baud rates as provided by UNIX, CUSTOM represents a baud rate defined by an arbitray integer.
+        enum class BaudRateType {
+            STANDARD,
+            CUSTOM,
+        };
+
         /// \brief		Strongly-typed enumeration of baud rates for use with the SerialPort class
+        /// \details    Specifies all the same baud rates as UNIX, as well as B_CUSTOM to specify your
+        ///             own. See https://linux.die.net/man/3/cfsetispeed for list of supported UNIX baud rates.
         enum class BaudRate {
+            B_0,
+            B_50,
+            B_75,
+            B_110,
+            B_134,
+            B_150,
+            B_200,
+            B_300,
+            B_600,
+            B_1200,
+            B_1800,
+            B_2400,
+            B_4800,
             B_9600,
+            B_19200,
             B_38400,
             B_57600,
             B_115200,
-            CUSTOM
+            B_230400,
+            B_460800,
+            B_CUSTOM, // Placeholder 
         };
 
+        /// \brief      Represents the state of the serial port.
         enum class State {
             CLOSED,
-            OPEN
+            OPEN,
         };
 
 /// \brief		SerialPort object is used to perform rx/tx serial communication.
@@ -48,15 +77,22 @@ namespace mn {
             /// \brief		Constructor that sets up serial port with the basic (required) parameters.
             SerialPort(const std::string &device, BaudRate baudRate);
 
-            //! @brief		Destructor. Closes serial port if still open.
+            /// \brief		Constructor that sets up serial port with the basic (required) parameters.
+            SerialPort(const std::string &device, speed_t baudRate);
+
+            /// \brief		Destructor. Closes serial port if still open.
             virtual ~SerialPort();
 
             /// \brief		Sets the device to use for serial port communications.
             /// \details    Method can be called when serial port is in any state.
             void SetDevice(const std::string &device);
 
+            /// \brief      Allows the user to set a standard baud rate.
             void SetBaudRate(BaudRate baudRate);
 
+            /// \brief      Allows the user to set a custom baud rate.
+            void SetBaudRate(speed_t baudRate);
+
             /// \brief      Sets the read timeout (in milliseconds)/blocking mode.
             /// \details    Only call when state != OPEN. This method manupulates VMIN and VTIME.
             /// \param      timeout_ms  Set to -1 to infinite timeout, 0 to return immediately with any data (non
@@ -92,22 +128,34 @@ namespace mn {
         private:
 
             /// \brief		Returns a populated termios structure for the passed in file descriptor.
-            termios GetTermios();
+            // termios GetTermios();
 
             /// \brief		Configures the tty device as a serial port.
             /// \warning    Device must be open (valid file descriptor) when this is called.
             void ConfigureTermios();
 
-            void SetTermios(termios myTermios);
+            // void SetTermios(termios myTermios);
+
+            /// \brief		Returns a populated termios2 structure for the serial port pointed to by the file descriptor.
+            termios2 GetTermios2();
+
+            /// \brief      Assigns the provided tty settings to the serial port pointed to by the file descriptor.
+            void SetTermios2(termios2 tty);
 
             /// \brief      Keeps track of the serial port's state.
             State state_;
 
             /// \brief      The file path to the serial port device (e.g. "/dev/ttyUSB0").
             std::string device_;
 
-            /// \brief      The current baud rate.
-            BaudRate baudRate_;
+            /// \brief      The type of baud rate that the user has specified.
+            BaudRateType baudRateType_;
+
+            /// \brief      The current baud rate if baudRateType_ == STANDARD.
+            BaudRate baudRateStandard_;
+
+            /// \brief      The current baud rate if baudRateType_ == CUSTOM.
+            speed_t baudRateCustom_;
 
             /// \brief		The file descriptor for the open file. This gets written to when Open() is called.
             int fileDesc_;