bla

Makefile

@@ -90,13 +90,6 @@ clean:
 	rm -fr $(BUILD_LIBS_DIR)/*/*.o
 
 install:
-	@if [ ! -c "$(ARDUINO)" ]; then \
-		echo -e "\n\nEnvironment variable ARDUINO is \"$(ARDUINO)\" and that is invalid."\
-				"\nDid you do \"export ARDUINO=/dev/ttyACM0\" before running make install?"\
-				"\nAlso make sure that ARDUINO env var points to a valid tty device\n\n"; \
-		exit 1;\
-	fi
-	
 	$(AVRDUDE) $(AVRDUDEARGS) -U flash:w:$(TARGET)
 
 format:

README.md

@@ -1,41 +0,0 @@
-# I237 Hardware Programming
-
-This here is my repository for hardware programming course at
-Estonian IT College that is based around a
-[Arduino Mega 2560](https://www.arduino.cc/en/Main/ArduinoBoardMega2560).
-
-This code us usualy updated once every two weeks when a new excersice is put up
-by Silver Kits.
-
-# How to install
-
-Currently to test this code you have to clone the repository
-
-```bash
-git clone https://git.wut.ee/arti/i237.git hardware
-cd hardware
-```
-
-And export a enviroment variable that points to a Arduino Mega board. The
-real path will depend on the OS and Computer that you are using. For me it is
-usualy `/dev/ttyACM0`.
-
-```bash
-export ARDUINO=/dev/ttyACM0
-```
-
-After that you can `make` the project.
-
-```bash
-make clean
-make
-make install
-```
-
-You can also chekcout previous labs using `git checkout <lab name>`. For example
-
-```bash
-git checkout lab02
-```
-
-Don't forget to `make clean` after each checkout!

doc/Arduino-Mega-LCD1602-keypad-shield-wiring.markdown

@@ -10,21 +10,9 @@ This shield consists of three logical parts:
 
 <div class=pagebreak></div>
 
-## Connection to Arduino Mega
-
-Following illustration shows how shield is connected to Arduino mega board.
-
-![arduino-mega-lcd1602-keypad-shield-placement.png](arduino-mega-lcd1602-keypad-shield-placement.png)
-
-Image source: [sainsmart.com](http://www.sainsmart.com/media/catalog/product/2/_/2_16_6.jpg)
-
-Additional installation details and tutorials can be found with help of keywords [Arduino 1602 lcd keypad shield tutorial](https://www.google.ee/webhp?q=Arduino+1602+lcd+keypad+shield+tutorial).
-
-<div class=pagebreak></div>
-
 ## Wiring illustration
 
-![arduino-mega-lcd1602-keypad-shield-wiring.png](arduino-mega-lcd1602-keypad-shield-wiring.png)
+![Arduino Mega LCD1602 Keypad shield wiring LCD part.png](Arduino-Mega-LCD1602-keypad-shield-wiring.png)
 
 Author: [Lauri Võsandi](http://lauri.võsandi.com/arduino/lcd1602-key-shield.html#hd44780)
 

doc/Arduino-Mega-USB-UART-wiring.markdown

@@ -6,12 +6,12 @@ This wiring schema uses only Tx from Arduino and is suitable to be used as stand
 
 ## Wiring illustration
 
-![arduino-mega-usb-uart-wiring.png](arduino-mega-usb-uart-wiring.png)
+![Arduino Mega USB UART wiring.png](Arduino-Mega-USB-UART-wiring.png)
 
 ## Wiring table
 
 | Signal | ATMega2560 port and pin | Arduino Mega 2560 pin | USB UART converter pin |
 | --- | --- | --- | --- |
 | Ground (GND) | GND | GND | GND |
-| Transmit data  from Arduino (TxD) | PORTJ pin 1 (TXD3) | Digital pin 14 (TX3) | RxD |
+| Transmit data  from Arduino (TxD) | PORTJ pin 1 (TXD3) | Digital pin 14 (TX3) | TxD |
 

lib/andygock_avr-uart/LICENSE.txt

@@ -1,11 +0,0 @@
-Copyright (C) 2012 Andy Gock
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.

lib/andygock_avr-uart/README.md

@@ -1,56 +0,0 @@
-avr-uart
-========
-
-An interrupt driven UART Library for 8-bit AVR microcontrollers
-
-Maintained by Andy Gock
-
-https://github.com/andygock/avr-uart
-
-Derived from original library by Peter Fleury
-
-Interrupt UART library using the built-in UART with transmit and receive circular buffers.
-
-An interrupt is generated when the UART has finished transmitting or
-receiving a byte. The interrupt handling routines use circular buffers
-for buffering received and transmitted data.
-
-## Setting up
-
-The `UART_RXn_BUFFER_SIZE` and `UART_TXn_BUFFER_SIZE` constants define
-the size of the circular buffers in bytes. Note that these constants must be a power of 2.
-You may need to adapt this constants to your target and your application by adding to your
-compiler options:
-
-	-DUART_RXn_BUFFER_SIZE=nn -DUART_TXn_BUFFER_SIZE=nn
- 
-`RXn` and `TXn` refer to UART number, for UART3 with 128 byte buffers, add:
-
-	-DUART_RX3_BUFFER_SIZE=128 -DUART_TX3_BUFFER_SIZE=128
-
-UART0 is always enabled by default, to enable the other available UARTs, add the following
-to your compiler options (or symbol options), for the relevant USART number:
-
-	-DUSART1_ENABLED -DUSART2_ENABLED -DUSART3_ENABLED
- 
-To enable large buffer support (over 256 bytes, up to 2^16 bytes) use:
-
-	-DUSARTn_LARGE_BUFFER
-	
-Where n = USART number.
-
-Supports AVR devices with up to 4 hardware USARTs.
-
-## Documentation
-
-Doxygen based documentation will be coming soon.
-
-## Notes
-
-### Buffer overflow behaviour
-
-When the RX circular buffer is full, and it receives further data from the UART, a buffer overflow condition occurs. Any new data is dropped. The RX buffer must be read before any more incoming data from the UART is placed into the RX buffer.
-
-If the TX buffer is full, and new data is sent to it using one of the `uartN_put*()` functions, this function will loop and wait until the buffer is not full any more. It is important to make sure you have not disabled your UART transmit interrupts (`TXEN*`) elsewhere in your application (e.g with `cli()`) before calling the `uartN_put*()` functions, as the application will lock up. The UART interrupts are automatically enabled when you use the `uartN_init()` functions. This is probably not the idea behaviour, I'll probably fix this some time.
-
-For now, make sure `TXEN*` interrupts are enabled when calling `uartN_put*()` functions. This should not be an issue unless you have code elsewhere purposely turning it off.

lib/andygock_avr-uart/uart.h

@@ -1,415 +0,0 @@
-#ifndef UART_H
-#define UART_H
-
-
-/************************************************************************
-Title:    Interrupt UART library with receive/transmit circular buffers
-Author:   Andy Gock
-Software: AVR-GCC 4.1, AVR Libc 1.4
-Hardware: any AVR with built-in UART, tested on AT90S8515 & ATmega8 at 4 Mhz
-License:  GNU General Public License 
-Usage:    see Doxygen manual
-
-Based on original library by Peter Fluery, Tim Sharpe, Nicholas Zambetti.
-
-https://github.com/andygock/avr-uart
-
-LICENSE:
-	Copyright (C) 2012 Andy Gock
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-LICENSE:
-    Copyright (C) 2006 Peter Fleury
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-************************************************************************/
-
-/************************************************************************
-uart_available, uart_flush, uart1_available, and uart1_flush functions
-were adapted from the Arduino HardwareSerial.h library by Tim Sharpe on 
-11 Jan 2009.  The license info for HardwareSerial.h is as follows:
-
-  HardwareSerial.h - Hardware serial library for Wiring
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-************************************************************************/
-
-/************************************************************************
-Changelog for modifications made by Tim Sharpe, starting with the current
-  library version on his Web site as of 05/01/2009. 
-
-Date        Description
-=========================================================================
-05/12/2009  Added Arduino-style available() and flush() functions for both
-			supported UARTs.  Really wanted to keep them out of the library, so
-			that it would be as close as possible to Peter Fleury's original
-			library, but has scoping issues accessing internal variables from
-			another program.  Go C!
-
-************************************************************************/
-
-/** 
- *  @defgroup avr-uart UART Library
- *  @code #include <uart.h> @endcode
- * 
- *  @brief Interrupt UART library using the built-in UART with transmit and receive circular buffers. 
- *
- *  This library can be used to transmit and receive data through the built in UART. 
- *
- *  An interrupt is generated when the UART has finished transmitting or
- *  receiving a byte. The interrupt handling routines use circular buffers
- *  for buffering received and transmitted data.
- *
- *  The UART_RXn_BUFFER_SIZE and UART_TXn_BUFFER_SIZE constants define
- *  the size of the circular buffers in bytes. Note that these constants must be a power of 2.
- *
- *  You need to define these buffer sizes in uart.h
- *
- *  @note Based on Atmel Application Note AVR306
- *  @author Andy Gock <andy@gock.net>
- *  @note Based on original library by Peter Fleury and Tim Sharpe.
- */
- 
-/**@{*/
-#include <stdint.h>
-#include <avr/io.h>
-
-#if (__GNUC__ * 100 + __GNUC_MINOR__) < 304
-#error "This library requires AVR-GCC 3.4 or later, update to newer AVR-GCC compiler !"
-#endif
-
-/*
- * constants and macros
- */
-
-/* Enable USART 1, 2, 3 as required */
-#define USART0_ENABLED
-//#define USART1_ENABLED
-//#define USART2_ENABLED 
-#define USART3_ENABLED
-
-/* Set size of receive and transmit buffers */
-
-#ifndef UART_RX0_BUFFER_SIZE
-	#define UART_RX0_BUFFER_SIZE 128 /**< Size of the circular receive buffer, must be power of 2 */
-#endif
-#ifndef UART_RX1_BUFFER_SIZE
-	#define UART_RX1_BUFFER_SIZE 128 /**< Size of the circular receive buffer, must be power of 2 */
-#endif
-#ifndef UART_RX2_BUFFER_SIZE
-	#define UART_RX2_BUFFER_SIZE 128 /**< Size of the circular receive buffer, must be power of 2 */
-#endif
-#ifndef UART_RX3_BUFFER_SIZE
-	#define UART_RX3_BUFFER_SIZE 128 /**< Size of the circular receive buffer, must be power of 2 */
-#endif
-
-#ifndef UART_TX0_BUFFER_SIZE
-	#define UART_TX0_BUFFER_SIZE 128 /**< Size of the circular transmit buffer, must be power of 2 */
-#endif
-#ifndef UART_TX1_BUFFER_SIZE
-	#define UART_TX1_BUFFER_SIZE 128 /**< Size of the circular transmit buffer, must be power of 2 */
-#endif
-#ifndef UART_TX2_BUFFER_SIZE
-	#define UART_TX2_BUFFER_SIZE 128 /**< Size of the circular transmit buffer, must be power of 2 */
-#endif
-#ifndef UART_TX3_BUFFER_SIZE
-	#define UART_TX3_BUFFER_SIZE 128 /**< Size of the circular transmit buffer, must be power of 2 */
-#endif
-
-/* Check buffer sizes are not too large for 8-bit positioning */
-
-#if (UART_RX0_BUFFER_SIZE > 256 & !defined(USART0_LARGE_BUFFER))
-	#error "Buffer too large, please use -DUSART0_LARGE_BUFFER switch in compiler options"
-#endif
-
-#if (UART_RX1_BUFFER_SIZE > 256 & !defined(USART1_LARGE_BUFFER))
-	#error "Buffer too large, please use -DUSART1_LARGE_BUFFER switch in compiler options"
-#endif
-
-#if (UART_RX2_BUFFER_SIZE > 256 & !defined(USART2_LARGE_BUFFER))
-	#error "Buffer too large, please use -DUSART2_LARGE_BUFFER switch in compiler options"
-#endif
-
-#if (UART_RX3_BUFFER_SIZE > 256 & !defined(USART3_LARGE_BUFFER))
-	#error "Buffer too large, please use -DUSART3_LARGE_BUFFER switch in compiler options"
-#endif
-
-/* Check buffer sizes are not too large for *_LARGE_BUFFER operation (16-bit positioning) */
-
-#if (UART_RX0_BUFFER_SIZE > 65536)
-	#error "Buffer too large, maximum allowed is 65536 bytes"
-#endif
-
-#if (UART_RX1_BUFFER_SIZE > 65536)
-	#error "Buffer too large, maximum allowed is 65536 bytes"
-#endif
-
-#if (UART_RX2_BUFFER_SIZE > 65536)
-	#error "Buffer too large, maximum allowed is 65536 bytes"
-#endif
-
-#if (UART_RX3_BUFFER_SIZE > 65536)
-	#error "Buffer too large, maximum allowed is 65536 bytes"
-#endif
-
-/** @brief  UART Baudrate Expression
- *  @param  xtalCpu  system clock in Mhz, e.g. 4000000L for 4Mhz          
- *  @param  baudRate baudrate in bps, e.g. 1200, 2400, 9600     
- */
-#define UART_BAUD_SELECT(baudRate,xtalCpu) (((xtalCpu)+8UL*(baudRate))/(16UL*(baudRate))-1UL)
-
-/** @brief  UART Baudrate Expression for ATmega double speed mode
- *  @param  xtalCpu  system clock in Mhz, e.g. 4000000L for 4Mhz           
- *  @param  baudRate baudrate in bps, e.g. 1200, 2400, 9600     
- */
-#define UART_BAUD_SELECT_DOUBLE_SPEED(baudRate,xtalCpu) ((((xtalCpu)+4UL*(baudRate))/(8UL*(baudRate))-1)|0x8000)
-
-/* test if the size of the circular buffers fits into SRAM */
-
-#if defined(USART0_ENABLED) && ( (UART_RX0_BUFFER_SIZE+UART_TX0_BUFFER_SIZE) >= (RAMEND-0x60 ) )
-#error "size of UART_RX0_BUFFER_SIZE + UART_TX0_BUFFER_SIZE larger than size of SRAM"
-#endif
-
-#if defined(USART1_ENABLED) && ( (UART_RX1_BUFFER_SIZE+UART_TX1_BUFFER_SIZE) >= (RAMEND-0x60 ) )
-#error "size of UART_RX1_BUFFER_SIZE + UART_TX1_BUFFER_SIZE larger than size of SRAM"
-#endif
-
-#if defined(USART2_ENABLED) && ( (UART_RX2_BUFFER_SIZE+UART_RX2_BUFFER_SIZE) >= (RAMEND-0x60 ) )
-#error "size of UART_RX2_BUFFER_SIZE + UART_TX2_BUFFER_SIZE larger than size of SRAM"
-#endif
-
-#if defined(USART3_ENABLED) && ( (UART_RX3_BUFFER_SIZE+UART_RX3_BUFFER_SIZE) >= (RAMEND-0x60 ) )
-#error "size of UART_RX3_BUFFER_SIZE + UART_TX3_BUFFER_SIZE larger than size of SRAM"
-#endif
-
-/* 
-** high byte error return code of uart_getc()
-*/
-#define UART_FRAME_ERROR      0x0800              /**< Framing Error by UART       */
-#define UART_OVERRUN_ERROR    0x0400              /**< Overrun condition by UART   */
-#define UART_BUFFER_OVERFLOW  0x0200              /**< receive ringbuffer overflow */
-#define UART_NO_DATA          0x0100              /**< no receive data available   */
-
-/* Macros, to allow use of legacy names */
-
-#define uart_init(b)      uart0_init(b)
-#define uart_getc()       uart0_getc()
-#define uart_putc(d)      uart0_putc(d)
-#define uart_puts(s)      uart0_puts(s)
-#define uart_puts_p(s)    uart0_puts_p(s)
-#define uart_available()  uart0_available()
-#define uart_flush()      uart0_flush()
-
-/*
-** function prototypes
-*/
-
-/**
-   @brief   Initialize UART and set baudrate 
-   @param   baudrate Specify baudrate using macro UART_BAUD_SELECT()
-   @return  none
-*/
-extern void uart0_init(uint16_t baudrate);
-
-
-/**
- *  @brief   Get received byte from ringbuffer
- *
- * Returns in the lower byte the received character and in the 
- * higher byte the last receive error.
- * UART_NO_DATA is returned when no data is available.
- *
- *  @return  lower byte:  received byte from ringbuffer
- *  @return  higher byte: last receive status
- *           - \b 0 successfully received data from UART
- *           - \b UART_NO_DATA           
- *             <br>no receive data available
- *           - \b UART_BUFFER_OVERFLOW   
- *             <br>Receive ringbuffer overflow.
- *             We are not reading the receive buffer fast enough, 
- *             one or more received character have been dropped 
- *           - \b UART_OVERRUN_ERROR     
- *             <br>Overrun condition by UART.
- *             A character already present in the UART UDR register was 
- *             not read by the interrupt handler before the next character arrived,
- *             one or more received characters have been dropped.
- *           - \b UART_FRAME_ERROR       
- *             <br>Framing Error by UART
- */
-extern uint16_t uart0_getc(void);
-
-/**
- *  @brief   Peek at next byte in ringbuffer
- *
- * Returns the next byte (character) of incoming UART data without removing it from the
- * internal ring buffer. That is, successive calls to uartN_peek() will return the same
- * character, as will the next call to uartN_getc().
- *
- * UART_NO_DATA is returned when no data is available.
- *
- *  @return  lower byte:  next byte in ringbuffer
- *  @return  higher byte: last receive status
- *           - \b 0 successfully received data from UART
- *           - \b UART_NO_DATA           
- *             <br>no receive data available
- *           - \b UART_BUFFER_OVERFLOW   
- *             <br>Receive ringbuffer overflow.
- *             We are not reading the receive buffer fast enough, 
- *             one or more received character have been dropped 
- *           - \b UART_OVERRUN_ERROR     
- *             <br>Overrun condition by UART.
- *             A character already present in the UART UDR register was 
- *             not read by the interrupt handler before the next character arrived,
- *             one or more received characters have been dropped.
- *           - \b UART_FRAME_ERROR       
- *             <br>Framing Error by UART
- */
-extern uint16_t uart0_peek(void);
-
-/**
- *  @brief   Put byte to ringbuffer for transmitting via UART
- *  @param   data byte to be transmitted
- *  @return  none
- */
-extern void uart0_putc(uint8_t data);
-
-
-/**
- *  @brief   Put string to ringbuffer for transmitting via UART
- *
- *  The string is buffered by the uart library in a circular buffer
- *  and one character at a time is transmitted to the UART using interrupts.
- *  Blocks if it can not write the whole string into the circular buffer.
- * 
- *  @param   s string to be transmitted
- *  @return  none
- */
-extern void uart0_puts(const char *s );
-
-
-/**
- * @brief    Put string from program memory to ringbuffer for transmitting via UART.
- *
- * The string is buffered by the uart library in a circular buffer
- * and one character at a time is transmitted to the UART using interrupts.
- * Blocks if it can not write the whole string into the circular buffer.
- *
- * @param    s program memory string to be transmitted
- * @return   none
- * @see      uart0_puts_P
- */
-extern void uart0_puts_p(const char *s );
-
-/**
- * @brief    Macro to automatically put a string constant into program memory
- * \param    __s string in program memory
- */
-#define uart_puts_P(__s)       uart0_puts_p(PSTR(__s))
-#define uart0_puts_P(__s)      uart0_puts_p(PSTR(__s))
-
-/**
- *  @brief   Return number of bytes waiting in the receive buffer
- *  @return  bytes waiting in the receive buffer
- */
-extern uint16_t uart0_available(void);
-
-/**
- *  @brief   Flush bytes waiting in receive buffer
- */
-extern void uart0_flush(void);
-
-
-/** @brief  Initialize USART1 (only available on selected ATmegas) @see uart_init */
-extern void uart1_init(uint16_t baudrate);
-/** @brief  Get received byte of USART1 from ringbuffer. (only available on selected ATmega) @see uart_getc */
-extern uint16_t uart1_getc(void);
-/** @brief  Peek at next byte in USART1 ringbuffer */
-extern uint16_t uart1_peek(void);
-/** @brief  Put byte to ringbuffer for transmitting via USART1 (only available on selected ATmega) @see uart_putc */
-extern void uart1_putc(uint8_t data);
-/** @brief  Put string to ringbuffer for transmitting via USART1 (only available on selected ATmega) @see uart_puts */
-extern void uart1_puts(const char *s );
-/** @brief  Put string from program memory to ringbuffer for transmitting via USART1 (only available on selected ATmega) @see uart_puts_p */
-extern void uart1_puts_p(const char *s );
-/** @brief  Macro to automatically put a string constant into program memory */
-#define uart1_puts_P(__s)       uart1_puts_p(PSTR(__s))
-/** @brief   Return number of bytes waiting in the receive buffer */
-extern uint16_t uart1_available(void);
-/** @brief   Flush bytes waiting in receive buffer */
-extern void uart1_flush(void);
-
-
-/** @brief  Initialize USART2 (only available on selected ATmegas) @see uart_init */
-extern void uart2_init(uint16_t baudrate);
-/** @brief  Get received byte of USART2 from ringbuffer. (only available on selected ATmega) @see uart_getc */
-extern uint16_t uart2_getc(void);
-/** @brief  Peek at next byte in USART2 ringbuffer */
-extern uint16_t uart2_peek(void);
-/** @brief  Put byte to ringbuffer for transmitting via USART2 (only available on selected ATmega) @see uart_putc */
-extern void uart2_putc(uint8_t data);
-/** @brief  Put string to ringbuffer for transmitting via USART2 (only available on selected ATmega) @see uart_puts */
-extern void uart2_puts(const char *s );
-/** @brief  Put string from program memory to ringbuffer for transmitting via USART2 (only available on selected ATmega) @see uart_puts_p */
-extern void uart2_puts_p(const char *s );
-/** @brief  Macro to automatically put a string constant into program memory */
-#define uart2_puts_P(__s)       uart2_puts_p(PSTR(__s))
-/** @brief   Return number of bytes waiting in the receive buffer */
-extern uint16_t uart2_available(void);
-/** @brief   Flush bytes waiting in receive buffer */
-extern void uart2_flush(void);
-
-
-/** @brief  Initialize USART3 (only available on selected ATmegas) @see uart_init */
-extern void uart3_init(uint16_t baudrate);
-/** @brief  Get received byte of USART3 from ringbuffer. (only available on selected ATmega) @see uart_getc */
-extern uint16_t uart3_getc(void);
-/** @brief  Peek at next byte in USART3 ringbuffer */
-extern uint16_t uart3_peek(void);
-/** @brief  Put byte to ringbuffer for transmitting via USART3 (only available on selected ATmega) @see uart_putc */
-extern void uart3_putc(uint8_t data);
-/** @brief  Put string to ringbuffer for transmitting via USART3 (only available on selected ATmega) @see uart_puts */
-extern void uart3_puts(const char *s );
-/** @brief  Put string from program memory to ringbuffer for transmitting via USART3 (only available on selected ATmega) @see uart_puts_p */
-extern void uart3_puts_p(const char *s );
-/** @brief  Macro to automatically put a string constant into program memory */
-#define uart3_puts_P(__s)       uart3_puts_p(PSTR(__s))
-/** @brief   Return number of bytes waiting in the receive buffer */
-extern uint16_t uart3_available(void);
-/** @brief   Flush bytes waiting in receive buffer */
-extern void uart3_flush(void);
-
-/**@}*/
-
-#endif // UART_H 
-

