Changes added to reflect changes in MyBuffer which was modified to use static memory allocation.
Fork of BufferedSerialStatic by
BufferedSerial.h@15:0c7b54af5c73, 2018-05-28 (annotated)
- Committer:
- goranirnas
- Date:
- Mon May 28 14:54:22 2018 +0000
- Revision:
- 15:0c7b54af5c73
- Parent:
- 13:423989861689
Removed mbed lib from this library.
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
sam_grove | 0:a977d0a3d81e | 1 | |
sam_grove | 0:a977d0a3d81e | 2 | /** |
sam_grove | 0:a977d0a3d81e | 3 | * @file BufferedSerial.h |
sam_grove | 0:a977d0a3d81e | 4 | * @brief Software Buffer - Extends mbed Serial functionallity adding irq driven TX and RX |
sam_grove | 0:a977d0a3d81e | 5 | * @author sam grove |
sam_grove | 0:a977d0a3d81e | 6 | * @version 1.0 |
sam_grove | 0:a977d0a3d81e | 7 | * @see |
sam_grove | 0:a977d0a3d81e | 8 | * |
sam_grove | 0:a977d0a3d81e | 9 | * Copyright (c) 2013 |
sam_grove | 0:a977d0a3d81e | 10 | * |
sam_grove | 0:a977d0a3d81e | 11 | * Licensed under the Apache License, Version 2.0 (the "License"); |
sam_grove | 0:a977d0a3d81e | 12 | * you may not use this file except in compliance with the License. |
sam_grove | 0:a977d0a3d81e | 13 | * You may obtain a copy of the License at |
sam_grove | 0:a977d0a3d81e | 14 | * |
sam_grove | 0:a977d0a3d81e | 15 | * http://www.apache.org/licenses/LICENSE-2.0 |
sam_grove | 0:a977d0a3d81e | 16 | * |
sam_grove | 0:a977d0a3d81e | 17 | * Unless required by applicable law or agreed to in writing, software |
sam_grove | 0:a977d0a3d81e | 18 | * distributed under the License is distributed on an "AS IS" BASIS, |
sam_grove | 0:a977d0a3d81e | 19 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
sam_grove | 0:a977d0a3d81e | 20 | * See the License for the specific language governing permissions and |
sam_grove | 0:a977d0a3d81e | 21 | * limitations under the License. |
sam_grove | 0:a977d0a3d81e | 22 | */ |
sam_grove | 0:a977d0a3d81e | 23 | |
sam_grove | 0:a977d0a3d81e | 24 | #ifndef BUFFEREDSERIAL_H |
sam_grove | 0:a977d0a3d81e | 25 | #define BUFFEREDSERIAL_H |
sam_grove | 0:a977d0a3d81e | 26 | |
sam_grove | 0:a977d0a3d81e | 27 | #include "mbed.h" |
sam_grove | 12:a0d37088b405 | 28 | #include "MyBuffer.h" |
sam_grove | 0:a977d0a3d81e | 29 | |
sam_grove | 0:a977d0a3d81e | 30 | /** A serial port (UART) for communication with other serial devices |
sam_grove | 0:a977d0a3d81e | 31 | * |
sam_grove | 0:a977d0a3d81e | 32 | * Can be used for Full Duplex communication, or Simplex by specifying |
sam_grove | 0:a977d0a3d81e | 33 | * one pin as NC (Not Connected) |
sam_grove | 0:a977d0a3d81e | 34 | * |
sam_grove | 0:a977d0a3d81e | 35 | * Example: |
sam_grove | 0:a977d0a3d81e | 36 | * @code |
sam_grove | 0:a977d0a3d81e | 37 | * #include "mbed.h" |
sam_grove | 0:a977d0a3d81e | 38 | * #include "BufferedSerial.h" |
sam_grove | 0:a977d0a3d81e | 39 | * |
sam_grove | 0:a977d0a3d81e | 40 | * BufferedSerial pc(USBTX, USBRX); |
sam_grove | 0:a977d0a3d81e | 41 | * |
sam_grove | 0:a977d0a3d81e | 42 | * int main() |
sam_grove | 5:4d6a311fc8bf | 43 | * { |
sam_grove | 0:a977d0a3d81e | 44 | * while(1) |
sam_grove | 0:a977d0a3d81e | 45 | * { |
sam_grove | 0:a977d0a3d81e | 46 | * Timer s; |
sam_grove | 0:a977d0a3d81e | 47 | * |
sam_grove | 0:a977d0a3d81e | 48 | * s.start(); |
sam_grove | 5:4d6a311fc8bf | 49 | * pc.printf("Hello World - buffered\n"); |
sam_grove | 0:a977d0a3d81e | 50 | * int buffered_time = s.read_us(); |
sam_grove | 0:a977d0a3d81e | 51 | * wait(0.1f); // give time for the buffer to empty |
sam_grove | 0:a977d0a3d81e | 52 | * |
sam_grove | 0:a977d0a3d81e | 53 | * s.reset(); |
sam_grove | 5:4d6a311fc8bf | 54 | * printf("Hello World - blocking\n"); |
sam_grove | 0:a977d0a3d81e | 55 | * int polled_time = s.read_us(); |
sam_grove | 0:a977d0a3d81e | 56 | * s.stop(); |
sam_grove | 0:a977d0a3d81e | 57 | * wait(0.1f); // give time for the buffer to empty |
sam_grove | 0:a977d0a3d81e | 58 | * |
sam_grove | 0:a977d0a3d81e | 59 | * pc.printf("printf buffered took %d us\n", buffered_time); |
sam_grove | 5:4d6a311fc8bf | 60 | * pc.printf("printf blocking took %d us\n", polled_time); |
sam_grove | 0:a977d0a3d81e | 61 | * wait(0.5f); |
sam_grove | 0:a977d0a3d81e | 62 | * } |
sam_grove | 0:a977d0a3d81e | 63 | * } |
sam_grove | 0:a977d0a3d81e | 64 | * @endcode |
sam_grove | 0:a977d0a3d81e | 65 | */ |
sam_grove | 0:a977d0a3d81e | 66 | |
sam_grove | 0:a977d0a3d81e | 67 | /** |
sam_grove | 0:a977d0a3d81e | 68 | * @class BufferedSerial |
sam_grove | 0:a977d0a3d81e | 69 | * @brief Software buffers and interrupt driven tx and rx for Serial |
sam_grove | 0:a977d0a3d81e | 70 | */ |
sam_grove | 11:779304f9c5d2 | 71 | class BufferedSerial : public RawSerial |
sam_grove | 0:a977d0a3d81e | 72 | { |
sam_grove | 0:a977d0a3d81e | 73 | private: |
sam_grove | 12:a0d37088b405 | 74 | MyBuffer <char> _rxbuf; |
sam_grove | 12:a0d37088b405 | 75 | MyBuffer <char> _txbuf; |
ansond | 10:9ee15ae3d1a3 | 76 | uint32_t _buf_size; |
sam_grove | 0:a977d0a3d81e | 77 | |
sam_grove | 0:a977d0a3d81e | 78 | void rxIrq(void); |
sam_grove | 0:a977d0a3d81e | 79 | void txIrq(void); |
sam_grove | 1:57a11fb5d529 | 80 | void prime(void); |
sam_grove | 0:a977d0a3d81e | 81 | |
sam_grove | 0:a977d0a3d81e | 82 | public: |
sam_grove | 0:a977d0a3d81e | 83 | /** Create a BufferedSerial port, connected to the specified transmit and receive pins |
sam_grove | 0:a977d0a3d81e | 84 | * @param tx Transmit pin |
sam_grove | 0:a977d0a3d81e | 85 | * @param rx Receive pin |
ansond | 10:9ee15ae3d1a3 | 86 | * @param buf_size printf() buffer size |
ansond | 10:9ee15ae3d1a3 | 87 | * @param tx_multiple amount of max printf() present in the internal ring buffer at one time |
ansond | 7:6fa214b41d73 | 88 | * @param name optional name |
sam_grove | 0:a977d0a3d81e | 89 | * @note Either tx or rx may be specified as NC if unused |
sam_grove | 0:a977d0a3d81e | 90 | */ |
goranirnas | 13:423989861689 | 91 | BufferedSerial(PinName tx, PinName rx, const char* name=NULL); |
sam_grove | 0:a977d0a3d81e | 92 | |
sam_grove | 0:a977d0a3d81e | 93 | /** Destroy a BufferedSerial port |
sam_grove | 0:a977d0a3d81e | 94 | */ |
sam_grove | 0:a977d0a3d81e | 95 | virtual ~BufferedSerial(void); |
sam_grove | 0:a977d0a3d81e | 96 | |
sam_grove | 0:a977d0a3d81e | 97 | /** Check on how many bytes are in the rx buffer |
sam_grove | 0:a977d0a3d81e | 98 | * @return 1 if something exists, 0 otherwise |
sam_grove | 0:a977d0a3d81e | 99 | */ |
sam_grove | 0:a977d0a3d81e | 100 | virtual int readable(void); |
sam_grove | 0:a977d0a3d81e | 101 | |
sam_grove | 0:a977d0a3d81e | 102 | /** Check to see if the tx buffer has room |
sam_grove | 0:a977d0a3d81e | 103 | * @return 1 always has room and can overwrite previous content if too small / slow |
sam_grove | 0:a977d0a3d81e | 104 | */ |
sam_grove | 0:a977d0a3d81e | 105 | virtual int writeable(void); |
sam_grove | 0:a977d0a3d81e | 106 | |
sam_grove | 0:a977d0a3d81e | 107 | /** Get a single byte from the BufferedSerial Port. |
sam_grove | 0:a977d0a3d81e | 108 | * Should check readable() before calling this. |
sam_grove | 0:a977d0a3d81e | 109 | * @return A byte that came in on the Serial Port |
sam_grove | 0:a977d0a3d81e | 110 | */ |
sam_grove | 0:a977d0a3d81e | 111 | virtual int getc(void); |
sam_grove | 0:a977d0a3d81e | 112 | |
sam_grove | 0:a977d0a3d81e | 113 | /** Write a single byte to the BufferedSerial Port. |
sam_grove | 0:a977d0a3d81e | 114 | * @param c The byte to write to the Serial Port |
sam_grove | 2:7e8a450a9101 | 115 | * @return The byte that was written to the Serial Port Buffer |
sam_grove | 0:a977d0a3d81e | 116 | */ |
sam_grove | 0:a977d0a3d81e | 117 | virtual int putc(int c); |
sam_grove | 0:a977d0a3d81e | 118 | |
sam_grove | 0:a977d0a3d81e | 119 | /** Write a string to the BufferedSerial Port. Must be NULL terminated |
sam_grove | 0:a977d0a3d81e | 120 | * @param s The string to write to the Serial Port |
sam_grove | 2:7e8a450a9101 | 121 | * @return The number of bytes written to the Serial Port Buffer |
sam_grove | 0:a977d0a3d81e | 122 | */ |
sam_grove | 0:a977d0a3d81e | 123 | virtual int puts(const char *s); |
sam_grove | 0:a977d0a3d81e | 124 | |
sam_grove | 0:a977d0a3d81e | 125 | /** Write a formatted string to the BufferedSerial Port. |
sam_grove | 0:a977d0a3d81e | 126 | * @param format The string + format specifiers to write to the Serial Port |
sam_grove | 2:7e8a450a9101 | 127 | * @return The number of bytes written to the Serial Port Buffer |
sam_grove | 0:a977d0a3d81e | 128 | */ |
sam_grove | 0:a977d0a3d81e | 129 | virtual int printf(const char* format, ...); |
sam_grove | 0:a977d0a3d81e | 130 | |
sam_grove | 2:7e8a450a9101 | 131 | /** Write data to the Buffered Serial Port |
sam_grove | 2:7e8a450a9101 | 132 | * @param s A pointer to data to send |
sam_grove | 2:7e8a450a9101 | 133 | * @param length The amount of data being pointed to |
sam_grove | 2:7e8a450a9101 | 134 | * @return The number of bytes written to the Serial Port Buffer |
sam_grove | 2:7e8a450a9101 | 135 | */ |
sam_grove | 2:7e8a450a9101 | 136 | virtual ssize_t write(const void *s, std::size_t length); |
sam_grove | 0:a977d0a3d81e | 137 | }; |
sam_grove | 0:a977d0a3d81e | 138 | |
sam_grove | 0:a977d0a3d81e | 139 | #endif |