lib/helius_microrl/LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

lib/helius_microrl/README

@@ -1,103 +0,0 @@
-microrl - micro read line library for small and embedded devices with basic VT100 support.
-
-1. DESCRIPTION
-
-Microrl library is designed to help implement command line interface in small and embedded devices. Main goal is to write compact, small memory consuming but powerful interfaces, with support navigation through command line with cursor, HOME, END keys, hot key like Ctrl+U and other, history and completion feature.
-
-
-2. FEATURE
-
-	** config.h file
-	 - Turn on/off feature for add functional/decrease memory via config files.
-
-	** hot keys support
-	 - backspace, cursor arrow, HOME, END keys
-	 - Ctrl+U (cut line from cursor to begin) 
-	 - Ctrl+K (cut line from cursor to end) 
-	 - Ctrl+A (like HOME) 
-	 - Ctrl+E (like END)
-	 - Ctrl+H (like backspace)
-	 - Ctrl+B (like cursor arrow left) 
-	 - Ctrl+F (like cursor arrow right)
-	 - Ctrl+P (like cursor arrow up)
-	 - Ctrl+N (like cursor arrow down)
-	 - Ctrl+C (call 'sigint' callback, only for embedded system)
-
-	** history
-	 - Static ring buffer history for memory saving. Number of commands saved to history depends from commands length and buffer size (defined in config)
-
-	** completion
-	 - via completion callback
-
-
-3. SRC STRUCTURE
-
-src/             - library source
-  microrl.c      - microrl routines
-  microrl.h      - lib interface and data type
-  config.h       - customisation config-file
-examples/        - library usage examples
-  avr_misc/      - avr specific routines for avr example
-  unix_misc/     - unix specific routines for desktop example
-  example.c      - common part of example, for build  demonstrating example for various platform
-  example_misc.h - interface to platform specific routines for example build (avr, unix)
-  Makefile       - unix example build (gcc)
-  Makefile.avr   - avr example build (avr-gcc)
-
-
-4. INSTALL
-
-Requirements: C compiler with support for C99 standard (GNU GCC, Keil, IAR) with standard C library (libc, uClibc or other compatible). Also you have to implement several routines in your own code for library to work. 
-NOTE: need add -std=gnu99 arg for gcc
-
-For embed lib to you project, you need to do few simple steps:
-
-a) Include microrl.h file to you project.
-
-b) Create 'microrl_t' object, and call 'microrl_init' func, with print callback pointer. Print callback pointer is pointer to function that call by library if it's need to put text to terminal. Text string always is null terminated.
-For example on linux PC print callback may be:
-	// print callback for microrl library
-	void print (char * str)
-	{
-		fprintf (stdout, "%s", str);
-	}
-
-c) Call 'microrl_set_execute_callback' with pointer to you routine, what will be called if user press enter in terminal. Execute callback give a 'argc', 'argv' parametrs, like 'main' func in application. All token in 'argv' is null terminated. So you can simply walk through argv and handle commands.
-
-d) If you want completion support if user press TAB key, call 'microrl_set_complete_callback' and set you callback. It also give 'argc' and 'argv' arguments, so iterate through it and return set of complete variants. 
-
-e) Look at 'config.h' file, for tune library for you requiring. 
-
-f) Now you just call 'microrl_insert_char' on each char received from input stream (usart, network, etc).
-
-Example of code:
-
-	//*****************************************************************************
-	int main (int argc, char ** argv)
-	{
-		// create microrl object and pointer on it
-		microrl_t rl;
-		microrl_t * prl = &rl;
-		// call init with ptr to microrl instance and print callback
-		microrl_init (prl, print);
-		// set callback for execute
-		microrl_set_execute_callback (prl, execute);
-		// set callback for completion (optionally)
-		microrl_set_complete_callback (prl, complet);
-		// set callback for ctrl+c handling (optionally)
-		microrl_set_sigint_callback (prl, sigint);
-		
-		while (1) {
-			// put received char from stdin to microrl lib
-			char ch = get_char ();
-			microrl_insert_char (prl, ch);
-		}
-		return 0;
-	}
-
-See examples library usage.
-
-
-
-Author: Eugene Samoylov aka Helius (ghelius@gmail.com) 
-01.09.2011

lib/helius_microrl/config.h

@@ -1,104 +0,0 @@
-/*
-Microrl library config files
-Autor: Eugene Samoylov aka Helius (ghelius@gmail.com)
-*/
-#ifndef _MICRORL_CONFIG_H_
-#define _MICRORL_CONFIG_H_
-
-#define MICRORL_LIB_VER "1.5.1"
-
-/*********** CONFIG SECTION **************/
-/*
-Command line length, define cmdline buffer size. Set max number of chars + 1,
-because last byte of buffer need to contain '\0' - NULL terminator, and 
-not use for storing inputed char.
-If user input chars more then it parametrs-1, chars not added to command line.*/
-#define _COMMAND_LINE_LEN (1+100)									// for 32 chars
-
-/*
-Command token number, define max token it command line, if number of token 
-typed in command line exceed this value, then prints message about it and
-command line not to be parced and 'execute' callback will not calls.
-Token is word separate by white space, for example 3 token line:
-"IRin> set mode test" */
-#define _COMMAND_TOKEN_NMB 8
-
-/*
-Define you prompt string here. You can use colors escape code, for highlight you prompt,
-for example this prompt will green color (if you terminal supports color)*/
-//#define _PROMPT_DEFAULT "\033[32mIRin >\033[0m "	// green color
-//#define _PROMPT_DEFAULT "IRin > "
-#define _PROMPT_DEFAULT ">"
-
-/*
-Define prompt text (without ESC sequence, only text) prompt length, it needs because if you use
-ESC sequence, it's not possible detect only text length*/
-#define _PROMPT_LEN       1
-
-/*Define it, if you wanna use completion functional, also set completion callback in you code,
-now if user press TAB calls 'copmlitetion' callback. If you no need it, you can just set 
-NULL to callback ptr and do not use it, but for memory saving tune, 
-if you are not going to use it - disable this define.*/
-//#define _USE_COMPLETE
-
-/*Define it, if you wanna use history. It s work's like bash history, and
-set stored value to cmdline, if UP and DOWN key pressed. Using history add
-memory consuming, depends from _RING_HISTORY_LEN parametr */
-//#define _USE_HISTORY
-
-/*
-History ring buffer length, define static buffer size.
-For saving memory, each entered cmdline store to history in ring buffer,
-so we can not say, how many line we can store, it depends from cmdline len,
-but memory using more effective. We not prefer dinamic memory allocation for
-small and embedded devices. Overhead is 2 char on each saved line*/
-//#define _RING_HISTORY_LEN 64
-
-/*
-Enable Handling terminal ESC sequence. If disabling, then cursor arrow, HOME, END will not work,
-use Ctrl+A(B,F,P,N,A,E,H,K,U,C) see README, but decrease code memory.*/
-//#define _USE_ESC_SEQ
-
-/*
-Use snprintf from you standard complier library, but it gives some overhead.
-If not defined, use my own u16int_to_str variant, it's save about 800 byte of code size
-on AVR (avr-gcc build).
-Try to build with and without, and compare total code size for tune library.
-*/
-#define _USE_LIBC_STDIO
-
-/*
-Enable 'interrupt signal' callback, if user press Ctrl+C */
-//#define _USE_CTLR_C
-
-/*
-Print prompt at 'microrl_init', if enable, prompt will print at startup, 
-otherwise first prompt will print after first press Enter in terminal
-NOTE!: Enable it, if you call 'microrl_init' after your communication subsystem 
-already initialize and ready to print message */
-#define _ENABLE_INIT_PROMPT
-
-/*
-New line symbol */
-#define _ENDL_CR
-
-#if defined(_ENDL_CR)
-#define ENDL "\r"
-#elif defined(_ENDL_CRLF)
-#define ENDL "\r\n"
-#elif defined(_ENDL_LF)
-#define ENDL "\n"
-#elif defined(_ENDL_LFCR)
-#define ENDL "\n\r"
-#else
-#error "You must define new line symbol."
-#endif
-
-/********** END CONFIG SECTION ************/
-
-
-#if _RING_HISTORY_LEN > 256
-#error "This history implementation (ring buffer with 1 byte iterator) allow 256 byte buffer size maximum"
-#endif
-
-#endif

lib/helius_microrl/microrl.c

@@ -1,684 +0,0 @@
-/*
-Author: Samoylov Eugene aka Helius (ghelius@gmail.com)
-BUGS and TODO:
--- add echo_off feature
--- rewrite history for use more than 256 byte buffer
-*/
-
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "microrl.h"
-#ifdef _USE_LIBC_STDIO
-#include <stdio.h>
-#endif
-
-//#define DBG(...) fprintf(stderr, "\033[33m");fprintf(stderr,__VA_ARGS__);fprintf(stderr,"\033[0m");
-
-char * prompt_default = _PROMPT_DEFAULT;
-
-#ifdef _USE_HISTORY
-
-#ifdef _HISTORY_DEBUG
-//*****************************************************************************
-// print buffer content on screen
-static void print_hist (ring_history_t * pThis)
-{
-	printf ("\n");
-	for (int i = 0; i < _RING_HISTORY_LEN; i++) {
-		if (i == pThis->begin)
-			printf ("b");
-		else 
-			printf (" ");
-	}
-	printf ("\n");
-	for (int i = 0; i < _RING_HISTORY_LEN; i++) {
-		if (isalpha(pThis->ring_buf[i]))
-			printf ("%c", pThis->ring_buf[i]);
-		else 
-			printf ("%d", pThis->ring_buf[i]);
-	}
-	printf ("\n");
-	for (int i = 0; i < _RING_HISTORY_LEN; i++) {
-		if (i == pThis->end)
-			printf ("e");
-		else 
-			printf (" ");
-	}
-	printf ("\n");
-}
-#endif
-
-//*****************************************************************************
-// remove older message from ring buffer
-static void hist_erase_older (ring_history_t * pThis)
-{
-	int new_pos = pThis->begin + pThis->ring_buf [pThis->begin] + 1;
-	if (new_pos >= _RING_HISTORY_LEN)
-		new_pos = new_pos - _RING_HISTORY_LEN;
-	
-	pThis->begin = new_pos;
-}
-
-//*****************************************************************************
-// check space for new line, remove older while not space
-static int hist_is_space_for_new (ring_history_t * pThis, int len)
-{
-	if (pThis->ring_buf [pThis->begin] == 0)
-		return true;
-	if (pThis->end >= pThis->begin) {
-		if (_RING_HISTORY_LEN - pThis->end + pThis->begin - 1 > len)
-			return true;
-	}	else {
-		if (pThis->begin - pThis->end - 1> len)
-			return true;
-	}
-	return false;
-}
-
-//*****************************************************************************
-// put line to ring buffer
-static void hist_save_line (ring_history_t * pThis, char * line, int len)
-{
-	if (len > _RING_HISTORY_LEN - 2)
-		return;
-	while (!hist_is_space_for_new (pThis, len)) {
-		hist_erase_older (pThis);
-	}
-	// if it's first line
-	if (pThis->ring_buf [pThis->begin] == 0) 
-		pThis->ring_buf [pThis->begin] = len;
-	
-	// store line
-	if (len < _RING_HISTORY_LEN-pThis->end-1)
-		memcpy (pThis->ring_buf + pThis->end + 1, line, len);
-	else {
-		int part_len = _RING_HISTORY_LEN-pThis->end-1;
-		memcpy (pThis->ring_buf + pThis->end + 1, line, part_len);
-		memcpy (pThis->ring_buf, line + part_len, len - part_len);
-	}
-	pThis->ring_buf [pThis->end] = len;
-	pThis->end = pThis->end + len + 1;
-	if (pThis->end >= _RING_HISTORY_LEN)
-		pThis->end -= _RING_HISTORY_LEN;
-	pThis->ring_buf [pThis->end] = 0;
-	pThis->cur = 0;
-#ifdef _HISTORY_DEBUG
-	print_hist (pThis);
-#endif
-}
-
-//*****************************************************************************
-// copy saved line to 'line' and return size of line
-static int hist_restore_line (ring_history_t * pThis, char * line, int dir)
-{
-	int cnt = 0;
-	// count history record	
-	int header = pThis->begin;
-	while (pThis->ring_buf [header] != 0) {
-		header += pThis->ring_buf [header] + 1;
-		if (header >= _RING_HISTORY_LEN)
-			header -= _RING_HISTORY_LEN; 
-		cnt++;
-	}
-
-	if (dir == _HIST_UP) {
-		if (cnt >= pThis->cur) {
-			int header = pThis->begin;
-			int j = 0;
-			// found record for 'pThis->cur' index
-			while ((pThis->ring_buf [header] != 0) && (cnt - j -1 != pThis->cur)) {
-				header += pThis->ring_buf [header] + 1;
-				if (header >= _RING_HISTORY_LEN)
-					header -= _RING_HISTORY_LEN;
-				j++;
-			}
-			if (pThis->ring_buf[header]) {
-					pThis->cur++;
-				// obtain saved line
-				if (pThis->ring_buf [header] + header < _RING_HISTORY_LEN) {
-					memset (line, 0, _COMMAND_LINE_LEN);
-					memcpy (line, pThis->ring_buf + header + 1, pThis->ring_buf[header]);
-				} else {
-					int part0 = _RING_HISTORY_LEN - header - 1;
-					memset (line, 0, _COMMAND_LINE_LEN);
-					memcpy (line, pThis->ring_buf + header + 1, part0);
-					memcpy (line + part0, pThis->ring_buf, pThis->ring_buf[header] - part0);
-				}
-				return pThis->ring_buf[header];
-			}
-		}
-	} else {
-		if (pThis->cur > 0) {
-				pThis->cur--;
-			int header = pThis->begin;
-			int j = 0;
-
-			while ((pThis->ring_buf [header] != 0) && (cnt - j != pThis->cur)) {
-				header += pThis->ring_buf [header] + 1;
-				if (header >= _RING_HISTORY_LEN)
-					header -= _RING_HISTORY_LEN;
-				j++;
-			}
-			if (pThis->ring_buf [header] + header < _RING_HISTORY_LEN) {
-				memcpy (line, pThis->ring_buf + header + 1, pThis->ring_buf[header]);
-			} else {
-				int part0 = _RING_HISTORY_LEN - header - 1;
-				memcpy (line, pThis->ring_buf + header + 1, part0);
-				memcpy (line + part0, pThis->ring_buf, pThis->ring_buf[header] - part0);
-			}
-			return pThis->ring_buf[header];
-		} else {
-			/* empty line */
-			return 0;
-		}
-	}
-	return -1;
-}
-#endif
-
-
-
-
-
-
-
-
-//*****************************************************************************
-// split cmdline to tkn array and return nmb of token
-static int split (microrl_t * pThis, int limit, char const ** tkn_arr)
-{
-	int i = 0;
-	int ind = 0;
-	while (1) {
-		// go to the first whitespace (zerro for us)
-		while ((pThis->cmdline [ind] == '\0') && (ind < limit)) {
-			ind++;
-		}
-		if (!(ind < limit)) return i;
-		tkn_arr[i++] = pThis->cmdline + ind;
-		if (i >= _COMMAND_TOKEN_NMB) {
-			return -1;
-		}
-		// go to the first NOT whitespace (not zerro for us)
-		while ((pThis->cmdline [ind] != '\0') && (ind < limit)) {
-			ind++;
-		}
-		if (!(ind < limit)) return i;
-	}
-	return i;
-}
-
-
-//*****************************************************************************
-inline static void print_prompt (microrl_t * pThis)
-{
-	pThis->print (pThis->prompt_str);
-}
-
-//*****************************************************************************
-inline static void terminal_backspace (microrl_t * pThis)
-{
-		pThis->print ("\033[D \033[D");
-}
-
-//*****************************************************************************
-inline static void terminal_newline (microrl_t * pThis)
-{
-	pThis->print (ENDL);
-}
-
-#ifndef _USE_LIBC_STDIO
-//*****************************************************************************
-// convert 16 bit value to string
-// 0 value not supported!!! just make empty string
-// Returns pointer to a buffer tail
-static char *u16bit_to_str (unsigned int nmb, char * buf)
-{
-	char tmp_str [6] = {0,};
-	int i = 0, j;
-	if (nmb <= 0xFFFF) {
-		while (nmb > 0) {
-			tmp_str[i++] = (nmb % 10) + '0';
-			nmb /=10;
-		}
-		for (j = 0; j < i; ++j)
-			*(buf++) = tmp_str [i-j-1];
-	}
-	*buf = '\0';
-	return buf;
-}
-#endif
-
-
-//*****************************************************************************
-// set cursor at position from begin cmdline (after prompt) + offset
-static void terminal_move_cursor (microrl_t * pThis, int offset)
-{
-	char str[16] = {0,};
-#ifdef _USE_LIBC_STDIO 
-	if (offset > 0) {
-		snprintf (str, 16, "\033[%dC", offset);
-	} else if (offset < 0) {
-		snprintf (str, 16, "\033[%dD", -(offset));
-	}
-#else 
-	char *endstr;
-	strcpy (str, "\033[");
-	if (offset > 0) {
-		endstr = u16bit_to_str (offset, str+2);
-		strcpy (endstr, "C");
-	} else if (offset < 0) {
-		endstr = u16bit_to_str (-(offset), str+2);
-		strcpy (endstr, "D");
-	} else
-		return;
-#endif	
-	pThis->print (str);
-}
-
-//*****************************************************************************
-static void terminal_reset_cursor (microrl_t * pThis)
-{
-	char str[16];
-#ifdef _USE_LIBC_STDIO
-	snprintf (str, 16, "\033[%dD\033[%dC", \
-						_COMMAND_LINE_LEN + _PROMPT_LEN + 2, _PROMPT_LEN);
-
-#else
-	char *endstr;
-	strcpy (str, "\033[");
-	endstr = u16bit_to_str ( _COMMAND_LINE_LEN + _PROMPT_LEN + 2,str+2);
-	strcpy (endstr, "D\033["); endstr += 3;
-	endstr = u16bit_to_str (_PROMPT_LEN, endstr);
-	strcpy (endstr, "C");
-#endif
-	pThis->print (str);
-}
-
-//*****************************************************************************
-// print cmdline to screen, replace '\0' to wihitespace 
-static void terminal_print_line (microrl_t * pThis, int pos, int cursor)
-{
-	pThis->print ("\033[K");    // delete all from cursor to end
-
-	char nch [] = {0,0};
-	int i;
-	for (i = pos; i < pThis->cmdlen; i++) {
-		nch [0] = pThis->cmdline [i];
-		if (nch[0] == '\0')
-			nch[0] = ' ';
-		pThis->print (nch);
-	}
-	
-	terminal_reset_cursor (pThis);
-	terminal_move_cursor (pThis, cursor);
-}
-
-//*****************************************************************************
-void microrl_init (microrl_t * pThis, void (*print) (const char *)) 
-{
-	memset(pThis->cmdline, 0, _COMMAND_LINE_LEN);
-#ifdef _USE_HISTORY
-	memset(pThis->ring_hist.ring_buf, 0, _RING_HISTORY_LEN);
-	pThis->ring_hist.begin = 0;
-	pThis->ring_hist.end = 0;
-	pThis->ring_hist.cur = 0;
-#endif
-	pThis->cmdlen =0;
-	pThis->cursor = 0;
-	pThis->execute = NULL;
-	pThis->get_completion = NULL;
-#ifdef _USE_CTLR_C
-	pThis->sigint = NULL;
-#endif
-	pThis->prompt_str = prompt_default;
-	pThis->print = print;
-#ifdef _ENABLE_INIT_PROMPT
-	print_prompt (pThis);
-#endif
-}
-
-//*****************************************************************************
-void microrl_set_complete_callback (microrl_t * pThis, char ** (*get_completion)(int, const char* const*))
-{
-	pThis->get_completion = get_completion;
-}
-
-//*****************************************************************************
-void microrl_set_execute_callback (microrl_t * pThis, int (*execute)(int, const char* const*))
-{
-	pThis->execute = execute;
-}
-#ifdef _USE_CTLR_C
-//*****************************************************************************
-void microrl_set_sigint_callback (microrl_t * pThis, void (*sigintf)(void))
-{
-	pThis->sigint = sigintf;
-}
-#endif
-
-#ifdef _USE_ESC_SEQ
-static void hist_search (microrl_t * pThis, int dir)
-{
-	int len = hist_restore_line (&pThis->ring_hist, pThis->cmdline, dir);
-	if (len >= 0) {
-		pThis->cursor = pThis->cmdlen = len;
-		terminal_reset_cursor (pThis);
-		terminal_print_line (pThis, 0, pThis->cursor);
-	}
-}
-
-//*****************************************************************************
-// handling escape sequences
-static int escape_process (microrl_t * pThis, char ch)
-{
-	if (ch == '[') {
-		pThis->escape_seq = _ESC_BRACKET;
-		return 0;
-	} else if (pThis->escape_seq == _ESC_BRACKET) {
-		if (ch == 'A') {
-#ifdef _USE_HISTORY
-			hist_search (pThis, _HIST_UP);
-#endif
-			return 1;
-		} else if (ch == 'B') {
-#ifdef _USE_HISTORY
-			hist_search (pThis, _HIST_DOWN);
-#endif
-			return 1;
-		} else if (ch == 'C') {
-			if (pThis->cursor < pThis->cmdlen) {
-				terminal_move_cursor (pThis, 1);
-				pThis->cursor++;
-			}
-			return 1;
-		} else if (ch == 'D') {
-			if (pThis->cursor > 0) {
-				terminal_move_cursor (pThis, -1);
-				pThis->cursor--;
-			}
-			return 1;
-		} else if (ch == '7') {
-			pThis->escape_seq = _ESC_HOME;
-			return 0;
-		} else if (ch == '8') {
-			pThis->escape_seq = _ESC_END;
-			return 0;
-		} 
-	} else if (ch == '~') {
-		if (pThis->escape_seq == _ESC_HOME) {
-			terminal_reset_cursor (pThis);
-			pThis->cursor = 0;
-			return 1;
-		} else if (pThis->escape_seq == _ESC_END) {
-			terminal_move_cursor (pThis, pThis->cmdlen-pThis->cursor);
-			pThis->cursor = pThis->cmdlen;
-			return 1;
-		}
-	}
-
-	/* unknown escape sequence, stop */
-	return 1;
-}
-#endif
-
-//*****************************************************************************
-// insert len char of text at cursor position
-static int microrl_insert_text (microrl_t * pThis, char * text, int len)
-{
-	int i;
-	if (pThis->cmdlen + len < _COMMAND_LINE_LEN) {
-		memmove (pThis->cmdline + pThis->cursor + len,
-						 pThis->cmdline + pThis->cursor,
-						 pThis->cmdlen - pThis->cursor);
-		for (i = 0; i < len; i++) {
-			pThis->cmdline [pThis->cursor + i] = text [i];
-			if (pThis->cmdline [pThis->cursor + i] == ' ') {
-				pThis->cmdline [pThis->cursor + i] = 0;
-			}
-		}
-		pThis->cursor += len;
-		pThis->cmdlen += len;
-		pThis->cmdline [pThis->cmdlen] = '\0';
-		return true;
-	}
-	return false;
-}
-
-//*****************************************************************************
-// remove one char at cursor
-static void microrl_backspace (microrl_t * pThis)
-{
-	if (pThis->cursor > 0) {
-		terminal_backspace (pThis);
-		memmove (pThis->cmdline + pThis->cursor-1,
-						 pThis->cmdline + pThis->cursor,
-						 pThis->cmdlen-pThis->cursor+1);
-		pThis->cursor--;
-		pThis->cmdline [pThis->cmdlen] = '\0';
-		pThis->cmdlen--;
-	}
-}
-
-
-#ifdef _USE_COMPLETE
-
-//*****************************************************************************
-static int common_len (char ** arr)
-{
-	unsigned int i;
-	unsigned int j;
-	char *shortest = arr[0];
-	unsigned int shortlen = strlen(shortest);
-
-	for (i = 0; arr[i] != NULL; ++i)
-		if (strlen(arr[i]) < shortlen) {
-			shortest = arr[i];
-			shortlen = strlen(shortest);
-		}
-
-	for (i = 0; i < shortlen; ++i)
-		for (j = 0; arr[j] != 0; ++j)
-			if (shortest[i] != arr[j][i])
-				return i;
-
-	return i;
-}
-
-//*****************************************************************************
-static void microrl_get_complite (microrl_t * pThis) 
-{
-	char const * tkn_arr[_COMMAND_TOKEN_NMB];
-	char ** compl_token; 
-	
-	if (pThis->get_completion == NULL) // callback was not set
-		return;
-	
-	int status = split (pThis, pThis->cursor, tkn_arr);
-	if (pThis->cmdline[pThis->cursor-1] == '\0')
-		tkn_arr[status++] = "";
-	compl_token = pThis->get_completion (status, tkn_arr);
-	if (compl_token[0] != NULL) {
-		int i = 0;
-		int len;
-
-		if (compl_token[1] == NULL) {
-			len = strlen (compl_token[0]);
-		} else {
-			len = common_len (compl_token);
-			terminal_newline (pThis);
-			while (compl_token [i] != NULL) {
-				pThis->print (compl_token[i]);
-				pThis->print (" ");
-				i++;
-			}
-			terminal_newline (pThis);
-			print_prompt (pThis);
-		}
-		
-		if (len) {
-			microrl_insert_text (pThis, compl_token[0] + strlen(tkn_arr[status-1]), 
-																	len - strlen(tkn_arr[status-1]));
-			if (compl_token[1] == NULL) 
-				microrl_insert_text (pThis, " ", 1);
-		}
-		terminal_reset_cursor (pThis);
-		terminal_print_line (pThis, 0, pThis->cursor);
-	} 
-}
-#endif
-
-//*****************************************************************************
-void new_line_handler(microrl_t * pThis){
-	char const * tkn_arr [_COMMAND_TOKEN_NMB];
-	int status;
-
-	terminal_newline (pThis);
-#ifdef _USE_HISTORY
-	if (pThis->cmdlen > 0)
-		hist_save_line (&pThis->ring_hist, pThis->cmdline, pThis->cmdlen);
-#endif
-	status = split (pThis, pThis->cmdlen, tkn_arr);
-	if (status == -1){
-		//          pThis->print ("ERROR: Max token amount exseed\n");
-		pThis->print ("ERROR:too many tokens");
-		pThis->print (ENDL);
-	}
-	if ((status > 0) && (pThis->execute != NULL))
-		pThis->execute (status, tkn_arr);
-	print_prompt (pThis);
-	pThis->cmdlen = 0;
-	pThis->cursor = 0;
-	memset(pThis->cmdline, 0, _COMMAND_LINE_LEN);
-#ifdef _USE_HISTORY
-	pThis->ring_hist.cur = 0;
-#endif
-}
-
-//*****************************************************************************
-
-void microrl_insert_char (microrl_t * pThis, int ch)
-{
-#ifdef _USE_ESC_SEQ
-	if (pThis->escape) {
-		if (escape_process(pThis, ch))
-			pThis->escape = 0;
-	} else {
-#endif
-		switch (ch) {
-			//-----------------------------------------------------
-#ifdef _ENDL_CR
-			case KEY_CR:
-				new_line_handler(pThis);
-			break;
-			case KEY_LF:
-			break;
-#elif defined(_ENDL_CRLF)
-			case KEY_CR:
-				pThis->tmpch = KEY_CR;
-			break;
-			case KEY_LF:
-			if (pThis->tmpch == KEY_CR)
-				new_line_handler(pThis);
-			break;
-#elif defined(_ENDL_LFCR)
-			case KEY_LF:
-				pThis->tmpch = KEY_LF;
-			break;
-			case KEY_CR:
-			if (pThis->tmpch == KEY_LF)
-				new_line_handler(pThis);
-			break;
-#else
-			case KEY_CR:
-			break;
-			case KEY_LF:
-				new_line_handler(pThis);
-			break;
-#endif
-			//-----------------------------------------------------
-#ifdef _USE_COMPLETE
-			case KEY_HT:
-				microrl_get_complite (pThis);
-			break;
-#endif
-			//-----------------------------------------------------
-			case KEY_ESC:
-#ifdef _USE_ESC_SEQ
-				pThis->escape = 1;
-#endif
-			break;
-			//-----------------------------------------------------
-			case KEY_NAK: // ^U
-					while (pThis->cursor > 0) {
-					microrl_backspace (pThis);
-				}
-				terminal_print_line (pThis, 0, pThis->cursor);
-			break;
-			//-----------------------------------------------------
-			case KEY_VT:  // ^K
-				pThis->print ("\033[K");
-				pThis->cmdlen = pThis->cursor;
-			break;
-			//-----------------------------------------------------
-			case KEY_ENQ: // ^E
-				terminal_move_cursor (pThis, pThis->cmdlen-pThis->cursor);
-				pThis->cursor = pThis->cmdlen;
-			break;
-			//-----------------------------------------------------
-			case KEY_SOH: // ^A
-				terminal_reset_cursor (pThis);
-				pThis->cursor = 0;
-			break;
-			//-----------------------------------------------------
-			case KEY_ACK: // ^F
-			if (pThis->cursor < pThis->cmdlen) {
-				terminal_move_cursor (pThis, 1);
-				pThis->cursor++;
-			}
-			break;
-			//-----------------------------------------------------
-			case KEY_STX: // ^B
-			if (pThis->cursor) {
-				terminal_move_cursor (pThis, -1);
-				pThis->cursor--;
-			}
-			break;
-			//-----------------------------------------------------
-			case KEY_DLE: //^P
-#ifdef _USE_HISTORY
-			hist_search (pThis, _HIST_UP);
-#endif
-			break;
-			//-----------------------------------------------------
-			case KEY_SO: //^N
-#ifdef _USE_HISTORY
-			hist_search (pThis, _HIST_DOWN);
-#endif
-			break;
-			//-----------------------------------------------------
-			case KEY_DEL: // Backspace
-			case KEY_BS: // ^U
-				microrl_backspace (pThis);
-				terminal_print_line (pThis, pThis->cursor, pThis->cursor);
-			break;
-#ifdef _USE_CTLR_C
-			case KEY_ETX:
-			if (pThis->sigint != NULL)
-				pThis->sigint();
-			break;
-#endif
-			//-----------------------------------------------------
-			default:
-			if (((ch == ' ') && (pThis->cmdlen == 0)) || IS_CONTROL_CHAR(ch))
-				break;
-			if (microrl_insert_text (pThis, (char*)&ch, 1))
-				terminal_print_line (pThis, pThis->cursor-1, pThis->cursor);
-			
-			break;
-		}
-#ifdef _USE_ESC_SEQ
-	}
-#endif
-}

lib/helius_microrl/microrl.h

@@ -1,117 +0,0 @@
-#ifndef _MICRORL_H_
-#define _MICRORL_H_
-
-#include "config.h"
-
-#define true  1
-#define false 0
-
- /* define the Key codes */
-#define KEY_NUL 0 /**< ^@ Null character */
-#define KEY_SOH 1 /**< ^A Start of heading, = console interrupt */
-#define KEY_STX 2 /**< ^B Start of text, maintenance mode on HP console */
-#define KEY_ETX 3 /**< ^C End of text */
-#define KEY_EOT 4 /**< ^D End of transmission, not the same as ETB */
-#define KEY_ENQ 5 /**< ^E Enquiry, goes with ACK; old HP flow control */
-#define KEY_ACK 6 /**< ^F Acknowledge, clears ENQ logon hand */
-#define KEY_BEL 7 /**< ^G Bell, rings the bell... */
-#define KEY_BS  8 /**< ^H Backspace, works on HP terminals/computers */
-#define KEY_HT  9 /**< ^I Horizontal tab, move to next tab stop */
-#define KEY_LF  10  /**< ^J Line Feed */
-#define KEY_VT  11  /**< ^K Vertical tab */
-#define KEY_FF  12  /**< ^L Form Feed, page eject */
-#define KEY_CR  13  /**< ^M Carriage Return*/
-#define KEY_SO  14  /**< ^N Shift Out, alternate character set */
-#define KEY_SI  15  /**< ^O Shift In, resume defaultn character set */
-#define KEY_DLE 16  /**< ^P Data link escape */
-#define KEY_DC1 17  /**< ^Q XON, with XOFF to pause listings; "okay to send". */
-#define KEY_DC2 18  /**< ^R Device control 2, block-mode flow control */
-#define KEY_DC3 19  /**< ^S XOFF, with XON is TERM=18 flow control */
-#define KEY_DC4 20  /**< ^T Device control 4 */
-#define KEY_NAK 21  /**< ^U Negative acknowledge */
-#define KEY_SYN 22  /**< ^V Synchronous idle */
-#define KEY_ETB 23  /**< ^W End transmission block, not the same as EOT */
-#define KEY_CAN 24  /**< ^X Cancel line, MPE echoes !!! */
-#define KEY_EM  25  /**< ^Y End of medium, Control-Y interrupt */
-#define KEY_SUB 26  /**< ^Z Substitute */
-#define KEY_ESC 27  /**< ^[ Escape, next character is not echoed */
-#define KEY_FS  28  /**< ^\ File separator */
-#define KEY_GS  29  /**< ^] Group separator */
-#define KEY_RS  30  /**< ^^ Record separator, block-mode terminator */
-#define KEY_US  31  /**< ^_ Unit separator */
-
-#define KEY_DEL 127 /**< Delete (not a real control character...) */
-
-#define IS_CONTROL_CHAR(x) ((x)<=31)
-
-// direction of history navigation
-#define _HIST_UP   0
-#define _HIST_DOWN 1
-// esc seq internal codes
-#define _ESC_BRACKET  1
-#define _ESC_HOME     2
-#define _ESC_END      3
-
-#ifdef _USE_HISTORY
-// history struct, contain internal variable
-// history store in static ring buffer for memory saving
-typedef struct {
-	char ring_buf [_RING_HISTORY_LEN];
-	int begin;
-	int end;
-	int cur;
-} ring_history_t;
-#endif
-
-// microrl struct, contain internal library data
-typedef struct {
-#ifdef _USE_ESC_SEQ
-	char escape_seq;
-	char escape;
-#endif
-#if (defined(_ENDL_CRLF) || defined(_ENDL_LFCR))
-	char tmpch;
-#endif
-#ifdef _USE_HISTORY
-	ring_history_t ring_hist;          // history object
-#endif
-	char * prompt_str;                 // pointer to prompt string
-	char cmdline [_COMMAND_LINE_LEN];  // cmdline buffer
-	int cmdlen;                        // last position in command line
-	int cursor;                        // input cursor
-	int (*execute) (int argc, const char * const * argv );            // ptr to 'execute' callback
-	char ** (*get_completion) (int argc, const char * const * argv ); // ptr to 'completion' callback
-	void (*print) (const char *);                                     // ptr to 'print' callback
-#ifdef _USE_CTLR_C
-	void (*sigint) (void);
-#endif
-} microrl_t;
-
-// init internal data, calls once at start up
-void microrl_init (microrl_t * pThis, void (*print)(const char*));
-
-// set echo mode (true/false), using for disabling echo for password input
-// echo mode will enabled after user press Enter.
-void microrl_set_echo (int);
-
-// set pointer to callback complition func, that called when user press 'Tab'
-// callback func description:
-//   param: argc - argument count, argv - pointer array to token string
-//   must return NULL-terminated string, contain complite variant splitted by 'Whitespace'
-//   If complite token found, it's must contain only one token to be complitted
-//   Empty string if complite not found, and multiple string if there are some token
-void microrl_set_complete_callback (microrl_t * pThis, char ** (*get_completion)(int, const char* const*));
-
-// pointer to callback func, that called when user press 'Enter'
-// execute func param: argc - argument count, argv - pointer array to token string
-void microrl_set_execute_callback (microrl_t * pThis, int (*execute)(int, const char* const*));
-
-// set callback for Ctrl+C terminal signal
-#ifdef _USE_CTLR_C
-void microrl_set_sigint_callback (microrl_t * pThis, void (*sigintf)(void));
-#endif
-
-// insert char to cmdline (for example call in usart RX interrupt)
-void microrl_insert_char (microrl_t * pThis, int ch);
-
-#endif

src/cli_microrl.c

@@ -1,148 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <avr/pgmspace.h>
-#include "../lib/hd44780_111/hd44780.h"
-#include "../lib/andygock_avr-uart/uart.h"
-#include "hmi_msg.h"
-#include "print_helper.h"
-#include "cli_microrl.h"
-
-typedef struct cli_cmd {
-    PGM_P cmd;
-    PGM_P help;
-    void (*func_p)();
-    const uint8_t func_argc;
-} cli_cmd_t;
-
-
-const cli_cmd_t cli_cmds[] = {
-    {help_cmd, help_help, cli_print_help, 0},
-    {ver_cmd, ver_help, cli_print_ver, 0},
-    {ascii_cmd, ascii_help, cli_print_ascii_tbls, 0},
-    {month_cmd, month_help, cli_handle_month, 1}
-};
-
-
-void cli_print(const char *str)
-{
-    printf("%s", str);
-}
-
-
-char cli_get_char(void)
-{
-    if (uart0_peek() != UART_NO_DATA) {
-        return uart0_getc() & UART_STATUS_MASK;
-    } else {
-        return 0x00;
-    }
-}
-
-
-void cli_print_help(const char *const *argv)
-{
-    (void) argv;
-    putc('\n', stdout);
-    printf_P(PSTR(CLI_HELP_MSG "\n"));
-
-    for (uint8_t i = 0; i < NUM_ELEMS(cli_cmds); i++) {
-        printf_P(cli_cmds[i].cmd);
-        printf_P(PSTR(" : "));
-        printf_P(cli_cmds[i].help);
-        putc('\n', stdout);
-    }
-}
-
-
-void print_version(FILE *stream)
-{
-    // Print program and libc versions
-    fprintf_P(stream, PSTR(PROG_VERSION "\n"),
-              PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
-    fprintf_P(stream, PSTR(LIBC_VERSION "\n"),
-              PSTR(__AVR_LIBC_VERSION_STRING__),
-              PSTR(__VERSION__));
-}
-
-
-void cli_print_ver(const char *const *argv)
-{
-    (void) argv;
-    putc('\n', stdout);
-    print_version(stdout);
-}
-
-
-void cli_print_ascii_tbls(const char *const *argv)
-{
-    (void) argv;
-    putc('\n', stdout);
-    // ASCII table print
-    print_ascii_tbl(stdout);
-    unsigned char ascii[128];
-    for (unsigned char i = 0; i < sizeof(ascii); i++) {
-        ascii[i] = i;
-    }
-    print_for_human(stdout, ascii, sizeof(ascii));
-}
-
-
-void cli_handle_month(const char *const *argv)
-{
-    putc('\n', stdout);
-    lcd_goto(0x40); // Got to the beginning of the next line
-    char spaces_to_print = 16;
-    for (int i = 0; i < 6; i++) {
-        if (!strncmp_P(argv[1],
-                       (PGM_P)pgm_read_word(&months[i]),
-                       strlen(argv[1]))) {
-            char printed_count;
-            printed_count = fprintf_P(stdout, (PGM_P)pgm_read_word(&months[i]));
-            fputc('\n', stdout);
-            lcd_puts_P((PGM_P)pgm_read_word(&months[i]));
-            lcd_putc(' ');
-            spaces_to_print -= (printed_count + 1);
-        }
-    }
-    // Clear the end of the line
-    for (; spaces_to_print > -1; spaces_to_print--) {
-        lcd_putc(' ');
-    }
-}
-
-
-void cli_print_cmd_error(void)
-{
-    putc('\n', stdout);
-    printf_P(PSTR(CLI_NO_CMD "\n"));
-}
-
-
-void cli_print_cmd_arg_error(void)
-{
-    putc('\n', stdout);
-    printf_P(PSTR(CLI_ARGS_MSG "\n"));
-}
-
-
-int cli_execute(int argc, const char *const *argv)
-{
-    for (uint8_t i = 0; i < NUM_ELEMS(cli_cmds); i++) {
-        if (!strcmp_P(argv[0], cli_cmds[i].cmd)) {
-            // Test do we have correct arguments to run command
-            // Function arguments count shall be defined in struct
-            if ((argc - 1) != cli_cmds[i].func_argc) {
-                cli_print_cmd_arg_error();
-                return 0;
-            }
-
-            // Hand argv over to function pointer,
-            // cross fingers and hope that funcion handles it properly
-            cli_cmds[i].func_p (argv);
-            return 0;
-        }
-    }
-
-    cli_print_cmd_error();
-    return 0;
-}

src/cli_microrl.h

@@ -1,19 +0,0 @@
-#ifndef _CLI_MICRORL_H_
-#define _CLI_MICRORL_H_
-
-#define NUM_ELEMS(x)        (sizeof(x) / sizeof((x)[0]))
-#define UART_STATUS_MASK    0x00FF
-
-void cli_print(const char * str);
-char cli_get_char(void);
-void cli_print_help(const char *const *argv);
-void print_version(FILE *stream);
-void cli_print_ver(const char *const *argv);
-void cli_print_ascii_tbls(const char *const *argv);
-void cli_handle_month(const char *const *argv);
-void cli_print_cmd_error(void);
-void cli_print_cmd_arg_error(void);
-int cli_execute(int argc, const char *const *argv);
-
-
-#endif /* _CLI_MICRORL_H_ */

src/hmi_msg.c

@@ -1,20 +0,0 @@
-#include <avr/pgmspace.h>
-#include "hmi_msg.h"
-
-static const char m1[] PROGMEM = "January";
-static const char m2[] PROGMEM = "February";
-static const char m3[] PROGMEM = "March";
-static const char m4[] PROGMEM = "April";
-static const char m5[] PROGMEM = "May";
-static const char m6[] PROGMEM = "June";
-
-PGM_P const months[] PROGMEM = {m1, m2, m3, m4, m5, m6};
-
-const char help_cmd[] PROGMEM = HELP_CMD;
-const char help_help[] PROGMEM = HELP_HELP;
-const char ver_cmd[] PROGMEM = VER_CMD;
-const char ver_help[] PROGMEM = VER_HELP;
-const char ascii_cmd[] PROGMEM = ASCII_CMD;
-const char ascii_help[] PROGMEM = ASCII_HELP;
-const char month_cmd[] PROGMEM = MONTH_CMD;
-const char month_help[] PROGMEM = MONTH_HELP;

src/hmi_msg.h

@@ -1,33 +1,26 @@
 #ifndef _HMI_MSG_H_
 #define _HMI_MSG_H_
 
-#define PROG_VERSION "Version: %S built on: %S %S"
+#define VER_FW "Version: %S built on: %S %S\n"
-#define LIBC_VERSION "avr-libc version: %S avr-gcc version: %S"
+#define VER_LIBC "avr-libc version: %S\n"
+#define UI_GET_MONTH_LETTER "Enter Month name first letter >"
+
 #define STUD_NAME "Arti Zirk"
-#define GET_MONTH_MSG "Enter Month name first letter >"
+const char string_1[] PROGMEM = "January";
-#define UPTIME_MSG "Uptime: %lu s"
+const char string_2[] PROGMEM = "February";
+const char string_3[] PROGMEM = "March";
+const char string_4[] PROGMEM = "April";
+const char string_5[] PROGMEM = "May";
+const char string_6[] PROGMEM = "June";
 
-#define HELP_CMD "help"
+PGM_P const months_table[] PROGMEM = 
-#define HELP_HELP "Get help"
+{
-#define VER_CMD "version"
+    string_1,
-#define VER_HELP "Print FW version"
+    string_2,
-#define ASCII_CMD "ascii"
+    string_3,
-#define ASCII_HELP "print ASCII tables"
+    string_4,
-#define MONTH_CMD "month"
+    string_5,
-#define MONTH_HELP "Find matching month from lookup list. Usage: month <string>"
+    string_6
-#define CLI_HELP_MSG "Implemented commands:"
+};
-#define CLI_NO_CMD "Command not implemented.\n Use <help> to get help."
-#define CLI_ARGS_MSG "To few or to many arguments for this command\nUse <help>"
-
-extern PGM_P const months[];
-
-extern const char help_cmd[];
-extern const char help_help[];
-extern const char ver_cmd[];
-extern const char ver_help[];
-extern const char ascii_cmd[];
-extern const char ascii_help[];
-extern const char month_cmd[];
-extern const char month_help[];
 
 #endif /* _HMI_MSG_H_ */

src/main.c

@@ -1,110 +1,66 @@
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 #include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
 #include <util/delay.h>
+#include <avr/pgmspace.h>
 #include "hmi_msg.h"
-#include "../lib/andygock_avr-uart/uart.h"
+#include "uart.h"
-#include "uart_wrap.h"
 #include "print_helper.h"
 #include "../lib/hd44780_111/hd44780.h"
-#include "../lib/helius_microrl/microrl.h"
-#include "cli_microrl.h"
-
-
-#define BAUDRATE 9600
-
-// For configuring arduino mega pin 25
-#define LED_INIT DDRA |= _BV(DDA3);
-#define LED_TOGGLE PORTA ^= _BV(PORTA3)
-#define UART_STATUS_MASK    0x00FF
-
-// Create microrl object and pointer on it
-static microrl_t rl;
-static microrl_t *prl = &rl;
-
-static inline void init_system_clock(void)
-{
-    TCCR5A = 0; // Clear control register A
-    TCCR5B = 0; // Clear control register B
-    TCCR5B |= _BV(WGM52) | _BV(CS52); // CTC and fCPU/256
-    OCR5A = 62549; // 1 s
-    TIMSK5 |= _BV(OCIE5A); // Output Compare A Match Interrupt Enable
-}
-
-
-static inline void init_hw (void)
-{
-    // IO init
-    /// Set arduino pin 25 as output
-    LED_INIT;
-
-    // System clock
-    init_system_clock();
-
-    // UART init
-    uart0_init(UART_BAUD_SELECT(BAUDRATE, F_CPU));
-    uart3_init(UART_BAUD_SELECT(BAUDRATE, F_CPU));
-    stdout = stdin = &uart0_io;
-    stderr = &uart3_out;
-
-    // LCD init
-    lcd_init();
-    lcd_clrscr();
-
-    // Enable interupts
-    sei();
-}
-
-static inline void start_ui (void)
-{
-    print_version(stderr);
-
-    // print student name
-    fprintf_P(stdout, PSTR(STUD_NAME));
-    fputc('\n', stdout); // Add a new line to the uart printout
-    lcd_puts_P(PSTR(STUD_NAME));
-}
-
-static inline void start_cli(void)
-{
-    // Call init with ptr to microrl instance and print callback
-    microrl_init (prl, cli_print);
-    // Set callback for execute
-    microrl_set_execute_callback (prl, cli_execute);
-}
-
-static inline void heartbeat (void)
-{
-    static time_t time_prev;
-    time_t time_cur = time(NULL);
-    if (time_cur <= time_prev) {
-        return;
-    }
-    time_prev = time_cur;
-    fprintf_P(stderr, PSTR(UPTIME_MSG "\n"), time_cur);
-    LED_TOGGLE;
-}
 
+#define BLINK_DELAY_MS 100
 
 int main (void)
 {
-    init_hw();
+    /* set pin 3 of PORTA for output*/
-    start_ui();
+    DDRA |= _BV(DDA3);
-    start_cli();
+    /* Init stdio on UART0 and UART3 and print user code info */
+    uart0_init();
+    uart3_init();
+    lcd_init();
+    lcd_clrscr();
+    stdout = stdin = &uart0_io;
+    stderr = &uart3_out;
+    fprintf_P(stderr, PSTR(VER_FW),
+              PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
+    fprintf_P(stderr, PSTR(VER_LIBC), PSTR(__AVR_LIBC_VERSION_STRING__));
+    /* End stdio init and info print */
+    fprintf_P(stdout, PSTR(STUD_NAME "\n"));
+    lcd_puts_P(PSTR(STUD_NAME));
+    /* ASCII table print */
+    print_ascii_tbl(stdout);
+    unsigned char ascii[128] = {0};
+
+    for (unsigned char i = 0; i < sizeof(ascii); i++) {
+        ascii[i] = i;
+    }
+
+    print_for_human(stdout, ascii, sizeof(ascii));
 
     while (1) {
-        heartbeat();
+        char month_first_leter;
-        // CLI commands are handled in cli_execute()
+        fprintf_P(stdout, PSTR(UI_GET_MONTH_LETTER));
-        microrl_insert_char (prl, cli_get_char());
+        fscanf(stdin, "%c", &month_first_leter);
+        fprintf(stdout, "%c\n", month_first_leter);
+        lcd_goto(0x40);
+
+        for (int i = 0; i < 6; i++) {
+            if (!strncmp_P(&month_first_leter, (PGM_P)pgm_read_word(&months_table[i]), 1)) {
+                fprintf_P(stdout, PSTR("%S\n"), (PGM_P)pgm_read_word(&months_table[i]));
+                lcd_puts_P((PGM_P)pgm_read_word(&months_table[i]));
+                lcd_putc(' ');
+            }
+        }
+
+        for (int i = 0; i < 16; i++) {
+            lcd_putc(' ');
+        }
+
+        /* set pin 3 high to turn led on */
+        PORTA |= _BV(PORTA3);
+        _delay_ms(BLINK_DELAY_MS);
+        /* set pin 3 low to turn led off */
+        PORTA &= ~_BV(PORTA3);
+        _delay_ms(BLINK_DELAY_MS);
     }
 }
-
-
-// System clock
-ISR(TIMER5_COMPA_vect)
-{
-    system_tick();
-}

src/print_helper.c

@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <avr/pgmspace.h>
 #include "print_helper.h"
 
 int print_ascii_tbl (FILE *stream)
@@ -17,17 +16,16 @@ int print_ascii_tbl (FILE *stream)
 int print_for_human (FILE *stream, const unsigned char *array, const int len)
 {
     for (int i = 0; i < len; i++) {
-        unsigned char c = array[i];
+        if (array[i] >= ' ' && array[i] <= '~') {
-        if (c >= ' ' && c <= '~') {
+            if (!fprintf(stream, "%c", array[i])) {
-            if (!fprintf(stream, "%c", c)) {
                 return 0;
             }
         } else {
-            if (!fprintf(stream, "\"0x%02x\"", c)) {
+            if (!fprintf(stream, "\"0x%02x\"", array[i])) {
                 return 0;
             }
         }
     }
 
-    return fprintf(stream, "\n");
+    return fprintf(stream, "\n");;
 }

src/uart.c

@@ -0,0 +1,72 @@
+#include <avr/io.h>
+#include <stdio.h>
+
+#ifndef F_CPU
+#define F_CPU 16000000UL
+#endif
+
+#ifndef BAUD
+#define BAUD 9600
+#endif
+#include <util/setbaud.h>
+
+/* http://www.cs.mun.ca/~rod/Winter2007/4723/notes/serial/serial.html */
+
+void uart0_init(void)
+{
+    UBRR0H = UBRRH_VALUE;
+    UBRR0L = UBRRL_VALUE;
+#if USE_2X
+    UCSR0A |= _BV(U2X0);
+#else
+    UCSR0A &= ~(_BV(U2X0));
+#endif
+    UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); /* 8-bit data */
+    UCSR0B = _BV(RXEN0) | _BV(TXEN0);   /* Enable RX and TX */
+}
+
+void uart3_init(void)
+{
+    UBRR3H = UBRRH_VALUE;
+    UBRR3L = UBRRL_VALUE;
+#if USE_2X
+    UCSR3A |= _BV(U2X3);
+#else
+    UCSR3A &= ~(_BV(U2X3));
+#endif
+    UCSR3C = _BV(UCSZ31) | _BV(UCSZ30); /* 8-bit data */
+    UCSR3B = _BV(TXEN3);   /* Enable TX */
+}
+
+int uart0_putchar(char c, FILE *stream)
+{
+    (void) stream;
+
+    if (c == '\n') {
+        uart0_putchar('\r', stream);
+    }
+
+    loop_until_bit_is_set(UCSR0A, UDRE0);
+    UDR0 = c;
+    return 0;
+}
+
+int uart3_putchar(char c, FILE *stream)
+{
+    (void) stream;
+
+    if (c == '\n') {
+        uart3_putchar('\r', stream);
+    }
+
+    loop_until_bit_is_set(UCSR3A, UDRE3);
+    UDR3 = c;
+    return 0;
+}
+
+int uart0_getchar(FILE *stream)
+{
+    (void) stream;
+    loop_until_bit_is_set(UCSR0A, RXC0);
+    return UDR0;
+}

src/uart.h

@@ -0,0 +1,17 @@
+#ifndef _UART_H_
+#define _UART_H_
+
+int uart0_putchar(char c, FILE *stream);
+int uart0_getchar(FILE *stream);
+
+int uart3_putchar(char c, FILE *stream);
+
+void uart0_init(void);
+void uart3_init(void);
+
+/* http://www.ermicro.com/blog/?p=325 */
+
+FILE uart0_io = FDEV_SETUP_STREAM(uart0_putchar, uart0_getchar, _FDEV_SETUP_RW);
+FILE uart3_out = FDEV_SETUP_STREAM(uart3_putchar, NULL, _FDEV_SETUP_WRITE);
+
+#endif /* _UART_H_ */

src/uart_wrap.c

@@ -1,39 +0,0 @@
-#include <avr/io.h>
-#include <stdio.h>
-#include "../lib/andygock_avr-uart/uart.h"
-
-#define UART_STATUS_MASK    0x00FF
-
-int uart0_putc_wrap(char c, FILE *stream)
-{
-    (void) stream;
-
-    if (c == '\n') {
-        uart0_putc_wrap('\r', stream);
-    }
-
-    uart0_putc(c);
-    return 0;
-}
-
-int uart0_getc_wrap(FILE *stream)
-{
-    (void) stream;
-    // Probabbly should add some error checking in here but because
-    // this function is only called out when there is at least one character
-    // available in the input buffer (see main.c line 114) then error checking
-    // is not currently necessary.
-    return uart0_getc() & UART_STATUS_MASK;
-}
-
-int uart3_putc_wrap(char c, FILE *stream)
-{
-    (void) stream;
-
-    if (c == '\n') {
-        uart3_putc_wrap('\r', stream);
-    }
-
-    uart3_putc(c);
-    return 0;
-}

src/uart_wrap.h

@@ -1,15 +0,0 @@
-#ifndef _UART_WRAP_H_
-#define _UART_WRAP_H_
-
-int uart0_putc_wrap(char c, FILE *stream);
-int uart0_getc_wrap(FILE *stream);
-
-int uart3_putc_wrap(char c, FILE *stream);
-
-
-/* http://www.ermicro.com/blog/?p=325 */
-
-FILE uart0_io = FDEV_SETUP_STREAM(uart0_putc_wrap, uart0_getc_wrap, _FDEV_SETUP_RW);
-FILE uart3_out = FDEV_SETUP_STREAM(uart3_putc_wrap, NULL, _FDEV_SETUP_WRITE);
-
-#endif /* _UART_WRAP_H_ */

tooling/format-code.sh

@@ -18,8 +18,10 @@ for FILE in "$@"
 do
     RESULT="$(astyle    --style=1tbs \
                         --indent-col1-comments \
+                        --break-blocks \
                         --pad-oper \
                         --pad-header \
+                        --delete-empty-lines \
                         --add-brackets \
                         --convert-tabs \
                         --max-code-length=80 \