From 829267866c34adfd87f799ee0caf6c2e8977e4de Mon Sep 17 00:00:00 2001 From: Alexey Dynda Date: Wed, 30 Mar 2016 21:16:14 +1000 Subject: [PATCH] Reworked structure of Arduino protocol library --- Makefile | 56 +- doc/html/classTiny_1_1Proto.html | 4 +- doc/html/tiny__config_8h_source.html | 15 +- doc/latex/classTiny_1_1Proto.tex | 4 +- doc/latex/refman.tex | 6 +- inc/os/arduino/tiny_config.h | 17 + .../sketch_tinyproto01/sketch_tinyproto01.ino | 57 -- .../arduino/TinyProto-Full/library.properties | 9 - .../TinyProto-Full/src/TinyProto-Full.h | 386 -------- .../TinyProto-Full/src/TinyProtocol.cpp | 92 -- .../TinyProto-Full/src/proto/tiny_config.h | 4 - releases/arduino/TinyProto-Micro/README.md | 27 - .../examples/sketch_echo/sketch_echo.ino | 47 - .../sketch_tinyproto01/sketch_tinyproto01.ino | 57 -- releases/arduino/TinyProto-Micro/keywords.txt | 28 - .../TinyProto-Micro/library.properties | 9 - .../TinyProto-Micro/src/TinyProtocol.cpp | 92 -- .../arduino/TinyProto-Micro/src/proto/crc.c | 193 ---- .../arduino/TinyProto-Micro/src/proto/crc.h | 48 - .../TinyProto-Micro/src/proto/tiny_config.h | 2 - .../TinyProto-Micro/src/proto/tiny_defines.h | 56 -- .../TinyProto-Micro/src/proto/tiny_layer2.c | 824 ------------------ .../TinyProto-Micro/src/proto/tiny_layer2.h | 394 --------- releases/arduino/TinyProto-Nano/README.md | 27 - .../examples/sketch_echo/sketch_echo.ino | 47 - releases/arduino/TinyProto-Nano/keywords.txt | 28 - .../TinyProto-Nano/src/TinyProto-Nano.h | 386 -------- .../arduino/TinyProto-Nano/src/proto/crc.c | 193 ---- .../arduino/TinyProto-Nano/src/proto/crc.h | 48 - .../TinyProto-Nano/src/proto/tiny_config.h | 1 - .../TinyProto-Nano/src/proto/tiny_defines.h | 56 -- .../TinyProto-Nano/src/proto/tiny_layer2.c | 824 ------------------ .../TinyProto-Nano/src/proto/tiny_layer2.h | 394 --------- .../README.md | 0 .../examples/sketch_echo/sketch_echo.ino | 8 +- .../sketch_tinyproto01/sketch_tinyproto01.ino | 4 +- .../keywords.txt | 0 .../library.properties | 6 +- .../src/TinyProtocol.cpp | 2 +- .../src/TinyProtocol.h} | 4 +- .../src/proto/crc.c | 0 .../src/proto/crc.h | 0 .../TinyProtocol/src/proto/tiny_config.h | 17 + .../src/proto/tiny_defines.h | 0 .../src/proto/tiny_layer2.c | 0 .../src/proto/tiny_layer2.h | 0 .../examples/sketch_echo/sketch_echo.ino | 8 +- .../sketch_tinyproto01/sketch_tinyproto01.ino | 4 +- ...brary.properties => library.properties.in} | 0 src/arduino/src/TinyProtocol.h | 4 +- 50 files changed, 87 insertions(+), 4401 deletions(-) delete mode 100755 releases/arduino/TinyProto-Full/examples/sketch_tinyproto01/sketch_tinyproto01.ino delete mode 100644 releases/arduino/TinyProto-Full/library.properties delete mode 100644 releases/arduino/TinyProto-Full/src/TinyProto-Full.h delete mode 100644 releases/arduino/TinyProto-Full/src/TinyProtocol.cpp delete mode 100644 releases/arduino/TinyProto-Full/src/proto/tiny_config.h delete mode 100644 releases/arduino/TinyProto-Micro/README.md delete mode 100755 releases/arduino/TinyProto-Micro/examples/sketch_echo/sketch_echo.ino delete mode 100755 releases/arduino/TinyProto-Micro/examples/sketch_tinyproto01/sketch_tinyproto01.ino delete mode 100644 releases/arduino/TinyProto-Micro/keywords.txt delete mode 100644 releases/arduino/TinyProto-Micro/library.properties delete mode 100644 releases/arduino/TinyProto-Micro/src/TinyProtocol.cpp delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/crc.c delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/crc.h delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/tiny_config.h delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/tiny_defines.h delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.c delete mode 100644 releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.h delete mode 100644 releases/arduino/TinyProto-Nano/README.md delete mode 100755 releases/arduino/TinyProto-Nano/examples/sketch_echo/sketch_echo.ino delete mode 100644 releases/arduino/TinyProto-Nano/keywords.txt delete mode 100644 releases/arduino/TinyProto-Nano/src/TinyProto-Nano.h delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/crc.c delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/crc.h delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/tiny_config.h delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/tiny_defines.h delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.c delete mode 100644 releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.h rename releases/arduino/{TinyProto-Full => TinyProtocol}/README.md (100%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/examples/sketch_echo/sketch_echo.ino (94%) rename releases/arduino/{TinyProto-Nano => TinyProtocol}/examples/sketch_tinyproto01/sketch_tinyproto01.ino (98%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/keywords.txt (100%) rename releases/arduino/{TinyProto-Nano => TinyProtocol}/library.properties (88%) rename releases/arduino/{TinyProto-Nano => TinyProtocol}/src/TinyProtocol.cpp (98%) rename releases/arduino/{TinyProto-Micro/src/TinyProto-Micro.h => TinyProtocol/src/TinyProtocol.h} (98%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/src/proto/crc.c (100%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/src/proto/crc.h (100%) create mode 100644 releases/arduino/TinyProtocol/src/proto/tiny_config.h rename releases/arduino/{TinyProto-Full => TinyProtocol}/src/proto/tiny_defines.h (100%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/src/proto/tiny_layer2.c (100%) rename releases/arduino/{TinyProto-Full => TinyProtocol}/src/proto/tiny_layer2.h (100%) rename src/arduino/{library.properties => library.properties.in} (100%) diff --git a/Makefile b/Makefile index c93fc346..4d51bfb8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ OS ?= os/linux DESTDIR ?= BLD ?= bld -VERSION=0.1.2 +VERSION=0.2.0 ifeq ($(TINYCONF), nano) CONFIG_ENABLE_FCS32 ?= n @@ -88,7 +88,7 @@ ifeq ($(CONFIG_ENABLE_STATS),y) endif .PHONY: clean library examples all install install-lib doc \ - arduino-nano arduino-micro arduino-full arduino-pkg + arduino-pkg # ************* Compiling example ****************** @@ -146,55 +146,23 @@ examples: $(OBJ_EXAMPLE) $(OBJ_UART) library $(CC) $(CCFLAGS) -o $(BLD)/$(TARGET_UART) $(OBJ_UART) $(LIBS_EXAMPLE) ##################################################################################################### -####################### arduino libraries ####################### +####################### arduino library ####################### ##################################################################################################### ARDUINO_BASE_LIB=TinyProtocol -ARDUINO_NANO_LIB=TinyProto-Nano -ARDUINO_MICRO_LIB=TinyProto-Micro -ARDUINO_FULL_LIB=TinyProto-Full +ARDUINO_LIB=TinyProtocol ARDUINO_BASE_DIR=./src/arduino -ARDUINO_NANO_DIR=./releases/arduino/$(ARDUINO_NANO_LIB) -ARDUINO_MICRO_DIR=./releases/arduino/$(ARDUINO_MICRO_LIB) -ARDUINO_FULL_DIR=./releases/arduino/$(ARDUINO_FULL_LIB) +ARDUINO_DIR=./releases/arduino/$(ARDUINO_LIB) ARDUINO_BASE_URL=https://github.com/lexus2k/tinyproto/tree/master/releases/arduino -arduino-nano: - @mkdir -p $(ARDUINO_NANO_DIR) - @cp -rf -L $(ARDUINO_BASE_DIR)/* $(ARDUINO_NANO_DIR)/ - @echo "#define CONFIG_ENABLE_CHECKSUM" > $(ARDUINO_NANO_DIR)/src/proto/tiny_config.h - @sed -i "s/VERSION/$(VERSION)/" $(ARDUINO_NANO_DIR)/library.properties - @sed -i "s/LIBRARY/$(ARDUINO_NANO_LIB)/" $(ARDUINO_NANO_DIR)/library.properties - @sed -i "s,ADDRESS,$(ARDUINO_BASE_URL)/$(ARDUINO_NANO_LIB),g" $(ARDUINO_NANO_DIR)/library.properties - @mv $(ARDUINO_NANO_DIR)/src/$(ARDUINO_BASE_LIB).h $(ARDUINO_NANO_DIR)/src/$(ARDUINO_NANO_LIB).h - @sed -i "s/$(ARDUINO_BASE_LIB).h/$(ARDUINO_NANO_LIB).h/" $(ARDUINO_NANO_DIR)/src/TinyProtocol.cpp - -arduino-micro: - @mkdir -p $(ARDUINO_MICRO_DIR)/ - @cp -rf -L $(ARDUINO_BASE_DIR)/* $(ARDUINO_MICRO_DIR)/ - @echo "#define CONFIG_ENABLE_CHECKSUM" > $(ARDUINO_MICRO_DIR)/src/proto/tiny_config.h - @echo "#define CONFIG_ENABLE_FCS16" >> $(ARDUINO_MICRO_DIR)/src/proto/tiny_config.h - @sed -i "s/VERSION/$(VERSION)/" $(ARDUINO_MICRO_DIR)/library.properties - @sed -i "s/LIBRARY/$(ARDUINO_MICRO_LIB)/" $(ARDUINO_MICRO_DIR)/library.properties - @sed -i "s,ADDRESS,$(ARDUINO_BASE_URL)/$(ARDUINO_MICRO_LIB),g" $(ARDUINO_MICRO_DIR)/library.properties - @mv $(ARDUINO_MICRO_DIR)/src/$(ARDUINO_BASE_LIB).h $(ARDUINO_MICRO_DIR)/src/$(ARDUINO_MICRO_LIB).h - @sed -i "s/$(ARDUINO_BASE_LIB).h/$(ARDUINO_MICRO_LIB).h/" $(ARDUINO_MICRO_DIR)/src/TinyProtocol.cpp - -arduino-full: - @mkdir -p $(ARDUINO_FULL_DIR)/ - @cp -rf -L $(ARDUINO_BASE_DIR)/* $(ARDUINO_FULL_DIR)/ - @echo "#define CONFIG_ENABLE_CHECKSUM" > $(ARDUINO_FULL_DIR)/src/proto/tiny_config.h - @echo "#define CONFIG_ENABLE_FCS16" >> $(ARDUINO_FULL_DIR)/src/proto/tiny_config.h - @echo "#define CONFIG_ENABLE_FCS32" >> $(ARDUINO_FULL_DIR)/src/proto/tiny_config.h - @echo "#define CONFIG_ENABLE_STATS" >> $(ARDUINO_FULL_DIR)/src/proto/tiny_config.h - @sed -i "s/VERSION/$(VERSION)/" $(ARDUINO_FULL_DIR)/library.properties - @sed -i "s/LIBRARY/$(ARDUINO_FULL_LIB)/" $(ARDUINO_FULL_DIR)/library.properties - @sed -i "s,ADDRESS,$(ARDUINO_BASE_URL)/$(ARDUINO_FULL_LIB),g" $(ARDUINO_FULL_DIR)/library.properties - @mv $(ARDUINO_FULL_DIR)/src/$(ARDUINO_BASE_LIB).h $(ARDUINO_FULL_DIR)/src/$(ARDUINO_FULL_LIB).h - @sed -i "s/$(ARDUINO_BASE_LIB).h/$(ARDUINO_FULL_LIB).h/" $(ARDUINO_FULL_DIR)/src/TinyProtocol.cpp - -arduino-pkg: arduino-nano arduino-micro arduino-full doc +arduino-pkg: + @mkdir -p $(ARDUINO_DIR) + @cp -rf -L $(ARDUINO_BASE_DIR)/* $(ARDUINO_DIR)/ + @mv $(ARDUINO_DIR)/library.properties.in $(ARDUINO_DIR)/library.properties + @sed -i "s/VERSION/$(VERSION)/" $(ARDUINO_DIR)/library.properties + @sed -i "s/LIBRARY/$(ARDUINO_LIB)/" $(ARDUINO_DIR)/library.properties + @sed -i "s,ADDRESS,$(ARDUINO_BASE_URL)/$(ARDUINO_LIB),g" $(ARDUINO_DIR)/library.properties @echo "arduino package build ... [DONE]" diff --git a/doc/html/classTiny_1_1Proto.html b/doc/html/classTiny_1_1Proto.html index 9d9ae3d6..492e649e 100644 --- a/doc/html/classTiny_1_1Proto.html +++ b/doc/html/classTiny_1_1Proto.html @@ -318,7 +318,7 @@
-

Enables CRC 8-bit field in the protocol. This field contains sum of all data bytes in the packet. 8-bit field is not supported by Nano version of Tiny library.

Returns
true if successful false in case of error.
+

Enables CRC 8-bit field in the protocol. This field contains sum of all data bytes in the packet. 8-bit field is supported by Nano version of Tiny library.

Returns
true if successful false in case of error.
@@ -350,7 +350,7 @@
-

Enables CRC 32-bit field in the protocol. This field contains FCS 32-bit CCITT like defined in RFC 1662. 32-bit field is not supported by Nano and Micro versions of Tiny library.

Returns
true if successful false in case of error.
+

Enables CRC 32-bit field in the protocol. This field contains FCS 32-bit CCITT like defined in RFC 1662. 32-bit field is not supported by Nano version of Tiny library.

Returns
true if successful false in case of error.
diff --git a/doc/html/tiny__config_8h_source.html b/doc/html/tiny__config_8h_source.html index 6b27bcb2..0d59f2aa 100644 --- a/doc/html/tiny__config_8h_source.html +++ b/doc/html/tiny__config_8h_source.html @@ -91,7 +91,20 @@
tiny_config.h
-
+
1 #ifdef ARDUINO_AVR_NANO
+
2 // Tiny protocol configuration for Nano boards
+
5 
+
6 # define CONFIG_ENABLE_CHECKSUM
+
7 
+
8 #else
+
9 // Tiny protocol configuration for All other boards
+
12 
+
13 # define CONFIG_ENABLE_CHECKSUM
+
14 # define CONFIG_ENABLE_FCS16
+
15 # define CONFIG_ENABLE_FCS32
+
16 
+
17 #endif
+
Generated by   diff --git a/doc/latex/classTiny_1_1Proto.tex b/doc/latex/classTiny_1_1Proto.tex index 62ab3fac..4420c606 100644 --- a/doc/latex/classTiny_1_1Proto.tex +++ b/doc/latex/classTiny_1_1Proto.tex @@ -124,7 +124,7 @@ \subsection{Member Function Documentation} {} \end{DoxyParamCaption} )}\label{classTiny_1_1Proto_abb6cbae9a9944dc9ae0d756554f65a52} -Enables C\+R\+C 8-\/bit field in the protocol. This field contains sum of all data bytes in the packet. 8-\/bit field is not supported by Nano version of Tiny library. \begin{DoxyReturn}{Returns} +Enables C\+R\+C 8-\/bit field in the protocol. This field contains sum of all data bytes in the packet. 8-\/bit field is supported by Nano version of Tiny library. \begin{DoxyReturn}{Returns} true if successful false in case of error. \end{DoxyReturn} \hypertarget{classTiny_1_1Proto_a794afcac2ca15544247c34b059bc1289}{}\index{Tiny\+::\+Proto@{Tiny\+::\+Proto}!enable\+Crc16@{enable\+Crc16}} @@ -144,7 +144,7 @@ \subsection{Member Function Documentation} {} \end{DoxyParamCaption} )}\label{classTiny_1_1Proto_a2ef1c80490d9343b896180ab8b8a6f77} -Enables C\+R\+C 32-\/bit field in the protocol. This field contains F\+C\+S 32-\/bit C\+C\+I\+T\+T like defined in R\+F\+C 1662. 32-\/bit field is not supported by Nano and Micro versions of Tiny library. \begin{DoxyReturn}{Returns} +Enables C\+R\+C 32-\/bit field in the protocol. This field contains F\+C\+S 32-\/bit C\+C\+I\+T\+T like defined in R\+F\+C 1662. 32-\/bit field is not supported by Nano version of Tiny library. \begin{DoxyReturn}{Returns} true if successful false in case of error. \end{DoxyReturn} \hypertarget{classTiny_1_1Proto_a9fdd64b8296e27f3205cd0d3ea685eac}{}\index{Tiny\+::\+Proto@{Tiny\+::\+Proto}!enable\+Uid@{enable\+Uid}} diff --git a/doc/latex/refman.tex b/doc/latex/refman.tex index a8252141..c708aec6 100644 --- a/doc/latex/refman.tex +++ b/doc/latex/refman.tex @@ -71,8 +71,8 @@ \fancyhead[RO]{\fancyplain{}{\bfseries\thepage}} \fancyfoot[LE]{\fancyplain{}{}} \fancyfoot[CE]{\fancyplain{}{}} -\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Sat Mar 26 2016 20\+:04\+:50 for Tiny protocol by Doxygen }} -\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Sat Mar 26 2016 20\+:04\+:50 for Tiny protocol by Doxygen }} +\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Mar 30 2016 21\+:07\+:28 for Tiny protocol by Doxygen }} +\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Mar 30 2016 21\+:07\+:28 for Tiny protocol by Doxygen }} \fancyfoot[CO]{\fancyplain{}{}} \fancyfoot[RO]{\fancyplain{}{}} \renewcommand{\footrulewidth}{0.4pt} @@ -128,7 +128,7 @@ \vspace*{1cm} {\large Generated by Doxygen 1.8.9.1}\\ \vspace*{0.5cm} -{\small Sat Mar 26 2016 20:04:50}\\ +{\small Wed Mar 30 2016 21:07:28}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/inc/os/arduino/tiny_config.h b/inc/os/arduino/tiny_config.h index e69de29b..b070d01b 100644 --- a/inc/os/arduino/tiny_config.h +++ b/inc/os/arduino/tiny_config.h @@ -0,0 +1,17 @@ +#ifdef ARDUINO_AVR_NANO +///////////////////////////////////////////////////////////////// +// Tiny protocol configuration for Nano boards +///////////////////////////////////////////////////////////////// + +# define CONFIG_ENABLE_CHECKSUM + +#else +///////////////////////////////////////////////////////////////// +// Tiny protocol configuration for All other boards +///////////////////////////////////////////////////////////////// + +# define CONFIG_ENABLE_CHECKSUM +# define CONFIG_ENABLE_FCS16 +# define CONFIG_ENABLE_FCS32 + +#endif diff --git a/releases/arduino/TinyProto-Full/examples/sketch_tinyproto01/sketch_tinyproto01.ino b/releases/arduino/TinyProto-Full/examples/sketch_tinyproto01/sketch_tinyproto01.ino deleted file mode 100755 index 041bbfcd..00000000 --- a/releases/arduino/TinyProto-Full/examples/sketch_tinyproto01/sketch_tinyproto01.ino +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This example sends packet every second. - * If some packet is received from remote side, it echos content back to the sender - */ -#include - -const int PIN_LED = 13; - -/* Creating protocol object is simple */ -Tiny::Proto proto; - -void setup() { - pinMode(PIN_LED, OUTPUT); - /* No timeout, since we want non-blocking UART operations */ - Serial.setTimeout(0); - /* Initialize serial protocol for test purposes */ - Serial.begin(9600); - /* Redirect all protocol communication to Serial0 UART */ - proto.beginToSerial(); - /* We do not want to use crc */ - proto.disableCrc(); -} - -/* Specify buffer for packets to send and receive */ -char g_inBuf[16]; -char g_outBuf[16]; - -/* Create special class, which simplifies the work with buffer */ -Tiny::Packet outPacket(g_outBuf, sizeof(g_outBuf)); -Tiny::Packet inPacket(g_inBuf, sizeof(g_inBuf)); - - -void loop() -{ - /* Create simple packet, containing only text */ - outPacket.clear(); - outPacket.put("\nHello\n"); - - /* Send packet over UART to other side */ - proto.write(outPacket, TINY_FLAG_WAIT_FOREVER); - - /* Check if some data are waiting for reading in UART */ - /* If there is no delay in loop() cycle, there is no need to check for OUT_OF_SYNC error */ - int len; - do { - len = proto.read(inPacket, TINY_FLAG_NO_WAIT); - } while (len == TINY_ERR_OUT_OF_SYNC); - if (len > 0) - { - /* Send received packet back to UART (echo) */ - proto.write(inPacket, TINY_FLAG_WAIT_FOREVER); - } - delay(985); - digitalWrite(PIN_LED, HIGH); - delay(15); - digitalWrite(PIN_LED, LOW); -} diff --git a/releases/arduino/TinyProto-Full/library.properties b/releases/arduino/TinyProto-Full/library.properties deleted file mode 100644 index ccedbdb6..00000000 --- a/releases/arduino/TinyProto-Full/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=TinyProto-Full -version=0.1.2 -author=Alexey Dynda -maintainer=Alexey Dynda -sentence=Allows to communicate other boards/PC via any physical connection. -paragraph=Using this library you can easy communicate your Arduino with applications on PC and other boards. You don't need to think about data synchronization between points. -category=Communication -url=https://github.com/lexus2k/tinyproto/tree/master/releases/arduino/TinyProto-Full -architectures=* diff --git a/releases/arduino/TinyProto-Full/src/TinyProto-Full.h b/releases/arduino/TinyProto-Full/src/TinyProto-Full.h deleted file mode 100644 index 2a7334cc..00000000 --- a/releases/arduino/TinyProto-Full/src/TinyProto-Full.h +++ /dev/null @@ -1,386 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -/** - This is Tiny protocol implementation for microcontrollers - - @file - @brief Tiny protocol Arduino API - -*/ - -#ifndef _TINY_PROTOCOL_H_ -#define _TINY_PROTOCOL_H_ - -#include "proto/tiny_layer2.h" - -#ifdef ARDUINO -# include -#endif - -namespace Tiny { - -class Packet; - -/** - * Proto class incapsulates Protocol functionality. - * Remember that you may use always C-style API functions - * instead C++. Please refer to documentation. - */ -class Proto -{ -public: - inline Proto() { m_uidEnabled = false; } - - /** - * Initializes protocol internal variables. - * If you need to switch communication with other destination - * point, you can call this method one again after calling end(). - * @param writecb - write function to some physical channel - * @param readcb - read function from some physical channel - * @return None - */ - void begin (write_block_cb_t writecb, - read_block_cb_t readcb); - -#ifdef ARDUINO - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial connection (Serial). - * @return None - */ - inline void beginToSerial() - { - begin([](const uint8_t *b, int s)->int { return Serial.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial.readBytes(b, s); }); - } - -#if HAVE_HWSERIAL1 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial1 connection (Serial1). - * @return None - */ - inline void beginToSerial1() - { - begin([](const uint8_t *b, int s)->int { return Serial1.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial1.readBytes(b, s); }); - } -#endif - -#if HAVE_HWSERIAL2 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial2 connection (Serial2). - * @return None - */ - inline void beginToSerial2() - { - begin([](const uint8_t *b, int s)->int { return Serial2.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial2.readBytes(b, s); }); - } -#endif - -#if HAVE_HWSERIAL3 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial3 connection (Serial3). - * @return None - */ - inline void beginToSerial3() - { - begin([](const uint8_t *b, int s)->int { return Serial3.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial3.readBytes(b, s); }); - } -#endif - -#endif - - /** - * Resets protocol state. - */ - void end (); - - /** - * Sends data block over communication channel. - * @param buf - data to send - * @param size - length of the data in bytes - * @param flags - flags. @ref FLAGS_GROUP - * @return negative value in case of error - * zero if nothing is sent - * positive - should be equal to size parameter - */ - int write (char* buf, int size, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Reads data block from communication channel. - * @param buf - buffer to place data read from communication channel - * @param size - maximum size of the buffer in bytes. - * @param flags - @ref FLAGS_GROUP - * @return negative value in case of error - * zero if nothing is read - * positive - number of bytes read from the channel - */ - int read (char* buf, int size, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Sends packet over communication channel. - * @param pkt - Packet to send - * @param flags - @ref FLAGS_GROUP - * @see Packet - * @return negative value in case of error - * zero if nothing is sent - * positive - Packet is successfully sent - */ - int write (Packet &pkt, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Reads packet from communication channel. - * @param pkt - Packet object to put data to - * @param flags - @ref FLAGS_GROUP - * @see Packet - * @return negative value in case of error - * zero if nothing is read - * positive - Packet is successfully received - */ - int read (Packet &pkt, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Disable CRC field in the protocol. - * If CRC field is OFF, then the frame looks like this: - * 0x7E databytes 0x7E. - */ - void disableCrc (); - - /** - * Enables CRC 8-bit field in the protocol. This field - * contains sum of all data bytes in the packet. - * 8-bit field is not supported by Nano version of Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCheckSum (); - - /** - * Enables CRC 16-bit field in the protocol. This field - * contains FCS 16-bit CCITT like defined in RFC 1662. - * 16-bit field is not supported by Nano version of Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCrc16 (); - - /** - * Enables CRC 32-bit field in the protocol. This field - * contains FCS 32-bit CCITT like defined in RFC 1662. - * 32-bit field is not supported by Nano and Micro versions of - * Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCrc32 (); - - /** - * Enables Uid field in the protocol. If enabled this 16-bit field - * with packet identifier is added before each payload data. - * Frame with uid: 0x7E 16-bituid payload 0x7E - * Frame without uid: 0x7E payload 0x7E - */ - inline void enableUid() { m_uidEnabled = true; } - - /** - * Disables Uid field in the protocol. If enabled this 16-bit field - * with packet identifier is added before each payload data. - * Frame with uid: 0x7E 16-bituid payload 0x7E - * Frame without uid: 0x7E payload 0x7E - */ - inline void disableUid(){ m_uidEnabled = false; } - -private: - STinyData m_data; - uint8_t m_uidEnabled; -}; - - -/** - * Describes packet entity and provides API methods to - * manipulate the packet. - */ -class Packet -{ -public: - /** - * Creates packet object. - * @param buf - pointer to the buffer to store packet data - * @param size - size of the buffer to hold packet data - * @note passed buffer must exist all lifecycle of the Packet object. - */ - Packet(char *buf, size_t size) { m_len = 0; m_size = size; m_buf = (uint8_t*)buf; } - - /** - * Clears Packet state. Buffer and its size are preserved. - */ - inline void clear () { m_len = 0; m_p = 0; } - - /** - * Puts next byte to the packet. For example, after calling this method - * twice: put(5), put(10), - the Packet will contain 5,10. - * @param byte - data byte to put. - */ - inline void put (uint8_t byte) { m_buf[m_len++] = byte; } - - /** - * Puts next char to the packet. For example, after calling this method - * twice: put('a'), put('c'), - the Packet will contain 'ac'. - * @param chr - character to put. - */ - inline void put (char chr) { put((uint8_t)chr); } - - /** - * Puts next 16-bit unsigned integer to the packet. - * @param data - data to put. - */ - inline void put (uint16_t data) { m_buf[m_len++] = data & 0x00FF; - m_buf[m_len++] = data >> 8; } - - /** - * Puts next 32-bit unsigned integer to the packet. - * @param data - data to put. - */ - inline void put (uint32_t data) { put((uint16_t)data & 0x0000FFFF); - put((uint16_t)(data >> 16)); } - - /** - * Puts next 16-bit signed integer to the packet. - * @param data - data to put. - */ - inline void put (int16_t data) { put((uint16_t)data); } - - /** - * Puts next null-terminated string to the packet. - * @param str - string to put. - */ - inline void put (const char *str){ strncpy((char *)&m_buf[m_len], str, m_size - m_len); - m_len += strlen(str); - m_buf[m_len++] = 0; } - - /** - * Adds data from packet to the new packet being built. - * @param pkt - reference to the Packet to add. - */ - inline void put (const Packet &pkt){ memcpy(&m_buf[m_len], pkt.m_buf, pkt.m_len); m_len += pkt.m_len; } - - /** - * Puts uid to the packet. - * @warning uid is sent only if this functionality is enabled in the Proto. - * @see Proto::enableUid - * @see Proto::disableUid - * @param uid - 16-bit number to place to the packet. - */ - inline void putUid (uint16_t uid) { m_uid = uid; } - - /** - * Reads next byte from the packet. - * @return byte from the packet. - */ - inline uint8_t getByte () { return m_buf[m_p++]; } - - /** - * Reads next character from the packet. - * @return character from the packet. - */ - inline char getChar () { return (char)Packet::getByte(); } - - /** - * Reads next unsigned 16-bit integer from the packet. - * @return unsigned 16-bit integer. - */ - inline uint16_t getUint16() { return (uint16_t)m_buf[m_p++] | (m_buf[m_p++] << 8); } - - /** - * Reads next signed 16-bit integer from the packet. - * @return signed 16-bit integer. - */ - inline int16_t getInt16 () { return (int16_t)(getUint16()); } - - /** - * Reads next unsigned 32-bit integer from the packet. - * @return unsigned 32-bit integer. - */ - inline uint32_t getUint32() { return getUint16() | ((uint32_t)getUint16())<<16; } - - /** - * Reads zero-terminated string from the packet. - * @return zero-terminated string. - */ - inline char* getString () { char *p = (char *)&m_buf[m_p]; m_p += strlen((char*)m_buf) + 1; return p; } - - /** - * Returns 16-bit identificator of the packet. - * @warning uid is valid only if uid functionality is enabled in the Proto - * @see Proto::enableUid - * @see Proto::disableUid - * @return 16-bit uid. - */ - inline uint16_t getUid () { return m_uid; } - - /** - * Returns size of payload data in the received packet. - * @return size of payload data. - */ - inline size_t size () { return m_len; } - - /** - * Returns maximum size of packet buffer. - * @return max size of packet buffer. - */ - inline size_t maxSize () { return m_size; } - - /** - * Returns size of payload data in the received packet. - * @return size of payload data. - */ - inline char *data () { return (char*)m_buf; } - - /** - * You may refer to Packet payload data directly by using operator [] - */ - uint8_t &operator[] (size_t idx) { return m_buf[idx]; } - - /** - * Assign operator = puts next char to the packet. Several - * assign operators put one by one several chars. - */ - Packet &operator= (char chr){ put(chr); return *this; } - -private: - friend class Proto; - - uint8_t* m_buf; - uint16_t m_uid; - uint8_t m_size; - uint8_t m_len; - uint8_t m_p; -}; - - -} // Tiny namespace - -#endif - diff --git a/releases/arduino/TinyProto-Full/src/TinyProtocol.cpp b/releases/arduino/TinyProto-Full/src/TinyProtocol.cpp deleted file mode 100644 index d0c330bc..00000000 --- a/releases/arduino/TinyProto-Full/src/TinyProtocol.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -#if defined(ARDUINO) -# if ARDUINO >= 100 - #include "Arduino.h" -# else - #include "WProgram.h" -# endif -#endif - -#include "TinyProto-Full.h" - -namespace Tiny { -/////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////// - -void Proto::begin(write_block_cb_t writecb, - read_block_cb_t readcb) -{ - tiny_init(&m_data, writecb, readcb); -} - -void Proto::end() -{ - tiny_close(&m_data); -} - -int Proto::write(char* buf, int size, uint8_t flags) -{ - return tiny_send(&m_data, 0, (uint8_t*)buf, size, flags); -} - -int Proto::read(char *buf, int size, uint8_t flags) -{ - return tiny_read(&m_data, 0, (uint8_t*)buf, size, flags); -} - -int Proto::write(Packet &pkt, uint8_t flags) -{ - return tiny_send(&m_data, m_uidEnabled ? &pkt.m_uid : 0, pkt.m_buf, pkt.m_len, flags) > 0; -} - -int Proto::read(Packet &pkt, uint8_t flags) -{ - int len = tiny_read(&m_data, m_uidEnabled ? &pkt.m_uid : 0, pkt.m_buf, pkt.m_size, flags); - pkt.m_p = 0; - pkt.m_len = len; - return len; -} - -void Proto::disableCrc() -{ - tiny_set_fcs_bits(&m_data, 0); -} - -bool Proto::enableCheckSum() -{ - return tiny_set_fcs_bits(&m_data, 8) == TINY_NO_ERROR; -} - -bool Proto::enableCrc16() -{ - return tiny_set_fcs_bits(&m_data, 16) == TINY_NO_ERROR; -} - -bool Proto::enableCrc32() -{ - return tiny_set_fcs_bits(&m_data, 32) == TINY_NO_ERROR; -} - -/////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////// - -} // namespace Tiny - diff --git a/releases/arduino/TinyProto-Full/src/proto/tiny_config.h b/releases/arduino/TinyProto-Full/src/proto/tiny_config.h deleted file mode 100644 index 0c2f65f0..00000000 --- a/releases/arduino/TinyProto-Full/src/proto/tiny_config.h +++ /dev/null @@ -1,4 +0,0 @@ -#define CONFIG_ENABLE_CHECKSUM -#define CONFIG_ENABLE_FCS16 -#define CONFIG_ENABLE_FCS32 -#define CONFIG_ENABLE_STATS diff --git a/releases/arduino/TinyProto-Micro/README.md b/releases/arduino/TinyProto-Micro/README.md deleted file mode 100644 index 6b9bf0b5..00000000 --- a/releases/arduino/TinyProto-Micro/README.md +++ /dev/null @@ -1,27 +0,0 @@ -= Tiny Protocol library for Arduino = - -With this library you can easy communicate your Arduino with applications -on PC and other boards. You don't need to think about data synchronization -between points. - -For more information about this library please visit -https://github.com/lexus2k/tinyproto - -== License == -Copyright 2016 (C) Alexey Dynda - -This file is part of Protocol Library. - -Protocol 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 3 of the License, or -(at your option) any later version. - -Protocol 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 Protocol Library. If not, see . - diff --git a/releases/arduino/TinyProto-Micro/examples/sketch_echo/sketch_echo.ino b/releases/arduino/TinyProto-Micro/examples/sketch_echo/sketch_echo.ino deleted file mode 100755 index 35f2e2db..00000000 --- a/releases/arduino/TinyProto-Micro/examples/sketch_echo/sketch_echo.ino +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This example sends back every packet received over UART. - * To test this example, just compile it and upload to Arduino controller. - * Open Serial Monitor in Arduino IDE. send anything typing data around - * '~' chars (for example, ~Welcome~ ), and Arduino will send back the packet to you. - * - * TinyProtocol uses some special frame format, that means that it will ignore not valid - * chars received over UART. Each packet should be in the following format: - * ~[UID]DATA[FCS]~ - * UID and FCS field are optional. In the example below, they are disabled. Nano versition - * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use Micro and - * Full versions of Tiny protocol. - */ -#include - -/* Creating protocol object is simple */ -Tiny::Proto proto; - -void setup() { - /* No timeout, since we want non-blocking UART operations. */ - Serial.setTimeout(0); - /* Initialize serial protocol for test purposes */ - Serial.begin(9600); - /* Redirect all protocol communication to Serial0 UART */ - proto.beginToSerial(); - /* We do not want to use crc */ - proto.disableCrc(); -} - -/* Specify buffer for packets to send and receive */ -char g_buf[16]; - -/* Create special class, which simplifies the work with buffer */ -Tiny::Packet g_packet(g_buf, sizeof(g_buf)); - -void loop() -{ - /* Check if some data are waiting for reading in UART */ - /* If there is no delay in loop() cycle, there is no need to check for OUT_OF_SYNC error */ - int len = proto.read(g_packet, TINY_FLAG_WAIT_FOREVER); - /* Check if we received something with no error */ - if (len > 0) - { - /* Send received packet back to UART (echo) */ - proto.write(g_packet, TINY_FLAG_WAIT_FOREVER); - } -} diff --git a/releases/arduino/TinyProto-Micro/examples/sketch_tinyproto01/sketch_tinyproto01.ino b/releases/arduino/TinyProto-Micro/examples/sketch_tinyproto01/sketch_tinyproto01.ino deleted file mode 100755 index 041bbfcd..00000000 --- a/releases/arduino/TinyProto-Micro/examples/sketch_tinyproto01/sketch_tinyproto01.ino +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This example sends packet every second. - * If some packet is received from remote side, it echos content back to the sender - */ -#include - -const int PIN_LED = 13; - -/* Creating protocol object is simple */ -Tiny::Proto proto; - -void setup() { - pinMode(PIN_LED, OUTPUT); - /* No timeout, since we want non-blocking UART operations */ - Serial.setTimeout(0); - /* Initialize serial protocol for test purposes */ - Serial.begin(9600); - /* Redirect all protocol communication to Serial0 UART */ - proto.beginToSerial(); - /* We do not want to use crc */ - proto.disableCrc(); -} - -/* Specify buffer for packets to send and receive */ -char g_inBuf[16]; -char g_outBuf[16]; - -/* Create special class, which simplifies the work with buffer */ -Tiny::Packet outPacket(g_outBuf, sizeof(g_outBuf)); -Tiny::Packet inPacket(g_inBuf, sizeof(g_inBuf)); - - -void loop() -{ - /* Create simple packet, containing only text */ - outPacket.clear(); - outPacket.put("\nHello\n"); - - /* Send packet over UART to other side */ - proto.write(outPacket, TINY_FLAG_WAIT_FOREVER); - - /* Check if some data are waiting for reading in UART */ - /* If there is no delay in loop() cycle, there is no need to check for OUT_OF_SYNC error */ - int len; - do { - len = proto.read(inPacket, TINY_FLAG_NO_WAIT); - } while (len == TINY_ERR_OUT_OF_SYNC); - if (len > 0) - { - /* Send received packet back to UART (echo) */ - proto.write(inPacket, TINY_FLAG_WAIT_FOREVER); - } - delay(985); - digitalWrite(PIN_LED, HIGH); - delay(15); - digitalWrite(PIN_LED, LOW); -} diff --git a/releases/arduino/TinyProto-Micro/keywords.txt b/releases/arduino/TinyProto-Micro/keywords.txt deleted file mode 100644 index cd15c4f2..00000000 --- a/releases/arduino/TinyProto-Micro/keywords.txt +++ /dev/null @@ -1,28 +0,0 @@ -####################################### -# Syntax Coloring Map For TinyProto -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -Proto KEYWORD1 -Packet KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -begin KEYWORD2 -toSerial KEYWORD2 -disableCrc KEYWORD2 -enableCrc16 KEYWORD2 -enableCrc32 KEYWORD2 -enableCheckSum KEYWORD2 -getWord KEYWORD2 -getByte KEYWORD2 -getChar KEYWORD2 - -####################################### -# Constants (LITERAL1) -####################################### diff --git a/releases/arduino/TinyProto-Micro/library.properties b/releases/arduino/TinyProto-Micro/library.properties deleted file mode 100644 index 2a25dd3f..00000000 --- a/releases/arduino/TinyProto-Micro/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=TinyProto-Micro -version=0.1.2 -author=Alexey Dynda -maintainer=Alexey Dynda -sentence=Allows to communicate other boards/PC via any physical connection. -paragraph=Using this library you can easy communicate your Arduino with applications on PC and other boards. You don't need to think about data synchronization between points. -category=Communication -url=https://github.com/lexus2k/tinyproto/tree/master/releases/arduino/TinyProto-Micro -architectures=* diff --git a/releases/arduino/TinyProto-Micro/src/TinyProtocol.cpp b/releases/arduino/TinyProto-Micro/src/TinyProtocol.cpp deleted file mode 100644 index 12d21327..00000000 --- a/releases/arduino/TinyProto-Micro/src/TinyProtocol.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -#if defined(ARDUINO) -# if ARDUINO >= 100 - #include "Arduino.h" -# else - #include "WProgram.h" -# endif -#endif - -#include "TinyProto-Micro.h" - -namespace Tiny { -/////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////// - -void Proto::begin(write_block_cb_t writecb, - read_block_cb_t readcb) -{ - tiny_init(&m_data, writecb, readcb); -} - -void Proto::end() -{ - tiny_close(&m_data); -} - -int Proto::write(char* buf, int size, uint8_t flags) -{ - return tiny_send(&m_data, 0, (uint8_t*)buf, size, flags); -} - -int Proto::read(char *buf, int size, uint8_t flags) -{ - return tiny_read(&m_data, 0, (uint8_t*)buf, size, flags); -} - -int Proto::write(Packet &pkt, uint8_t flags) -{ - return tiny_send(&m_data, m_uidEnabled ? &pkt.m_uid : 0, pkt.m_buf, pkt.m_len, flags) > 0; -} - -int Proto::read(Packet &pkt, uint8_t flags) -{ - int len = tiny_read(&m_data, m_uidEnabled ? &pkt.m_uid : 0, pkt.m_buf, pkt.m_size, flags); - pkt.m_p = 0; - pkt.m_len = len; - return len; -} - -void Proto::disableCrc() -{ - tiny_set_fcs_bits(&m_data, 0); -} - -bool Proto::enableCheckSum() -{ - return tiny_set_fcs_bits(&m_data, 8) == TINY_NO_ERROR; -} - -bool Proto::enableCrc16() -{ - return tiny_set_fcs_bits(&m_data, 16) == TINY_NO_ERROR; -} - -bool Proto::enableCrc32() -{ - return tiny_set_fcs_bits(&m_data, 32) == TINY_NO_ERROR; -} - -/////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////// - -} // namespace Tiny - diff --git a/releases/arduino/TinyProto-Micro/src/proto/crc.c b/releases/arduino/TinyProto-Micro/src/proto/crc.c deleted file mode 100644 index 3fe7287a..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/crc.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#include "crc.h" - -/* CRC32 RFC1662 (PPP in HDLC-like framing) */ - - /* - * The FCS-32 generator polynomial: x**0 + x**1 + x**2 + x**4 + x**5 - * + x**7 + x**8 + x**10 + x**11 + x**12 + x**16 - * + x**22 + x**23 + x**26 + x**32. - */ - -#ifdef CONFIG_ENABLE_FCS32 - -static uint32_t fcstab_32[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - - -uint32_t crc32_byte(uint32_t crc, uint8_t data) -{ - return fcstab_32[(crc ^ data) & 0xFF] ^ (crc >> 8); -} - - -uint32_t crc32(uint32_t crc, uint8_t *buf, int size) -{ - const uint8_t *p; - - p = buf; - crc = crc ^ ~0U; - - while (size--) - crc = fcstab_32[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - -#endif - -/* - * The FCS-16 generator polynomial: x**0 + x**5 + x**12 + x**16. - */ - -/* - * FCS lookup table as calculated by the table generator. - */ - -#ifdef CONFIG_ENABLE_FCS16 - -static uint16_t fcstab_16[256] = { - 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, - 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, - 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, - 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, - 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, - 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, - 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, - 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, - 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, - 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, - 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, - 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, - 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, - 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, - 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, - 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, - 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, - 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, - 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, - 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, - 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, - 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, - 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, - 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, - 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, - 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, - 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, - 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, - 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, - 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, - 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, - 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 - }; - - -uint16_t crc16_byte(uint16_t crc, uint8_t data) -{ - return (crc >> 8) ^ fcstab_16[(crc ^ (data)) & 0xff]; -} - - -uint16_t crc16(uint16_t crc, uint8_t* data, int data_length) -{ - while(data_length) - { - crc = (crc >> 8) ^ fcstab_16[(crc ^ (*data)) & 0xff]; - data++; - data_length--; - } - - return crc ^ ~0U; -} - - -#endif - - -#ifdef CONFIG_ENABLE_CHECKSUM - -uint16_t chksum_byte(uint16_t sum, uint8_t data) -{ - return sum + data; -} - -uint16_t chksum(uint16_t sum, uint8_t* data, int data_length) -{ - while(data_length) - { - sum = sum + *data; - data++; - data_length--; - } - - return 0xFFFF - sum; -} - - -#endif - - - - - diff --git a/releases/arduino/TinyProto-Micro/src/proto/crc.h b/releases/arduino/TinyProto-Micro/src/proto/crc.h deleted file mode 100644 index 23ccb6b1..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/crc.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#ifndef _CRC16_H -#define _CRC16_H - -#include -#include "tiny_defines.h" - - -#ifdef CONFIG_ENABLE_CHECKSUM -#define INITCHECKSUM 0x0000 -#define GOODCHECKSUM 0x0000 -uint16_t chksum_byte(uint16_t sum, uint8_t data); -uint16_t chksum(uint16_t sum, uint8_t* data, int data_length); -#endif - -#ifdef CONFIG_ENABLE_FCS16 -#define PPPINITFCS16 0xffff /* Initial FCS value */ -#define PPPGOODFCS16 0xf0b8 /* Good final FCS value */ -uint16_t crc16_byte(uint16_t crc, uint8_t data); -uint16_t crc16(uint16_t crc, uint8_t* data, int data_length); -#endif - -#ifdef CONFIG_ENABLE_FCS32 -#define PPPINITFCS32 0xffffffff /* Initial FCS value */ -#define PPPGOODFCS32 0xdebb20e3 /* Good final FCS value */ -uint32_t crc32_byte(uint32_t crc, uint8_t data); -uint32_t crc32(uint32_t crc, uint8_t* data, int data_length); -#endif - -#endif diff --git a/releases/arduino/TinyProto-Micro/src/proto/tiny_config.h b/releases/arduino/TinyProto-Micro/src/proto/tiny_config.h deleted file mode 100644 index 05124557..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/tiny_config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define CONFIG_ENABLE_CHECKSUM -#define CONFIG_ENABLE_FCS16 diff --git a/releases/arduino/TinyProto-Micro/src/proto/tiny_defines.h b/releases/arduino/TinyProto-Micro/src/proto/tiny_defines.h deleted file mode 100644 index bc254519..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/tiny_defines.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -#ifndef _TINY_DEFINES_H_ -#define _TINY_DEFINES_H_ - -#include "tiny_config.h" - -/* For fastest version of protocol assign all defines to zero. - * In this case protocol supports no CRC field, and - * all api functions become not thread-safe. - */ - -#define ARDUINO_NANO - -#undef PLATFORM_MUTEX - -#define MUTEX_INIT(x) - -#define MUTEX_LOCK(x) - -#define MUTEX_UNLOCK(x) - -#define MUTEX_DESTROY(x) - -#undef PLATFORM_COND - -#define COND_INIT(x) - -#define COND_DESTROY(x) - -#define COND_WAIT(cond, mutex) - -#define COND_SIGNAL(x) - -#define TASK_YIELD() - -#endif /* _TINY_DEFINES_H_ */ - - diff --git a/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.c b/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.c deleted file mode 100644 index 5bbc07d5..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.c +++ /dev/null @@ -1,824 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#include "crc.h" -#include "tiny_layer2.h" - -#ifdef CONFIG_ENABLE_STATS - #define STATS(x) x -#else - #define STATS(x) -#endif - -/************************************************************ -* -* INTERNAL FRAME STRUCTURE -* -* 8 16 any len 16/32 8 -* | 7E | UID | USER DATA | FCS | 7E | -* -* 7E is standard frame delimiter (commonly use on layer 2) -* FCS is standard checksum. Refer to RFC1662 for example. -* UID is reserved for future usage -*************************************************************/ - -#define FLAG_SEQUENCE 0x7E -#define ADDRESS_FIELD 0xFF -#define CONTROL_FILED 0x03 -#define PROTOCOL_FIELD 0x00 // 8 or 16 bit -#define TINY_ESCAPE_CHAR 0x7D -#define TINY_ESCAPE_BIT 0x20 - - -/************************************************************** -* -* FCS/CHKSUM FUNCTIONS -* -***************************************************************/ - -#ifdef TINY_FCS_ENABLE -inline static void __init_fcs_field(uint8_t fcs_bits, fcs_t* fcs) -{ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = PPPINITFCS16; break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = PPPINITFCS32; break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs = INITCHECKSUM; break; -#endif - default: - break; - } -} - -inline static int __check_fcs_field(uint8_t fcs_bits, fcs_t fcs) -{ - /* Check CRC */ -#ifdef CONFIG_ENABLE_FCS32 - if ((fcs_bits == 32) && (fcs == PPPGOODFCS32)) return 1; -#endif -#ifdef CONFIG_ENABLE_FCS16 - if ((fcs_bits == 16) && (fcs == PPPGOODFCS16)) return 1; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - if ((fcs_bits == 8) && (fcs == GOODCHECKSUM)) return 1; -#endif - return fcs_bits == 0; -} - - -inline static void __update_fcs_field(uint8_t fcs_bits, fcs_t* fcs, uint8_t byte) -{ - /* CRC is calculated only over real user data and frame header */ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = crc16_byte(*fcs, byte); break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = crc32_byte(*fcs, byte); break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs += byte; break; -#endif - default: - break; - } -} - - -inline static void __commit_fcs_field(uint8_t fcs_bits, fcs_t* fcs) -{ - /* CRC is calculated only over real user data and frame header */ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = *fcs^0xFFFFFFFF; break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = *fcs^0xFFFFFFFF; break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs = 0xFFFF - *fcs; break; -#endif - default: - break; - } -} - -#else - -#define __init_fcs_field(x, y) - -#define __check_fcs_field(x, y) 1 - -#define __update_fcs_field(x, y, z) - -#define __commit_fcs_field(x, y) - -#endif - -/************************************************************** -* -* OPEN/CLOSE FUNCTIONS -* -***************************************************************/ - - -/** -* The function initializes internal structures for Tiny channel and return handle -* to be used with all Tiny and IPC functions. -* @param handle - pointer to Tiny data -* @param write_func - pointer to write data function (to communication channel). -* @param read_func - pointer to read function (from communication channel). -* @param pdata - pointer to a user private data. -* @see write_block_cb_t -* @see read_block_cb_t -* @return TINY_NO_ERROR or error code. -*/ -#ifndef ARDUINO_NANO -int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func, - void *pdata) -#else -int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func) -#endif -{ - if (!handle || !write_func || !read_func) - { - return TINY_ERR_INVALID_DATA; - } -#ifndef ARDUINO_NANO - handle->pdata = pdata; -#endif - handle->write_func = write_func; - handle->read_func = read_func; -#ifdef CONFIG_ENABLE_STATS - handle->read_cb = 0; - handle->write_cb = 0; -#endif -#ifdef TINY_FCS_ENABLE - #if defined(CONFIG_ENABLE_FCS32) - handle->fcs_bits = 32; - #elif defined(CONFIG_ENABLE_FCS16) - handle->fcs_bits = 16; - #else - handle->fcs_bits = 8; - #endif -#endif - handle->rx.inprogress = TINY_RX_STATE_IDLE; - handle->tx.inprogress = TINY_TX_STATE_IDLE; - handle->tx.pframe = 0; - MUTEX_INIT(handle->send_mutex); - COND_INIT(handle->send_condition); -#ifdef CONFIG_ENABLE_STATS - tiny_clear_stat(handle); -#endif - return TINY_NO_ERROR; -} - - -int tiny_close(STinyData *handle) -{ - if (!handle) - { - return TINY_ERR_INVALID_DATA; - } - MUTEX_LOCK(handle->send_mutex); - if (handle->rx.inprogress) - { - handle->rx.inprogress = TINY_RX_STATE_IDLE; - } - if (handle->tx.inprogress) - { - handle->tx.inprogress = TINY_TX_STATE_IDLE; - } - COND_DESTROY(handle->send_condition); - MUTEX_UNLOCK(handle->send_mutex); - MUTEX_DESTROY(handle->send_mutex); - handle->write_func = 0; - handle->read_func = 0; - return TINY_NO_ERROR; -} - - -int tiny_set_fcs_bits(STinyData *handle, uint8_t bits) -{ - int result = TINY_NO_ERROR; - switch (bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: -#endif - case 0: - handle->fcs_bits = bits; - break; - default: - result = TINY_ERR_FAILED; - break; - } - return result; -} - - -/************************************************************** -* -* SEND FUNCTIONS -* -***************************************************************/ - -#define DATA_BYTE_SENT 2 -#define BITS_NO_UID 0 -#define BITS_UID_16 16 - -static int __send_frame_flag_state(STinyData *handle) -{ - uint8_t tempbuf[1]; - int result; - /* Start frame transmission */ - tempbuf[0] = FLAG_SEQUENCE; -# ifndef ARDUINO_NANO - result = handle->write_func(handle->pdata, tempbuf, 1); -# else - result = handle->write_func(tempbuf, 1); -# endif - if (result < 0) - { - return TINY_ERR_FAILED; - } - if (result == 0) - return TINY_NO_ERROR; - if (handle->tx.inprogress == TINY_TX_STATE_START) - { - handle->tx.sentbytes = 0; - handle->tx.prevbyte = 0; - __init_fcs_field(handle->fcs_bits, &handle->tx.fcs); - if (handle->tx.bits == BITS_UID_16) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_UID; - handle->tx.bits = 0; - } - else if (handle->tx.bits == BITS_NO_UID) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_DATA; - handle->tx.bits = 0; - } - } - else - { - handle->tx.inprogress = TINY_TX_STATE_IDLE; - } - return result; -} - - -static int __send_byte_state(STinyData *handle, uint8_t byte) -{ - int result; - /* If byte value equals to some predefined char, send escape char first */ - if (handle->tx.prevbyte == TINY_ESCAPE_CHAR) - { - byte ^= TINY_ESCAPE_BIT; - } - else if ((byte == TINY_ESCAPE_CHAR) || (byte == FLAG_SEQUENCE)) - { - byte = TINY_ESCAPE_CHAR; - } -# ifndef ARDUINO_NANO - result = handle->write_func(handle->pdata, &byte, 1); -# else - result = handle->write_func(&byte, 1); -# endif - if (result <= 0) - return result; - /* We calculate crc only for user data */ - handle->tx.prevbyte = byte; - return byte != TINY_ESCAPE_CHAR; -} - - -static int __send_frame_uid_state(STinyData *handle) -{ - int result; - uint8_t byte; - byte = (handle->tx.uid >> handle->tx.bits) & 0x000000FF; - result = __send_byte_state(handle, byte); - if (result > 0) - { - __update_fcs_field(handle->fcs_bits, &handle->tx.fcs, byte); - handle->tx.bits += 8; - if (handle->tx.bits == 16) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_DATA; - } - } - return result; -} - - -/** - * This is handler for SEND DATA state. It switches to - * TINY_TX_STATE_END only if all bytes are sent. - * If next byte is successfully sent, it returns 1. - * If switched to other state, it returns 1. - * If no byte is sent during the cycle, it returns 0. - * If error happened, it returns negative value. - * @param handle - pointer to Tiny Protocol structure - */ -static int __send_frame_data_state(STinyData *handle) -{ - int result; - uint8_t byte; - if (handle->tx.sentbytes >= handle->tx.framelen) - { - __commit_fcs_field(handle->fcs_bits, &handle->tx.fcs); -#ifdef TINY_FCS_ENABLE - /* sending crc */ - handle->tx.inprogress = handle->fcs_bits ? TINY_TX_STATE_SEND_CRC : TINY_TX_STATE_END; - handle->tx.bits = 0; -#else - handle->tx.inprogress = TINY_TX_STATE_END; -#endif - return 1; - } - byte = handle->tx.pframe[handle->tx.sentbytes]; - result = __send_byte_state(handle, byte); - if (result > 0) - { - __update_fcs_field(handle->fcs_bits, &handle->tx.fcs, byte); - handle->tx.sentbytes++; - } - return result; -} - -#ifdef TINY_FCS_ENABLE -static int __send_frame_crc_state(STinyData *handle) -{ - int result; - uint8_t byte; - byte = (handle->tx.fcs >> handle->tx.bits) & 0x000000FF; - result = __send_byte_state(handle, byte); - if (result > 0) - { - handle->tx.bits += 8; - if (handle->tx.bits == handle->fcs_bits) - { - handle->tx.inprogress = TINY_TX_STATE_END; - } - } - return result; -} -#endif - - -/** -* __tiny_send_data function sends speficied data to serial port using Tiny -* frame format: 0x7E, data..., FCS, 0x7E. -* @param handle - pointer to Tiny Protocol structure -* @see TINY_ERR_INVALID_DATA -* @see TINY_ERR_FAILED -* @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED, 0 if HW is not ready or number of sent bytes. -*/ -static int __tiny_send_data(STinyData *handle) -{ - int result = TINY_NO_ERROR; - - while (handle->tx.inprogress != TINY_TX_STATE_IDLE) - { - switch (handle->tx.inprogress) - { - case TINY_TX_STATE_START: - result = __send_frame_flag_state(handle); - break; - case TINY_TX_STATE_END: - result = __send_frame_flag_state(handle); - break; - case TINY_TX_STATE_SEND_UID: - result = __send_frame_uid_state(handle); - break; - case TINY_TX_STATE_SEND_DATA: - result = __send_frame_data_state(handle); - break; -#ifdef TINY_FCS_ENABLE - case TINY_TX_STATE_SEND_CRC: - result = __send_frame_crc_state(handle); - break; -#endif - default: - break; - } - if ( result <= 0 ) - { - /* Exit in case of error or no data sent */ - return result; - } - } - - STATS(handle->stat.framesSent++); - STATS(handle->stat.bytesSent += handle->tx.sentbytes); - MUTEX_LOCK(handle->send_mutex); - handle->tx.pframe = 0; - COND_SIGNAL(handle->send_condition); - MUTEX_UNLOCK(handle->send_mutex); - return handle->tx.sentbytes; -} - - -#ifdef PLATFORM_MUTEX -/** - * waits until previous send operaton completes and places new buffer for sending - */ -static int __wait_send_complete(STinyData *handle, uint8_t *pbuf, uint8_t flags) -{ - int result = TINY_NO_ERROR; - /* We need to use mutex to access real hardware */ - MUTEX_LOCK(handle->send_mutex); - /* Wait until previous send operation is completed. */ - while (handle->tx.inprogress != TINY_TX_STATE_IDLE) - { - if (!(flags & TINY_FLAG_WAIT_FOREVER)) - { - result = TINY_ERR_BUSY; - MUTEX_UNLOCK(handle->send_mutex); - break; - } - COND_WAIT(handle->send_condition, handle->send_mutex); - } - /* If no send operation is in progress, pass new buffer for sending */ - if (result == TINY_NO_ERROR) - { - /* Remember pointer to data of the frame to transfer */ - handle->tx.pframe = pbuf; - handle->tx.inprogress = TINY_TX_STATE_START; - } - MUTEX_UNLOCK(handle->send_mutex); - return result; -} -#else -#define __wait_send_complete(handle, pbuf, flags) \ - 0; \ - handle->tx.pframe = pbuf; \ - handle->tx.inprogress = TINY_TX_STATE_START; -#endif - - -int tiny_send(STinyData *handle, uint16_t *uid, uint8_t * pbuf, int len, uint8_t flags) -{ - int result = TINY_NO_ERROR; - - if (!handle) - return TINY_ERR_INVALID_DATA; - - /* If the buffer being sent is some different buffer, wait until operation is finished */ - if (pbuf != handle->tx.pframe) - { - result = __wait_send_complete(handle, pbuf, flags); - if (result == TINY_NO_ERROR) - { - /* We can put new packet for the transfer. - Pointer is already set by _wait_send_complete. */ - if (uid) - { - handle->tx.uid = *uid; - handle->tx.bits = BITS_UID_16; - } - else - { - handle->tx.bits = BITS_NO_UID; - } - handle->tx.pframe = pbuf; - handle->tx.framelen = len; - } - } - if (result == TINY_NO_ERROR) - { - do - { - result = __tiny_send_data(handle); - if ((result != 0) || (handle->tx.inprogress == TINY_TX_STATE_IDLE)) - { - /* exit on error and on successful send */ - break; - } - } while (flags & TINY_FLAG_WAIT_FOREVER); - } -#ifdef CONFIG_ENABLE_STATS - /* If write callback is not null and frame is sent */ - if (handle->write_cb && (result>0)) - { - handle->write_cb(handle, TINY_FRAME_TX, pbuf, len); - } -#endif - return result; -} - - -/************************************************************** -* -* RECEIVE FUNCTIONS -* -***************************************************************/ - - -/** - * __tiny_read_data function receives and decodes bytes from Tiny protocol channel - * until 0x7E byte is received. - * If there are no input bytes, function saves its state to handle and returns 0. - * @param handle a pointer to STinyData structure. - * @param byte an unsigned char - byte to put into send buffer - * @param pbuf a pointer to receive buffer - * @param len an integer argument - maximum receive buffer size - * @return TINY_ERR_FAILED, TINY_ERR_DATA_TOO_LARGE or number of received bytes. - * 0 if no packet is not yet completed. - */ -static int __tiny_read_data(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len) -{ - uint8_t byte = 0; - int result; - if (handle->rx.inprogress == TINY_RX_STATE_START) - { - handle->rx.uid = 0; - handle->rx.bits = 0; - if (uid) - { - handle->rx.inprogress = TINY_RX_STATE_READ_UID; - } - else - { - handle->rx.inprogress = TINY_RX_STATE_READ_DATA; - } - } - - while (1) - { -# ifndef ARDUINO_NANO - result = handle->read_func(handle->pdata, &byte, 1); -# else - result = handle->read_func(&byte, 1); -# endif - /* Exit if UART error */ - if (result<0) return result; - /* Exit if no data awaiting */ - if (result == 0) return result; - - /* If next byte after 0x7E is 0x7E, tiny data have wrong frame alignment. - Start to read new frame and register error. */ - if ((byte == FLAG_SEQUENCE) && (handle->rx.prevbyte == FLAG_SEQUENCE)) - { - STATS(handle->stat.framesBroken++); - /* Read next byte */ - continue; - } - /* If received byte is 0x7E, this means end of frame */ - if ((byte == FLAG_SEQUENCE) && (handle->rx.prevbyte != FLAG_SEQUENCE)) - { - /* End of frame */ - break; - } - /* If escape char is received - wait for second char */ - if (byte == TINY_ESCAPE_CHAR) - { - /* Remember last byte received */ - handle->rx.prevbyte = byte; - /* Read next byte */ - continue; - } - /* If previous byte is 0x7D, we should decode the byte after */ - if (TINY_ESCAPE_CHAR == handle->rx.prevbyte) - { - /* Remember last byte received */ - handle->rx.prevbyte = byte; - byte ^= TINY_ESCAPE_BIT; // Update byte and continue - } - else - { - /* Just remember last byte */ - handle->rx.prevbyte = byte; - } - switch (handle->rx.inprogress) - { - case TINY_RX_STATE_READ_UID: - handle->rx.uid |= (byte << handle->rx.bits); - handle->rx.bits += 8; - if (handle->rx.bits == 16) - { - handle->rx.inprogress = TINY_RX_STATE_READ_DATA; - } - break; - case TINY_RX_STATE_READ_DATA: - /* if there is place in buffer save byte. - 2-byte FCS field support is responsibility of Tiny and not visible to upper layer. - Thus we do not need to have free place for last 2 bytes. */ - if (handle->rx.framelen < len) - { - pbuf[handle->rx.framelen] = byte; - } - handle->rx.framelen++; - break; - default: - break; - } - __update_fcs_field(handle->fcs_bits, &handle->rx.fcs, byte); - } - if (uid) - { - *uid = handle->rx.uid; - } - /* Tell that we have done and ready to receive next frame. */ - handle->rx.inprogress = TINY_RX_STATE_IDLE; -#ifdef TINY_FCS_ENABLE - /* Frame is too short. There should be at least 16-bit FCS field. */ - if (handle->rx.framelen < (handle->fcs_bits >> 3)) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_FAILED; - } - handle->rx.framelen -= (handle->fcs_bits >> 3); // subtract number of bytes of FCS field -#endif - if (handle->rx.framelen>=len) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_DATA_TOO_LARGE; - } - /* Check CRC */ - if (!__check_fcs_field(handle->fcs_bits, handle->rx.fcs)) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_FAILED; - } -#ifdef CONFIG_ENABLE_STATS - /* Call read callback if callback is defined */ - if (handle->read_cb) - { - handle->read_cb(handle, TINY_FRAME_RX, pbuf, handle->rx.framelen); - } -#endif - STATS(handle->stat.bytesReceived += handle->rx.framelen); - STATS(handle->stat.framesReceived++); - return handle->rx.framelen; -} - - -int tiny_read(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len, uint8_t flags) -{ - int result = TINY_NO_ERROR; - uint8_t byte; - - if (!handle) - return TINY_ERR_INVALID_DATA; - if (!handle->read_func) - return TINY_ERR_INVALID_DATA; - - do - { - /* If no any frame processing is in progress, check for new frame */ - if (handle->rx.inprogress == TINY_RX_STATE_IDLE) - { -# ifndef ARDUINO_NANO - result = handle->read_func(handle->pdata, &byte, 1); -# else - result = handle->read_func(&byte, 1); -# endif - /* Byte is received */ - if (result > 0) - { - /* New frame must be started with 0x7E char */ - if (byte != FLAG_SEQUENCE) - { - STATS(handle->stat.oosyncBytes++); - result = TINY_ERR_OUT_OF_SYNC; - break; - } - /* Ok, we're at the beginning of new frame. Init state machine. */ - handle->rx.framelen = 0; - handle->rx.inprogress = TINY_RX_STATE_START; - handle->rx.prevbyte = byte; - __init_fcs_field(handle->fcs_bits, &handle->rx.fcs); - } - else if (result<0) - { - result = TINY_ERR_FAILED; - break; - } - } - /* Some frame is in process of receiving. Continue to parse data */ - if (handle->rx.inprogress != TINY_RX_STATE_IDLE) - { - result = __tiny_read_data(handle, uid, pbuf, len); - } - if (result == 0) - { - if (!(flags & TINY_FLAG_WAIT_FOREVER)) - { - break; - } - TASK_YIELD(); - } - } - while (result == 0); - - return result; -} - - -/************************************************************** -* -* SERVICE FUNCTIONS -* -***************************************************************/ - -#ifdef CONFIG_ENABLE_STATS - -int tiny_get_stat(STinyData *handle, STinyStats *stat) -{ - if (!handle) - return TINY_ERR_INVALID_DATA; - *stat = handle->stat; - return TINY_NO_ERROR; -} - - -/** -* tiny_clear_stat function clears Tiny protocol statistics. -* @param handle - pointer to Tiny protocol structure -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -int tiny_clear_stat(STinyData *handle) -{ - if (handle) - return TINY_ERR_INVALID_DATA; - handle->stat.bytesSent = 0; - handle->stat.bytesReceived = 0; - handle->stat.framesBroken = 0; - handle->stat.framesReceived = 0; - handle->stat.framesSent = 0; - handle->stat.oosyncBytes = 0; - return TINY_NO_ERROR; -} - - -/** -* tiny_set_callbacks sets callback procs for specified Tiny protocol. -* callbacks will receive all data being sent or received. -* @param handle - pointer to Tiny Protocol structure -* @param read_cb - an argument of on_frame_cb_t type - pointer to callback function. -* @param send_cb - an argument of on_frame_cb_t type - pointer to callback function. -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -int tiny_set_callbacks(STinyData *handle, - on_frame_cb_t read_cb, - on_frame_cb_t send_cb) -{ - if (!handle) - { - return TINY_ERR_INVALID_DATA; - } - MUTEX_LOCK(handle->send_mutex); - handle->read_cb = read_cb; - handle->write_cb = send_cb; - MUTEX_UNLOCK(handle->send_mutex); - return TINY_NO_ERROR; -} - -#endif /* CONFIG_ENABLE_STATS */ - diff --git a/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.h b/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.h deleted file mode 100644 index f1312c19..00000000 --- a/releases/arduino/TinyProto-Micro/src/proto/tiny_layer2.h +++ /dev/null @@ -1,394 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -/** - This is Tiny protocol implementation for microcontrollers - - @file - @brief Tiny protocol API -*/ -#ifndef _TINY_LAYER2_H_ -#define _TINY_LAYER2_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include "tiny_defines.h" - -/// \cond -#if defined(CONFIG_ENABLE_FCS16) || defined(CONFIG_ENABLE_FCS32) || defined(CONFIG_ENABLE_CHECKSUM) - #define TINY_FCS_ENABLE - #ifdef CONFIG_ENABLE_FCS32 - typedef uint32_t fcs_t; - #else - typedef uint16_t fcs_t; - #endif -#endif -/// \endcond - -/** - * @defgroup ERROR_FLAGS Return error codes for Tiny API functions - * @{ - */ - -/// No error. For tiny_send and tiny_read functions, this means, no data sent or received -#define TINY_NO_ERROR (0) -/// Generic error. -#define TINY_ERR_FAILED (-1) -/// Timeout happened. Not actually used for now. -#define TINY_ERR_TIMEOUT (-2) -/// Data too large to fit the user buffer, valid for tiny_read function -#define TINY_ERR_DATA_TOO_LARGE (-3) -/// Some invalid data passed to Tiny API function. -#define TINY_ERR_INVALID_DATA (-4) -/// API function detected that operation cannot be performed right now. -#define TINY_ERR_BUSY (-5) -/// Out of sync - received some data, which are not part of the frame (tiny_read) -#define TINY_ERR_OUT_OF_SYNC (-6) - -/** @} */ - -/** - * @defgroup FLAGS_GROUP Flags for Tiny API functions - * @{ - */ - -/// This flag makes tiny API functions perform as non-blocking -#define TINY_FLAG_NO_WAIT (0) -/// This flag makes tiny API functions perform in blocking mode -#define TINY_FLAG_WAIT_FOREVER (1) - -/** @} */ - -/// \cond -typedef enum -{ - TINY_TX_STATE_IDLE, - TINY_TX_STATE_START, - TINY_TX_STATE_SEND_UID, - TINY_TX_STATE_SEND_DATA, -#ifdef TINY_FCS_ENABLE - TINY_TX_STATE_SEND_CRC, -#endif - TINY_TX_STATE_END -} ETinyTxState; - -typedef enum -{ - TINY_RX_STATE_IDLE, - TINY_RX_STATE_START, - TINY_RX_STATE_READ_UID, - TINY_RX_STATE_READ_DATA, - TINY_RX_STATE_END -} ETinyRxState; -/// \endcond - - -/** - * Enum is used for callback functions to specify - * direction of the frame, processed by the protocol. - */ -typedef enum -{ - TINY_FRAME_TX, - TINY_FRAME_RX, -} ETinyFrameDirection; - -/** - * The function writes data to communication channel port. - * @param pdata - pointer to user private data - absent in Arduino version - * @param buffer - pointer to the data to send to channel. - * @param size - size of data to write. - * @see read_block_cb_t - * @return the function must return negative value in case of error or number of bytes written - * or zero. - */ -#ifndef ARDUINO_NANO -typedef int (*write_block_cb_t)(void *pdata, const uint8_t *buffer, int size); -#else -typedef int (*write_block_cb_t)(const uint8_t *buffer, int size); -#endif - -/** - * The function reads data from communication channel. - * @param pdata - pointer to user private data. - absent in Arduino version - * @param buffer - pointer to a buffer to read data to from the channel. - * @param size - maximum size of the buffer. - * @see write_block_cb_t - * @return the function must return negative value in case of error or number of bytes actually read - * or zero. - */ -#ifndef ARDUINO_NANO -typedef int (*read_block_cb_t)(void *pdata, uint8_t *buffer, int size); -#else -typedef int (*read_block_cb_t)(uint8_t *buffer, int size); -#endif - - -/** - * on_frame_cb_t is a function to callback data going through Tiny level. - * @param handle - handle of Tiny. - * @param direction - frame is sent or received. - * @param pdata - data sent or received over Tiny. - * @param size - size of data. - * @return None. - */ -typedef void (*on_frame_cb_t)(void *handle, ETinyFrameDirection direction, uint8_t *pdata, int size); - - -/** - * This structure contains captured statistics while the protocol - * sends and receives messages. - */ -typedef struct -{ - /// Number of bytes received out of frame bytes - uint32_t oosyncBytes; - /// Number of payload bytes totally sent through the channel - uint32_t bytesSent; - /// Number of payload bytes totally received through the channel - uint32_t bytesReceived; - /// Number of frames, successfully sent through the channel - uint32_t framesSent; - /// Number of frames, successfully received through the communication channel - uint32_t framesReceived; - /// Number of broken frames received - uint32_t framesBroken; -} STinyStats; - - -/** - * This structure describes the state of Receive State machine. - * \warning This is for internal use only, and should not be accessed directly from the application. - */ -typedef struct -{ - /// Number of bytes in the frame being received. - /** This value becomes valid only when TINY_RX_STATE_END is reached. */ - int framelen; - /// The state of Receive State machine - uint8_t inprogress; -#ifdef TINY_FCS_ENABLE - /// The field contains calculated checksum and not available in TINY_MINIMAL configuration - fcs_t fcs; -#endif - /// \cond - uint16_t uid; - uint8_t bits; - uint8_t prevbyte; - /// \endcond -} STinyRxStatus; - - -/** - * This structure describes the state of Transmit State machine. - * \warning This is for internal use only, and should not be accessed directly from the application. - */ -typedef struct -{ - /// Number of payload bytes, sent from the frame being sent - int sentbytes; - /// Pointer to the frame data being sent - uint8_t *pframe; - /// Length of the frame passed by a user - int framelen; - /// @see ETinyTxState - uint8_t inprogress; -#ifdef TINY_FCS_ENABLE - /// The field contains calculated checksum and not available in TINY_MINIMAL configuration - fcs_t fcs; // fcs field -#endif - /// \cond - uint16_t uid; // uid field - uint8_t prevbyte; // last byte sent - uint8_t bits; // index of crc byte being sent - /// \endcond -} STinyTxStatus; - -/************************************************************* -* -* Tiny defines -* -**************************************************************/ - -typedef struct -{ - /// pointer to platform related write function - write_block_cb_t write_func; - /// pointer to platform related read function - read_block_cb_t read_func; - /// pointer to application defined data, passed during protocol initialization - absent in Arduino version -#ifndef ARDUINO_NANO - void* pdata; -#endif - /// @see STinyRxStatus - STinyRxStatus rx; - /// @see STinyTxStatus - STinyTxStatus tx; -#ifdef PLATFORM_MUTEX - PLATFORM_MUTEX send_mutex; // Mutex for send operation -#endif -#ifdef PLATFORM_COND - PLATFORM_COND send_condition; // Condition is called, when send operation is completed -#endif -#ifdef TINY_FCS_ENABLE - /// The field contains number of bits to use for FCS and not available in TINY_MINIMAL configuration - uint8_t fcs_bits; -#endif -#ifdef CONFIG_ENABLE_STATS - /// @see STinyStats - STinyStats stat; - /// pointer to callback function - /** This callback is called when it is not null and when - new frame is successfully received. - */ - on_frame_cb_t read_cb; - /// pointer to callback function to get data being sent - /** This callback is called when it is not null and when - new frame is successfully sent. */ - on_frame_cb_t write_cb; -#endif -} STinyData; - - - -/** -* The function initializes internal structures for Tiny channel and return handle -* to be used with all Tiny and IPC functions. -* @param handle - pointer to Tiny data -* @param write_func - pointer to write data function (to communication channel). -* @param read_func - pointer to read function (from communication channel). -* @param pdata - pointer to a user private data. -* @note pdata parameter is not applicable for Arduino and is absent in its version. -* @see write_block_cb_t -* @see read_block_cb_t -* @return TINY_NO_ERROR or error code. -*/ -#ifndef ARDUINO_NANO -extern int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func, - void *pdata); -#else -extern int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func); -#endif - - -/** -* The function closes channel. -* @param handle - pointer to Tiny data. -* @see tiny_init() -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_close(STinyData *handle); - - -/** - * The function sets number of bits used for fcs - * @param handle - pointer to Tiny structure - * @param bits - number of bits to use for fcs: 16 or 32. - * @return TINY_ERR_FAILED - * TINY_NO_ERROR - */ -extern int tiny_set_fcs_bits(STinyData *handle, uint8_t bits); - - -/** - * The function sends data to communication channel in the following - * frame format: 0x7E, data..., FCS, 0x7E. - * \note if flags field is set to TINY_FLAG_NO_WAIT, then this function may remember pbuf - * pointer and return immediately. So, it is responsibility of the caller to make - * pbuf data to be available all the time until frame is sent. - * @param handle - pointer to Tiny data. - * @param uid - pointer to 16-bit variable containing packet uid, can be NULL. - * @param pbuf - a const pointer to unsigned char - buffer with data to send - * @param len - an integer argument - length of data to send - * @param flags - TINY_FLAG_NO_WAIT - * @see TINY_ERR_INVALID_DATA - * @see TINY_ERR_FAILED - * @see TINY_FLAG_NO_WAIT - * @see TINY_FLAG_WAIT_FOREVER - * @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED or number of sent bytes. - */ -extern int tiny_send(STinyData *handle, uint16_t *uid, uint8_t * pbuf, int len, uint8_t flags); - - -/** - * The function reads data from communication channel - * frame format: 0x7E, data..., FCS, 0x7E. - * @param handle - pointer to Tiny data. - * @param uid - pointer to 16-bit uid variable to fill with packet info, can be NULL. - * @param pbuf a const pointer to unsigned char - buffer with data to send - * @param len an integer argument - length of data to send - * @param flags - TINY_FLAG_NO_WAIT - * @see TINY_ERR_INVALID_DATA - * @see TINY_ERR_FAILED - * @see TINY_ERR_DATA_TOO_LARGE - * @see TINY_ERR_OUT_OF_SYNC - * @see TINY_ERR_BUSY - * @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED or number of sent bytes. - */ -extern int tiny_read(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len, uint8_t flags); - - -#ifdef CONFIG_ENABLE_STATS -/** -* The function returns statistics per communication connection. -* @param handle - pointer to Tiny data. -* @param stat - pointer of stucture to fill. -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_get_stat(STinyData *handle, STinyStats *stat); - - -/** -* The function clears Tiny statistics. -* @param handle - pointer to Tiny data. -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_clear_stat(STinyData *handle); - - -/** -* The function sets callback procs for specified Tiny channel. -* callbacks will receive all data being sent or received. -* @param handle - pointer to Tiny data. -* @param read_cb - pointer to callback function. -* @param send_cb - pointer to callback function. -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_set_callbacks(STinyData *handle, - on_frame_cb_t read_cb, - on_frame_cb_t send_cb); -#endif /* CONFIG_ENABLE_STATS */ - - -#ifdef __cplusplus -} -#endif - -#endif /* _TINY_PROTOCOL_H_ */ diff --git a/releases/arduino/TinyProto-Nano/README.md b/releases/arduino/TinyProto-Nano/README.md deleted file mode 100644 index 6b9bf0b5..00000000 --- a/releases/arduino/TinyProto-Nano/README.md +++ /dev/null @@ -1,27 +0,0 @@ -= Tiny Protocol library for Arduino = - -With this library you can easy communicate your Arduino with applications -on PC and other boards. You don't need to think about data synchronization -between points. - -For more information about this library please visit -https://github.com/lexus2k/tinyproto - -== License == -Copyright 2016 (C) Alexey Dynda - -This file is part of Protocol Library. - -Protocol 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 3 of the License, or -(at your option) any later version. - -Protocol 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 Protocol Library. If not, see . - diff --git a/releases/arduino/TinyProto-Nano/examples/sketch_echo/sketch_echo.ino b/releases/arduino/TinyProto-Nano/examples/sketch_echo/sketch_echo.ino deleted file mode 100755 index 35f2e2db..00000000 --- a/releases/arduino/TinyProto-Nano/examples/sketch_echo/sketch_echo.ino +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This example sends back every packet received over UART. - * To test this example, just compile it and upload to Arduino controller. - * Open Serial Monitor in Arduino IDE. send anything typing data around - * '~' chars (for example, ~Welcome~ ), and Arduino will send back the packet to you. - * - * TinyProtocol uses some special frame format, that means that it will ignore not valid - * chars received over UART. Each packet should be in the following format: - * ~[UID]DATA[FCS]~ - * UID and FCS field are optional. In the example below, they are disabled. Nano versition - * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use Micro and - * Full versions of Tiny protocol. - */ -#include - -/* Creating protocol object is simple */ -Tiny::Proto proto; - -void setup() { - /* No timeout, since we want non-blocking UART operations. */ - Serial.setTimeout(0); - /* Initialize serial protocol for test purposes */ - Serial.begin(9600); - /* Redirect all protocol communication to Serial0 UART */ - proto.beginToSerial(); - /* We do not want to use crc */ - proto.disableCrc(); -} - -/* Specify buffer for packets to send and receive */ -char g_buf[16]; - -/* Create special class, which simplifies the work with buffer */ -Tiny::Packet g_packet(g_buf, sizeof(g_buf)); - -void loop() -{ - /* Check if some data are waiting for reading in UART */ - /* If there is no delay in loop() cycle, there is no need to check for OUT_OF_SYNC error */ - int len = proto.read(g_packet, TINY_FLAG_WAIT_FOREVER); - /* Check if we received something with no error */ - if (len > 0) - { - /* Send received packet back to UART (echo) */ - proto.write(g_packet, TINY_FLAG_WAIT_FOREVER); - } -} diff --git a/releases/arduino/TinyProto-Nano/keywords.txt b/releases/arduino/TinyProto-Nano/keywords.txt deleted file mode 100644 index cd15c4f2..00000000 --- a/releases/arduino/TinyProto-Nano/keywords.txt +++ /dev/null @@ -1,28 +0,0 @@ -####################################### -# Syntax Coloring Map For TinyProto -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -Proto KEYWORD1 -Packet KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -begin KEYWORD2 -toSerial KEYWORD2 -disableCrc KEYWORD2 -enableCrc16 KEYWORD2 -enableCrc32 KEYWORD2 -enableCheckSum KEYWORD2 -getWord KEYWORD2 -getByte KEYWORD2 -getChar KEYWORD2 - -####################################### -# Constants (LITERAL1) -####################################### diff --git a/releases/arduino/TinyProto-Nano/src/TinyProto-Nano.h b/releases/arduino/TinyProto-Nano/src/TinyProto-Nano.h deleted file mode 100644 index 2a7334cc..00000000 --- a/releases/arduino/TinyProto-Nano/src/TinyProto-Nano.h +++ /dev/null @@ -1,386 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -/** - This is Tiny protocol implementation for microcontrollers - - @file - @brief Tiny protocol Arduino API - -*/ - -#ifndef _TINY_PROTOCOL_H_ -#define _TINY_PROTOCOL_H_ - -#include "proto/tiny_layer2.h" - -#ifdef ARDUINO -# include -#endif - -namespace Tiny { - -class Packet; - -/** - * Proto class incapsulates Protocol functionality. - * Remember that you may use always C-style API functions - * instead C++. Please refer to documentation. - */ -class Proto -{ -public: - inline Proto() { m_uidEnabled = false; } - - /** - * Initializes protocol internal variables. - * If you need to switch communication with other destination - * point, you can call this method one again after calling end(). - * @param writecb - write function to some physical channel - * @param readcb - read function from some physical channel - * @return None - */ - void begin (write_block_cb_t writecb, - read_block_cb_t readcb); - -#ifdef ARDUINO - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial connection (Serial). - * @return None - */ - inline void beginToSerial() - { - begin([](const uint8_t *b, int s)->int { return Serial.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial.readBytes(b, s); }); - } - -#if HAVE_HWSERIAL1 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial1 connection (Serial1). - * @return None - */ - inline void beginToSerial1() - { - begin([](const uint8_t *b, int s)->int { return Serial1.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial1.readBytes(b, s); }); - } -#endif - -#if HAVE_HWSERIAL2 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial2 connection (Serial2). - * @return None - */ - inline void beginToSerial2() - { - begin([](const uint8_t *b, int s)->int { return Serial2.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial2.readBytes(b, s); }); - } -#endif - -#if HAVE_HWSERIAL3 - /** - * Initializes protocol internal variables and redirects - * communication through Arduino Serial3 connection (Serial3). - * @return None - */ - inline void beginToSerial3() - { - begin([](const uint8_t *b, int s)->int { return Serial3.write(b, s); }, - [](uint8_t *b, int s)->int { return Serial3.readBytes(b, s); }); - } -#endif - -#endif - - /** - * Resets protocol state. - */ - void end (); - - /** - * Sends data block over communication channel. - * @param buf - data to send - * @param size - length of the data in bytes - * @param flags - flags. @ref FLAGS_GROUP - * @return negative value in case of error - * zero if nothing is sent - * positive - should be equal to size parameter - */ - int write (char* buf, int size, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Reads data block from communication channel. - * @param buf - buffer to place data read from communication channel - * @param size - maximum size of the buffer in bytes. - * @param flags - @ref FLAGS_GROUP - * @return negative value in case of error - * zero if nothing is read - * positive - number of bytes read from the channel - */ - int read (char* buf, int size, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Sends packet over communication channel. - * @param pkt - Packet to send - * @param flags - @ref FLAGS_GROUP - * @see Packet - * @return negative value in case of error - * zero if nothing is sent - * positive - Packet is successfully sent - */ - int write (Packet &pkt, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Reads packet from communication channel. - * @param pkt - Packet object to put data to - * @param flags - @ref FLAGS_GROUP - * @see Packet - * @return negative value in case of error - * zero if nothing is read - * positive - Packet is successfully received - */ - int read (Packet &pkt, uint8_t flags = TINY_FLAG_WAIT_FOREVER); - - /** - * Disable CRC field in the protocol. - * If CRC field is OFF, then the frame looks like this: - * 0x7E databytes 0x7E. - */ - void disableCrc (); - - /** - * Enables CRC 8-bit field in the protocol. This field - * contains sum of all data bytes in the packet. - * 8-bit field is not supported by Nano version of Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCheckSum (); - - /** - * Enables CRC 16-bit field in the protocol. This field - * contains FCS 16-bit CCITT like defined in RFC 1662. - * 16-bit field is not supported by Nano version of Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCrc16 (); - - /** - * Enables CRC 32-bit field in the protocol. This field - * contains FCS 32-bit CCITT like defined in RFC 1662. - * 32-bit field is not supported by Nano and Micro versions of - * Tiny library. - * @return true if successful - * false in case of error. - */ - bool enableCrc32 (); - - /** - * Enables Uid field in the protocol. If enabled this 16-bit field - * with packet identifier is added before each payload data. - * Frame with uid: 0x7E 16-bituid payload 0x7E - * Frame without uid: 0x7E payload 0x7E - */ - inline void enableUid() { m_uidEnabled = true; } - - /** - * Disables Uid field in the protocol. If enabled this 16-bit field - * with packet identifier is added before each payload data. - * Frame with uid: 0x7E 16-bituid payload 0x7E - * Frame without uid: 0x7E payload 0x7E - */ - inline void disableUid(){ m_uidEnabled = false; } - -private: - STinyData m_data; - uint8_t m_uidEnabled; -}; - - -/** - * Describes packet entity and provides API methods to - * manipulate the packet. - */ -class Packet -{ -public: - /** - * Creates packet object. - * @param buf - pointer to the buffer to store packet data - * @param size - size of the buffer to hold packet data - * @note passed buffer must exist all lifecycle of the Packet object. - */ - Packet(char *buf, size_t size) { m_len = 0; m_size = size; m_buf = (uint8_t*)buf; } - - /** - * Clears Packet state. Buffer and its size are preserved. - */ - inline void clear () { m_len = 0; m_p = 0; } - - /** - * Puts next byte to the packet. For example, after calling this method - * twice: put(5), put(10), - the Packet will contain 5,10. - * @param byte - data byte to put. - */ - inline void put (uint8_t byte) { m_buf[m_len++] = byte; } - - /** - * Puts next char to the packet. For example, after calling this method - * twice: put('a'), put('c'), - the Packet will contain 'ac'. - * @param chr - character to put. - */ - inline void put (char chr) { put((uint8_t)chr); } - - /** - * Puts next 16-bit unsigned integer to the packet. - * @param data - data to put. - */ - inline void put (uint16_t data) { m_buf[m_len++] = data & 0x00FF; - m_buf[m_len++] = data >> 8; } - - /** - * Puts next 32-bit unsigned integer to the packet. - * @param data - data to put. - */ - inline void put (uint32_t data) { put((uint16_t)data & 0x0000FFFF); - put((uint16_t)(data >> 16)); } - - /** - * Puts next 16-bit signed integer to the packet. - * @param data - data to put. - */ - inline void put (int16_t data) { put((uint16_t)data); } - - /** - * Puts next null-terminated string to the packet. - * @param str - string to put. - */ - inline void put (const char *str){ strncpy((char *)&m_buf[m_len], str, m_size - m_len); - m_len += strlen(str); - m_buf[m_len++] = 0; } - - /** - * Adds data from packet to the new packet being built. - * @param pkt - reference to the Packet to add. - */ - inline void put (const Packet &pkt){ memcpy(&m_buf[m_len], pkt.m_buf, pkt.m_len); m_len += pkt.m_len; } - - /** - * Puts uid to the packet. - * @warning uid is sent only if this functionality is enabled in the Proto. - * @see Proto::enableUid - * @see Proto::disableUid - * @param uid - 16-bit number to place to the packet. - */ - inline void putUid (uint16_t uid) { m_uid = uid; } - - /** - * Reads next byte from the packet. - * @return byte from the packet. - */ - inline uint8_t getByte () { return m_buf[m_p++]; } - - /** - * Reads next character from the packet. - * @return character from the packet. - */ - inline char getChar () { return (char)Packet::getByte(); } - - /** - * Reads next unsigned 16-bit integer from the packet. - * @return unsigned 16-bit integer. - */ - inline uint16_t getUint16() { return (uint16_t)m_buf[m_p++] | (m_buf[m_p++] << 8); } - - /** - * Reads next signed 16-bit integer from the packet. - * @return signed 16-bit integer. - */ - inline int16_t getInt16 () { return (int16_t)(getUint16()); } - - /** - * Reads next unsigned 32-bit integer from the packet. - * @return unsigned 32-bit integer. - */ - inline uint32_t getUint32() { return getUint16() | ((uint32_t)getUint16())<<16; } - - /** - * Reads zero-terminated string from the packet. - * @return zero-terminated string. - */ - inline char* getString () { char *p = (char *)&m_buf[m_p]; m_p += strlen((char*)m_buf) + 1; return p; } - - /** - * Returns 16-bit identificator of the packet. - * @warning uid is valid only if uid functionality is enabled in the Proto - * @see Proto::enableUid - * @see Proto::disableUid - * @return 16-bit uid. - */ - inline uint16_t getUid () { return m_uid; } - - /** - * Returns size of payload data in the received packet. - * @return size of payload data. - */ - inline size_t size () { return m_len; } - - /** - * Returns maximum size of packet buffer. - * @return max size of packet buffer. - */ - inline size_t maxSize () { return m_size; } - - /** - * Returns size of payload data in the received packet. - * @return size of payload data. - */ - inline char *data () { return (char*)m_buf; } - - /** - * You may refer to Packet payload data directly by using operator [] - */ - uint8_t &operator[] (size_t idx) { return m_buf[idx]; } - - /** - * Assign operator = puts next char to the packet. Several - * assign operators put one by one several chars. - */ - Packet &operator= (char chr){ put(chr); return *this; } - -private: - friend class Proto; - - uint8_t* m_buf; - uint16_t m_uid; - uint8_t m_size; - uint8_t m_len; - uint8_t m_p; -}; - - -} // Tiny namespace - -#endif - diff --git a/releases/arduino/TinyProto-Nano/src/proto/crc.c b/releases/arduino/TinyProto-Nano/src/proto/crc.c deleted file mode 100644 index 3fe7287a..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/crc.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#include "crc.h" - -/* CRC32 RFC1662 (PPP in HDLC-like framing) */ - - /* - * The FCS-32 generator polynomial: x**0 + x**1 + x**2 + x**4 + x**5 - * + x**7 + x**8 + x**10 + x**11 + x**12 + x**16 - * + x**22 + x**23 + x**26 + x**32. - */ - -#ifdef CONFIG_ENABLE_FCS32 - -static uint32_t fcstab_32[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - - -uint32_t crc32_byte(uint32_t crc, uint8_t data) -{ - return fcstab_32[(crc ^ data) & 0xFF] ^ (crc >> 8); -} - - -uint32_t crc32(uint32_t crc, uint8_t *buf, int size) -{ - const uint8_t *p; - - p = buf; - crc = crc ^ ~0U; - - while (size--) - crc = fcstab_32[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - -#endif - -/* - * The FCS-16 generator polynomial: x**0 + x**5 + x**12 + x**16. - */ - -/* - * FCS lookup table as calculated by the table generator. - */ - -#ifdef CONFIG_ENABLE_FCS16 - -static uint16_t fcstab_16[256] = { - 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, - 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, - 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, - 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, - 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, - 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, - 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, - 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, - 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, - 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, - 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, - 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, - 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, - 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, - 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, - 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, - 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, - 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, - 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, - 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, - 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, - 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, - 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, - 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, - 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, - 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, - 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, - 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, - 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, - 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, - 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, - 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 - }; - - -uint16_t crc16_byte(uint16_t crc, uint8_t data) -{ - return (crc >> 8) ^ fcstab_16[(crc ^ (data)) & 0xff]; -} - - -uint16_t crc16(uint16_t crc, uint8_t* data, int data_length) -{ - while(data_length) - { - crc = (crc >> 8) ^ fcstab_16[(crc ^ (*data)) & 0xff]; - data++; - data_length--; - } - - return crc ^ ~0U; -} - - -#endif - - -#ifdef CONFIG_ENABLE_CHECKSUM - -uint16_t chksum_byte(uint16_t sum, uint8_t data) -{ - return sum + data; -} - -uint16_t chksum(uint16_t sum, uint8_t* data, int data_length) -{ - while(data_length) - { - sum = sum + *data; - data++; - data_length--; - } - - return 0xFFFF - sum; -} - - -#endif - - - - - diff --git a/releases/arduino/TinyProto-Nano/src/proto/crc.h b/releases/arduino/TinyProto-Nano/src/proto/crc.h deleted file mode 100644 index 23ccb6b1..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/crc.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#ifndef _CRC16_H -#define _CRC16_H - -#include -#include "tiny_defines.h" - - -#ifdef CONFIG_ENABLE_CHECKSUM -#define INITCHECKSUM 0x0000 -#define GOODCHECKSUM 0x0000 -uint16_t chksum_byte(uint16_t sum, uint8_t data); -uint16_t chksum(uint16_t sum, uint8_t* data, int data_length); -#endif - -#ifdef CONFIG_ENABLE_FCS16 -#define PPPINITFCS16 0xffff /* Initial FCS value */ -#define PPPGOODFCS16 0xf0b8 /* Good final FCS value */ -uint16_t crc16_byte(uint16_t crc, uint8_t data); -uint16_t crc16(uint16_t crc, uint8_t* data, int data_length); -#endif - -#ifdef CONFIG_ENABLE_FCS32 -#define PPPINITFCS32 0xffffffff /* Initial FCS value */ -#define PPPGOODFCS32 0xdebb20e3 /* Good final FCS value */ -uint32_t crc32_byte(uint32_t crc, uint8_t data); -uint32_t crc32(uint32_t crc, uint8_t* data, int data_length); -#endif - -#endif diff --git a/releases/arduino/TinyProto-Nano/src/proto/tiny_config.h b/releases/arduino/TinyProto-Nano/src/proto/tiny_config.h deleted file mode 100644 index 21c6c319..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/tiny_config.h +++ /dev/null @@ -1 +0,0 @@ -#define CONFIG_ENABLE_CHECKSUM diff --git a/releases/arduino/TinyProto-Nano/src/proto/tiny_defines.h b/releases/arduino/TinyProto-Nano/src/proto/tiny_defines.h deleted file mode 100644 index bc254519..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/tiny_defines.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -#ifndef _TINY_DEFINES_H_ -#define _TINY_DEFINES_H_ - -#include "tiny_config.h" - -/* For fastest version of protocol assign all defines to zero. - * In this case protocol supports no CRC field, and - * all api functions become not thread-safe. - */ - -#define ARDUINO_NANO - -#undef PLATFORM_MUTEX - -#define MUTEX_INIT(x) - -#define MUTEX_LOCK(x) - -#define MUTEX_UNLOCK(x) - -#define MUTEX_DESTROY(x) - -#undef PLATFORM_COND - -#define COND_INIT(x) - -#define COND_DESTROY(x) - -#define COND_WAIT(cond, mutex) - -#define COND_SIGNAL(x) - -#define TASK_YIELD() - -#endif /* _TINY_DEFINES_H_ */ - - diff --git a/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.c b/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.c deleted file mode 100644 index 5bbc07d5..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.c +++ /dev/null @@ -1,824 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . - */ - -#include "crc.h" -#include "tiny_layer2.h" - -#ifdef CONFIG_ENABLE_STATS - #define STATS(x) x -#else - #define STATS(x) -#endif - -/************************************************************ -* -* INTERNAL FRAME STRUCTURE -* -* 8 16 any len 16/32 8 -* | 7E | UID | USER DATA | FCS | 7E | -* -* 7E is standard frame delimiter (commonly use on layer 2) -* FCS is standard checksum. Refer to RFC1662 for example. -* UID is reserved for future usage -*************************************************************/ - -#define FLAG_SEQUENCE 0x7E -#define ADDRESS_FIELD 0xFF -#define CONTROL_FILED 0x03 -#define PROTOCOL_FIELD 0x00 // 8 or 16 bit -#define TINY_ESCAPE_CHAR 0x7D -#define TINY_ESCAPE_BIT 0x20 - - -/************************************************************** -* -* FCS/CHKSUM FUNCTIONS -* -***************************************************************/ - -#ifdef TINY_FCS_ENABLE -inline static void __init_fcs_field(uint8_t fcs_bits, fcs_t* fcs) -{ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = PPPINITFCS16; break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = PPPINITFCS32; break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs = INITCHECKSUM; break; -#endif - default: - break; - } -} - -inline static int __check_fcs_field(uint8_t fcs_bits, fcs_t fcs) -{ - /* Check CRC */ -#ifdef CONFIG_ENABLE_FCS32 - if ((fcs_bits == 32) && (fcs == PPPGOODFCS32)) return 1; -#endif -#ifdef CONFIG_ENABLE_FCS16 - if ((fcs_bits == 16) && (fcs == PPPGOODFCS16)) return 1; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - if ((fcs_bits == 8) && (fcs == GOODCHECKSUM)) return 1; -#endif - return fcs_bits == 0; -} - - -inline static void __update_fcs_field(uint8_t fcs_bits, fcs_t* fcs, uint8_t byte) -{ - /* CRC is calculated only over real user data and frame header */ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = crc16_byte(*fcs, byte); break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = crc32_byte(*fcs, byte); break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs += byte; break; -#endif - default: - break; - } -} - - -inline static void __commit_fcs_field(uint8_t fcs_bits, fcs_t* fcs) -{ - /* CRC is calculated only over real user data and frame header */ - switch (fcs_bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: - *fcs = *fcs^0xFFFFFFFF; break; -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: - *fcs = *fcs^0xFFFFFFFF; break; -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: - *fcs = 0xFFFF - *fcs; break; -#endif - default: - break; - } -} - -#else - -#define __init_fcs_field(x, y) - -#define __check_fcs_field(x, y) 1 - -#define __update_fcs_field(x, y, z) - -#define __commit_fcs_field(x, y) - -#endif - -/************************************************************** -* -* OPEN/CLOSE FUNCTIONS -* -***************************************************************/ - - -/** -* The function initializes internal structures for Tiny channel and return handle -* to be used with all Tiny and IPC functions. -* @param handle - pointer to Tiny data -* @param write_func - pointer to write data function (to communication channel). -* @param read_func - pointer to read function (from communication channel). -* @param pdata - pointer to a user private data. -* @see write_block_cb_t -* @see read_block_cb_t -* @return TINY_NO_ERROR or error code. -*/ -#ifndef ARDUINO_NANO -int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func, - void *pdata) -#else -int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func) -#endif -{ - if (!handle || !write_func || !read_func) - { - return TINY_ERR_INVALID_DATA; - } -#ifndef ARDUINO_NANO - handle->pdata = pdata; -#endif - handle->write_func = write_func; - handle->read_func = read_func; -#ifdef CONFIG_ENABLE_STATS - handle->read_cb = 0; - handle->write_cb = 0; -#endif -#ifdef TINY_FCS_ENABLE - #if defined(CONFIG_ENABLE_FCS32) - handle->fcs_bits = 32; - #elif defined(CONFIG_ENABLE_FCS16) - handle->fcs_bits = 16; - #else - handle->fcs_bits = 8; - #endif -#endif - handle->rx.inprogress = TINY_RX_STATE_IDLE; - handle->tx.inprogress = TINY_TX_STATE_IDLE; - handle->tx.pframe = 0; - MUTEX_INIT(handle->send_mutex); - COND_INIT(handle->send_condition); -#ifdef CONFIG_ENABLE_STATS - tiny_clear_stat(handle); -#endif - return TINY_NO_ERROR; -} - - -int tiny_close(STinyData *handle) -{ - if (!handle) - { - return TINY_ERR_INVALID_DATA; - } - MUTEX_LOCK(handle->send_mutex); - if (handle->rx.inprogress) - { - handle->rx.inprogress = TINY_RX_STATE_IDLE; - } - if (handle->tx.inprogress) - { - handle->tx.inprogress = TINY_TX_STATE_IDLE; - } - COND_DESTROY(handle->send_condition); - MUTEX_UNLOCK(handle->send_mutex); - MUTEX_DESTROY(handle->send_mutex); - handle->write_func = 0; - handle->read_func = 0; - return TINY_NO_ERROR; -} - - -int tiny_set_fcs_bits(STinyData *handle, uint8_t bits) -{ - int result = TINY_NO_ERROR; - switch (bits) - { -#ifdef CONFIG_ENABLE_FCS16 - case 16: -#endif -#ifdef CONFIG_ENABLE_FCS32 - case 32: -#endif -#ifdef CONFIG_ENABLE_CHECKSUM - case 8: -#endif - case 0: - handle->fcs_bits = bits; - break; - default: - result = TINY_ERR_FAILED; - break; - } - return result; -} - - -/************************************************************** -* -* SEND FUNCTIONS -* -***************************************************************/ - -#define DATA_BYTE_SENT 2 -#define BITS_NO_UID 0 -#define BITS_UID_16 16 - -static int __send_frame_flag_state(STinyData *handle) -{ - uint8_t tempbuf[1]; - int result; - /* Start frame transmission */ - tempbuf[0] = FLAG_SEQUENCE; -# ifndef ARDUINO_NANO - result = handle->write_func(handle->pdata, tempbuf, 1); -# else - result = handle->write_func(tempbuf, 1); -# endif - if (result < 0) - { - return TINY_ERR_FAILED; - } - if (result == 0) - return TINY_NO_ERROR; - if (handle->tx.inprogress == TINY_TX_STATE_START) - { - handle->tx.sentbytes = 0; - handle->tx.prevbyte = 0; - __init_fcs_field(handle->fcs_bits, &handle->tx.fcs); - if (handle->tx.bits == BITS_UID_16) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_UID; - handle->tx.bits = 0; - } - else if (handle->tx.bits == BITS_NO_UID) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_DATA; - handle->tx.bits = 0; - } - } - else - { - handle->tx.inprogress = TINY_TX_STATE_IDLE; - } - return result; -} - - -static int __send_byte_state(STinyData *handle, uint8_t byte) -{ - int result; - /* If byte value equals to some predefined char, send escape char first */ - if (handle->tx.prevbyte == TINY_ESCAPE_CHAR) - { - byte ^= TINY_ESCAPE_BIT; - } - else if ((byte == TINY_ESCAPE_CHAR) || (byte == FLAG_SEQUENCE)) - { - byte = TINY_ESCAPE_CHAR; - } -# ifndef ARDUINO_NANO - result = handle->write_func(handle->pdata, &byte, 1); -# else - result = handle->write_func(&byte, 1); -# endif - if (result <= 0) - return result; - /* We calculate crc only for user data */ - handle->tx.prevbyte = byte; - return byte != TINY_ESCAPE_CHAR; -} - - -static int __send_frame_uid_state(STinyData *handle) -{ - int result; - uint8_t byte; - byte = (handle->tx.uid >> handle->tx.bits) & 0x000000FF; - result = __send_byte_state(handle, byte); - if (result > 0) - { - __update_fcs_field(handle->fcs_bits, &handle->tx.fcs, byte); - handle->tx.bits += 8; - if (handle->tx.bits == 16) - { - handle->tx.inprogress = TINY_TX_STATE_SEND_DATA; - } - } - return result; -} - - -/** - * This is handler for SEND DATA state. It switches to - * TINY_TX_STATE_END only if all bytes are sent. - * If next byte is successfully sent, it returns 1. - * If switched to other state, it returns 1. - * If no byte is sent during the cycle, it returns 0. - * If error happened, it returns negative value. - * @param handle - pointer to Tiny Protocol structure - */ -static int __send_frame_data_state(STinyData *handle) -{ - int result; - uint8_t byte; - if (handle->tx.sentbytes >= handle->tx.framelen) - { - __commit_fcs_field(handle->fcs_bits, &handle->tx.fcs); -#ifdef TINY_FCS_ENABLE - /* sending crc */ - handle->tx.inprogress = handle->fcs_bits ? TINY_TX_STATE_SEND_CRC : TINY_TX_STATE_END; - handle->tx.bits = 0; -#else - handle->tx.inprogress = TINY_TX_STATE_END; -#endif - return 1; - } - byte = handle->tx.pframe[handle->tx.sentbytes]; - result = __send_byte_state(handle, byte); - if (result > 0) - { - __update_fcs_field(handle->fcs_bits, &handle->tx.fcs, byte); - handle->tx.sentbytes++; - } - return result; -} - -#ifdef TINY_FCS_ENABLE -static int __send_frame_crc_state(STinyData *handle) -{ - int result; - uint8_t byte; - byte = (handle->tx.fcs >> handle->tx.bits) & 0x000000FF; - result = __send_byte_state(handle, byte); - if (result > 0) - { - handle->tx.bits += 8; - if (handle->tx.bits == handle->fcs_bits) - { - handle->tx.inprogress = TINY_TX_STATE_END; - } - } - return result; -} -#endif - - -/** -* __tiny_send_data function sends speficied data to serial port using Tiny -* frame format: 0x7E, data..., FCS, 0x7E. -* @param handle - pointer to Tiny Protocol structure -* @see TINY_ERR_INVALID_DATA -* @see TINY_ERR_FAILED -* @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED, 0 if HW is not ready or number of sent bytes. -*/ -static int __tiny_send_data(STinyData *handle) -{ - int result = TINY_NO_ERROR; - - while (handle->tx.inprogress != TINY_TX_STATE_IDLE) - { - switch (handle->tx.inprogress) - { - case TINY_TX_STATE_START: - result = __send_frame_flag_state(handle); - break; - case TINY_TX_STATE_END: - result = __send_frame_flag_state(handle); - break; - case TINY_TX_STATE_SEND_UID: - result = __send_frame_uid_state(handle); - break; - case TINY_TX_STATE_SEND_DATA: - result = __send_frame_data_state(handle); - break; -#ifdef TINY_FCS_ENABLE - case TINY_TX_STATE_SEND_CRC: - result = __send_frame_crc_state(handle); - break; -#endif - default: - break; - } - if ( result <= 0 ) - { - /* Exit in case of error or no data sent */ - return result; - } - } - - STATS(handle->stat.framesSent++); - STATS(handle->stat.bytesSent += handle->tx.sentbytes); - MUTEX_LOCK(handle->send_mutex); - handle->tx.pframe = 0; - COND_SIGNAL(handle->send_condition); - MUTEX_UNLOCK(handle->send_mutex); - return handle->tx.sentbytes; -} - - -#ifdef PLATFORM_MUTEX -/** - * waits until previous send operaton completes and places new buffer for sending - */ -static int __wait_send_complete(STinyData *handle, uint8_t *pbuf, uint8_t flags) -{ - int result = TINY_NO_ERROR; - /* We need to use mutex to access real hardware */ - MUTEX_LOCK(handle->send_mutex); - /* Wait until previous send operation is completed. */ - while (handle->tx.inprogress != TINY_TX_STATE_IDLE) - { - if (!(flags & TINY_FLAG_WAIT_FOREVER)) - { - result = TINY_ERR_BUSY; - MUTEX_UNLOCK(handle->send_mutex); - break; - } - COND_WAIT(handle->send_condition, handle->send_mutex); - } - /* If no send operation is in progress, pass new buffer for sending */ - if (result == TINY_NO_ERROR) - { - /* Remember pointer to data of the frame to transfer */ - handle->tx.pframe = pbuf; - handle->tx.inprogress = TINY_TX_STATE_START; - } - MUTEX_UNLOCK(handle->send_mutex); - return result; -} -#else -#define __wait_send_complete(handle, pbuf, flags) \ - 0; \ - handle->tx.pframe = pbuf; \ - handle->tx.inprogress = TINY_TX_STATE_START; -#endif - - -int tiny_send(STinyData *handle, uint16_t *uid, uint8_t * pbuf, int len, uint8_t flags) -{ - int result = TINY_NO_ERROR; - - if (!handle) - return TINY_ERR_INVALID_DATA; - - /* If the buffer being sent is some different buffer, wait until operation is finished */ - if (pbuf != handle->tx.pframe) - { - result = __wait_send_complete(handle, pbuf, flags); - if (result == TINY_NO_ERROR) - { - /* We can put new packet for the transfer. - Pointer is already set by _wait_send_complete. */ - if (uid) - { - handle->tx.uid = *uid; - handle->tx.bits = BITS_UID_16; - } - else - { - handle->tx.bits = BITS_NO_UID; - } - handle->tx.pframe = pbuf; - handle->tx.framelen = len; - } - } - if (result == TINY_NO_ERROR) - { - do - { - result = __tiny_send_data(handle); - if ((result != 0) || (handle->tx.inprogress == TINY_TX_STATE_IDLE)) - { - /* exit on error and on successful send */ - break; - } - } while (flags & TINY_FLAG_WAIT_FOREVER); - } -#ifdef CONFIG_ENABLE_STATS - /* If write callback is not null and frame is sent */ - if (handle->write_cb && (result>0)) - { - handle->write_cb(handle, TINY_FRAME_TX, pbuf, len); - } -#endif - return result; -} - - -/************************************************************** -* -* RECEIVE FUNCTIONS -* -***************************************************************/ - - -/** - * __tiny_read_data function receives and decodes bytes from Tiny protocol channel - * until 0x7E byte is received. - * If there are no input bytes, function saves its state to handle and returns 0. - * @param handle a pointer to STinyData structure. - * @param byte an unsigned char - byte to put into send buffer - * @param pbuf a pointer to receive buffer - * @param len an integer argument - maximum receive buffer size - * @return TINY_ERR_FAILED, TINY_ERR_DATA_TOO_LARGE or number of received bytes. - * 0 if no packet is not yet completed. - */ -static int __tiny_read_data(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len) -{ - uint8_t byte = 0; - int result; - if (handle->rx.inprogress == TINY_RX_STATE_START) - { - handle->rx.uid = 0; - handle->rx.bits = 0; - if (uid) - { - handle->rx.inprogress = TINY_RX_STATE_READ_UID; - } - else - { - handle->rx.inprogress = TINY_RX_STATE_READ_DATA; - } - } - - while (1) - { -# ifndef ARDUINO_NANO - result = handle->read_func(handle->pdata, &byte, 1); -# else - result = handle->read_func(&byte, 1); -# endif - /* Exit if UART error */ - if (result<0) return result; - /* Exit if no data awaiting */ - if (result == 0) return result; - - /* If next byte after 0x7E is 0x7E, tiny data have wrong frame alignment. - Start to read new frame and register error. */ - if ((byte == FLAG_SEQUENCE) && (handle->rx.prevbyte == FLAG_SEQUENCE)) - { - STATS(handle->stat.framesBroken++); - /* Read next byte */ - continue; - } - /* If received byte is 0x7E, this means end of frame */ - if ((byte == FLAG_SEQUENCE) && (handle->rx.prevbyte != FLAG_SEQUENCE)) - { - /* End of frame */ - break; - } - /* If escape char is received - wait for second char */ - if (byte == TINY_ESCAPE_CHAR) - { - /* Remember last byte received */ - handle->rx.prevbyte = byte; - /* Read next byte */ - continue; - } - /* If previous byte is 0x7D, we should decode the byte after */ - if (TINY_ESCAPE_CHAR == handle->rx.prevbyte) - { - /* Remember last byte received */ - handle->rx.prevbyte = byte; - byte ^= TINY_ESCAPE_BIT; // Update byte and continue - } - else - { - /* Just remember last byte */ - handle->rx.prevbyte = byte; - } - switch (handle->rx.inprogress) - { - case TINY_RX_STATE_READ_UID: - handle->rx.uid |= (byte << handle->rx.bits); - handle->rx.bits += 8; - if (handle->rx.bits == 16) - { - handle->rx.inprogress = TINY_RX_STATE_READ_DATA; - } - break; - case TINY_RX_STATE_READ_DATA: - /* if there is place in buffer save byte. - 2-byte FCS field support is responsibility of Tiny and not visible to upper layer. - Thus we do not need to have free place for last 2 bytes. */ - if (handle->rx.framelen < len) - { - pbuf[handle->rx.framelen] = byte; - } - handle->rx.framelen++; - break; - default: - break; - } - __update_fcs_field(handle->fcs_bits, &handle->rx.fcs, byte); - } - if (uid) - { - *uid = handle->rx.uid; - } - /* Tell that we have done and ready to receive next frame. */ - handle->rx.inprogress = TINY_RX_STATE_IDLE; -#ifdef TINY_FCS_ENABLE - /* Frame is too short. There should be at least 16-bit FCS field. */ - if (handle->rx.framelen < (handle->fcs_bits >> 3)) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_FAILED; - } - handle->rx.framelen -= (handle->fcs_bits >> 3); // subtract number of bytes of FCS field -#endif - if (handle->rx.framelen>=len) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_DATA_TOO_LARGE; - } - /* Check CRC */ - if (!__check_fcs_field(handle->fcs_bits, handle->rx.fcs)) - { - STATS(handle->stat.framesBroken++); - return TINY_ERR_FAILED; - } -#ifdef CONFIG_ENABLE_STATS - /* Call read callback if callback is defined */ - if (handle->read_cb) - { - handle->read_cb(handle, TINY_FRAME_RX, pbuf, handle->rx.framelen); - } -#endif - STATS(handle->stat.bytesReceived += handle->rx.framelen); - STATS(handle->stat.framesReceived++); - return handle->rx.framelen; -} - - -int tiny_read(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len, uint8_t flags) -{ - int result = TINY_NO_ERROR; - uint8_t byte; - - if (!handle) - return TINY_ERR_INVALID_DATA; - if (!handle->read_func) - return TINY_ERR_INVALID_DATA; - - do - { - /* If no any frame processing is in progress, check for new frame */ - if (handle->rx.inprogress == TINY_RX_STATE_IDLE) - { -# ifndef ARDUINO_NANO - result = handle->read_func(handle->pdata, &byte, 1); -# else - result = handle->read_func(&byte, 1); -# endif - /* Byte is received */ - if (result > 0) - { - /* New frame must be started with 0x7E char */ - if (byte != FLAG_SEQUENCE) - { - STATS(handle->stat.oosyncBytes++); - result = TINY_ERR_OUT_OF_SYNC; - break; - } - /* Ok, we're at the beginning of new frame. Init state machine. */ - handle->rx.framelen = 0; - handle->rx.inprogress = TINY_RX_STATE_START; - handle->rx.prevbyte = byte; - __init_fcs_field(handle->fcs_bits, &handle->rx.fcs); - } - else if (result<0) - { - result = TINY_ERR_FAILED; - break; - } - } - /* Some frame is in process of receiving. Continue to parse data */ - if (handle->rx.inprogress != TINY_RX_STATE_IDLE) - { - result = __tiny_read_data(handle, uid, pbuf, len); - } - if (result == 0) - { - if (!(flags & TINY_FLAG_WAIT_FOREVER)) - { - break; - } - TASK_YIELD(); - } - } - while (result == 0); - - return result; -} - - -/************************************************************** -* -* SERVICE FUNCTIONS -* -***************************************************************/ - -#ifdef CONFIG_ENABLE_STATS - -int tiny_get_stat(STinyData *handle, STinyStats *stat) -{ - if (!handle) - return TINY_ERR_INVALID_DATA; - *stat = handle->stat; - return TINY_NO_ERROR; -} - - -/** -* tiny_clear_stat function clears Tiny protocol statistics. -* @param handle - pointer to Tiny protocol structure -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -int tiny_clear_stat(STinyData *handle) -{ - if (handle) - return TINY_ERR_INVALID_DATA; - handle->stat.bytesSent = 0; - handle->stat.bytesReceived = 0; - handle->stat.framesBroken = 0; - handle->stat.framesReceived = 0; - handle->stat.framesSent = 0; - handle->stat.oosyncBytes = 0; - return TINY_NO_ERROR; -} - - -/** -* tiny_set_callbacks sets callback procs for specified Tiny protocol. -* callbacks will receive all data being sent or received. -* @param handle - pointer to Tiny Protocol structure -* @param read_cb - an argument of on_frame_cb_t type - pointer to callback function. -* @param send_cb - an argument of on_frame_cb_t type - pointer to callback function. -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -int tiny_set_callbacks(STinyData *handle, - on_frame_cb_t read_cb, - on_frame_cb_t send_cb) -{ - if (!handle) - { - return TINY_ERR_INVALID_DATA; - } - MUTEX_LOCK(handle->send_mutex); - handle->read_cb = read_cb; - handle->write_cb = send_cb; - MUTEX_UNLOCK(handle->send_mutex); - return TINY_NO_ERROR; -} - -#endif /* CONFIG_ENABLE_STATS */ - diff --git a/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.h b/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.h deleted file mode 100644 index f1312c19..00000000 --- a/releases/arduino/TinyProto-Nano/src/proto/tiny_layer2.h +++ /dev/null @@ -1,394 +0,0 @@ -/* - Copyright 2016 (C) Alexey Dynda - - This file is part of Tiny Protocol Library. - - Protocol 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 3 of the License, or - (at your option) any later version. - - Protocol 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 Protocol Library. If not, see . -*/ - -/** - This is Tiny protocol implementation for microcontrollers - - @file - @brief Tiny protocol API -*/ -#ifndef _TINY_LAYER2_H_ -#define _TINY_LAYER2_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include "tiny_defines.h" - -/// \cond -#if defined(CONFIG_ENABLE_FCS16) || defined(CONFIG_ENABLE_FCS32) || defined(CONFIG_ENABLE_CHECKSUM) - #define TINY_FCS_ENABLE - #ifdef CONFIG_ENABLE_FCS32 - typedef uint32_t fcs_t; - #else - typedef uint16_t fcs_t; - #endif -#endif -/// \endcond - -/** - * @defgroup ERROR_FLAGS Return error codes for Tiny API functions - * @{ - */ - -/// No error. For tiny_send and tiny_read functions, this means, no data sent or received -#define TINY_NO_ERROR (0) -/// Generic error. -#define TINY_ERR_FAILED (-1) -/// Timeout happened. Not actually used for now. -#define TINY_ERR_TIMEOUT (-2) -/// Data too large to fit the user buffer, valid for tiny_read function -#define TINY_ERR_DATA_TOO_LARGE (-3) -/// Some invalid data passed to Tiny API function. -#define TINY_ERR_INVALID_DATA (-4) -/// API function detected that operation cannot be performed right now. -#define TINY_ERR_BUSY (-5) -/// Out of sync - received some data, which are not part of the frame (tiny_read) -#define TINY_ERR_OUT_OF_SYNC (-6) - -/** @} */ - -/** - * @defgroup FLAGS_GROUP Flags for Tiny API functions - * @{ - */ - -/// This flag makes tiny API functions perform as non-blocking -#define TINY_FLAG_NO_WAIT (0) -/// This flag makes tiny API functions perform in blocking mode -#define TINY_FLAG_WAIT_FOREVER (1) - -/** @} */ - -/// \cond -typedef enum -{ - TINY_TX_STATE_IDLE, - TINY_TX_STATE_START, - TINY_TX_STATE_SEND_UID, - TINY_TX_STATE_SEND_DATA, -#ifdef TINY_FCS_ENABLE - TINY_TX_STATE_SEND_CRC, -#endif - TINY_TX_STATE_END -} ETinyTxState; - -typedef enum -{ - TINY_RX_STATE_IDLE, - TINY_RX_STATE_START, - TINY_RX_STATE_READ_UID, - TINY_RX_STATE_READ_DATA, - TINY_RX_STATE_END -} ETinyRxState; -/// \endcond - - -/** - * Enum is used for callback functions to specify - * direction of the frame, processed by the protocol. - */ -typedef enum -{ - TINY_FRAME_TX, - TINY_FRAME_RX, -} ETinyFrameDirection; - -/** - * The function writes data to communication channel port. - * @param pdata - pointer to user private data - absent in Arduino version - * @param buffer - pointer to the data to send to channel. - * @param size - size of data to write. - * @see read_block_cb_t - * @return the function must return negative value in case of error or number of bytes written - * or zero. - */ -#ifndef ARDUINO_NANO -typedef int (*write_block_cb_t)(void *pdata, const uint8_t *buffer, int size); -#else -typedef int (*write_block_cb_t)(const uint8_t *buffer, int size); -#endif - -/** - * The function reads data from communication channel. - * @param pdata - pointer to user private data. - absent in Arduino version - * @param buffer - pointer to a buffer to read data to from the channel. - * @param size - maximum size of the buffer. - * @see write_block_cb_t - * @return the function must return negative value in case of error or number of bytes actually read - * or zero. - */ -#ifndef ARDUINO_NANO -typedef int (*read_block_cb_t)(void *pdata, uint8_t *buffer, int size); -#else -typedef int (*read_block_cb_t)(uint8_t *buffer, int size); -#endif - - -/** - * on_frame_cb_t is a function to callback data going through Tiny level. - * @param handle - handle of Tiny. - * @param direction - frame is sent or received. - * @param pdata - data sent or received over Tiny. - * @param size - size of data. - * @return None. - */ -typedef void (*on_frame_cb_t)(void *handle, ETinyFrameDirection direction, uint8_t *pdata, int size); - - -/** - * This structure contains captured statistics while the protocol - * sends and receives messages. - */ -typedef struct -{ - /// Number of bytes received out of frame bytes - uint32_t oosyncBytes; - /// Number of payload bytes totally sent through the channel - uint32_t bytesSent; - /// Number of payload bytes totally received through the channel - uint32_t bytesReceived; - /// Number of frames, successfully sent through the channel - uint32_t framesSent; - /// Number of frames, successfully received through the communication channel - uint32_t framesReceived; - /// Number of broken frames received - uint32_t framesBroken; -} STinyStats; - - -/** - * This structure describes the state of Receive State machine. - * \warning This is for internal use only, and should not be accessed directly from the application. - */ -typedef struct -{ - /// Number of bytes in the frame being received. - /** This value becomes valid only when TINY_RX_STATE_END is reached. */ - int framelen; - /// The state of Receive State machine - uint8_t inprogress; -#ifdef TINY_FCS_ENABLE - /// The field contains calculated checksum and not available in TINY_MINIMAL configuration - fcs_t fcs; -#endif - /// \cond - uint16_t uid; - uint8_t bits; - uint8_t prevbyte; - /// \endcond -} STinyRxStatus; - - -/** - * This structure describes the state of Transmit State machine. - * \warning This is for internal use only, and should not be accessed directly from the application. - */ -typedef struct -{ - /// Number of payload bytes, sent from the frame being sent - int sentbytes; - /// Pointer to the frame data being sent - uint8_t *pframe; - /// Length of the frame passed by a user - int framelen; - /// @see ETinyTxState - uint8_t inprogress; -#ifdef TINY_FCS_ENABLE - /// The field contains calculated checksum and not available in TINY_MINIMAL configuration - fcs_t fcs; // fcs field -#endif - /// \cond - uint16_t uid; // uid field - uint8_t prevbyte; // last byte sent - uint8_t bits; // index of crc byte being sent - /// \endcond -} STinyTxStatus; - -/************************************************************* -* -* Tiny defines -* -**************************************************************/ - -typedef struct -{ - /// pointer to platform related write function - write_block_cb_t write_func; - /// pointer to platform related read function - read_block_cb_t read_func; - /// pointer to application defined data, passed during protocol initialization - absent in Arduino version -#ifndef ARDUINO_NANO - void* pdata; -#endif - /// @see STinyRxStatus - STinyRxStatus rx; - /// @see STinyTxStatus - STinyTxStatus tx; -#ifdef PLATFORM_MUTEX - PLATFORM_MUTEX send_mutex; // Mutex for send operation -#endif -#ifdef PLATFORM_COND - PLATFORM_COND send_condition; // Condition is called, when send operation is completed -#endif -#ifdef TINY_FCS_ENABLE - /// The field contains number of bits to use for FCS and not available in TINY_MINIMAL configuration - uint8_t fcs_bits; -#endif -#ifdef CONFIG_ENABLE_STATS - /// @see STinyStats - STinyStats stat; - /// pointer to callback function - /** This callback is called when it is not null and when - new frame is successfully received. - */ - on_frame_cb_t read_cb; - /// pointer to callback function to get data being sent - /** This callback is called when it is not null and when - new frame is successfully sent. */ - on_frame_cb_t write_cb; -#endif -} STinyData; - - - -/** -* The function initializes internal structures for Tiny channel and return handle -* to be used with all Tiny and IPC functions. -* @param handle - pointer to Tiny data -* @param write_func - pointer to write data function (to communication channel). -* @param read_func - pointer to read function (from communication channel). -* @param pdata - pointer to a user private data. -* @note pdata parameter is not applicable for Arduino and is absent in its version. -* @see write_block_cb_t -* @see read_block_cb_t -* @return TINY_NO_ERROR or error code. -*/ -#ifndef ARDUINO_NANO -extern int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func, - void *pdata); -#else -extern int tiny_init(STinyData *handle, - write_block_cb_t write_func, - read_block_cb_t read_func); -#endif - - -/** -* The function closes channel. -* @param handle - pointer to Tiny data. -* @see tiny_init() -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_close(STinyData *handle); - - -/** - * The function sets number of bits used for fcs - * @param handle - pointer to Tiny structure - * @param bits - number of bits to use for fcs: 16 or 32. - * @return TINY_ERR_FAILED - * TINY_NO_ERROR - */ -extern int tiny_set_fcs_bits(STinyData *handle, uint8_t bits); - - -/** - * The function sends data to communication channel in the following - * frame format: 0x7E, data..., FCS, 0x7E. - * \note if flags field is set to TINY_FLAG_NO_WAIT, then this function may remember pbuf - * pointer and return immediately. So, it is responsibility of the caller to make - * pbuf data to be available all the time until frame is sent. - * @param handle - pointer to Tiny data. - * @param uid - pointer to 16-bit variable containing packet uid, can be NULL. - * @param pbuf - a const pointer to unsigned char - buffer with data to send - * @param len - an integer argument - length of data to send - * @param flags - TINY_FLAG_NO_WAIT - * @see TINY_ERR_INVALID_DATA - * @see TINY_ERR_FAILED - * @see TINY_FLAG_NO_WAIT - * @see TINY_FLAG_WAIT_FOREVER - * @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED or number of sent bytes. - */ -extern int tiny_send(STinyData *handle, uint16_t *uid, uint8_t * pbuf, int len, uint8_t flags); - - -/** - * The function reads data from communication channel - * frame format: 0x7E, data..., FCS, 0x7E. - * @param handle - pointer to Tiny data. - * @param uid - pointer to 16-bit uid variable to fill with packet info, can be NULL. - * @param pbuf a const pointer to unsigned char - buffer with data to send - * @param len an integer argument - length of data to send - * @param flags - TINY_FLAG_NO_WAIT - * @see TINY_ERR_INVALID_DATA - * @see TINY_ERR_FAILED - * @see TINY_ERR_DATA_TOO_LARGE - * @see TINY_ERR_OUT_OF_SYNC - * @see TINY_ERR_BUSY - * @return TINY_ERR_INVALID_DATA, TINY_ERR_FAILED or number of sent bytes. - */ -extern int tiny_read(STinyData *handle, uint16_t *uid, uint8_t *pbuf, int len, uint8_t flags); - - -#ifdef CONFIG_ENABLE_STATS -/** -* The function returns statistics per communication connection. -* @param handle - pointer to Tiny data. -* @param stat - pointer of stucture to fill. -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_get_stat(STinyData *handle, STinyStats *stat); - - -/** -* The function clears Tiny statistics. -* @param handle - pointer to Tiny data. -* @see TINY_ERR_INVALID_DATA -* @see TINY_NO_ERROR -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_clear_stat(STinyData *handle); - - -/** -* The function sets callback procs for specified Tiny channel. -* callbacks will receive all data being sent or received. -* @param handle - pointer to Tiny data. -* @param read_cb - pointer to callback function. -* @param send_cb - pointer to callback function. -* @return TINY_ERR_INVALID_DATA, TINY_NO_ERROR. -*/ -extern int tiny_set_callbacks(STinyData *handle, - on_frame_cb_t read_cb, - on_frame_cb_t send_cb); -#endif /* CONFIG_ENABLE_STATS */ - - -#ifdef __cplusplus -} -#endif - -#endif /* _TINY_PROTOCOL_H_ */ diff --git a/releases/arduino/TinyProto-Full/README.md b/releases/arduino/TinyProtocol/README.md similarity index 100% rename from releases/arduino/TinyProto-Full/README.md rename to releases/arduino/TinyProtocol/README.md diff --git a/releases/arduino/TinyProto-Full/examples/sketch_echo/sketch_echo.ino b/releases/arduino/TinyProtocol/examples/sketch_echo/sketch_echo.ino similarity index 94% rename from releases/arduino/TinyProto-Full/examples/sketch_echo/sketch_echo.ino rename to releases/arduino/TinyProtocol/examples/sketch_echo/sketch_echo.ino index 35f2e2db..8718854d 100755 --- a/releases/arduino/TinyProto-Full/examples/sketch_echo/sketch_echo.ino +++ b/releases/arduino/TinyProtocol/examples/sketch_echo/sketch_echo.ino @@ -7,11 +7,11 @@ * TinyProtocol uses some special frame format, that means that it will ignore not valid * chars received over UART. Each packet should be in the following format: * ~[UID]DATA[FCS]~ - * UID and FCS field are optional. In the example below, they are disabled. Nano versition - * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use Micro and + * UID and FCS field are optional. In the example below, they are disabled. Nano version + * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use * Full versions of Tiny protocol. */ -#include +#include /* Creating protocol object is simple */ Tiny::Proto proto; @@ -44,4 +44,4 @@ void loop() /* Send received packet back to UART (echo) */ proto.write(g_packet, TINY_FLAG_WAIT_FOREVER); } -} +} diff --git a/releases/arduino/TinyProto-Nano/examples/sketch_tinyproto01/sketch_tinyproto01.ino b/releases/arduino/TinyProtocol/examples/sketch_tinyproto01/sketch_tinyproto01.ino similarity index 98% rename from releases/arduino/TinyProto-Nano/examples/sketch_tinyproto01/sketch_tinyproto01.ino rename to releases/arduino/TinyProtocol/examples/sketch_tinyproto01/sketch_tinyproto01.ino index 041bbfcd..81b3bbe8 100755 --- a/releases/arduino/TinyProto-Nano/examples/sketch_tinyproto01/sketch_tinyproto01.ino +++ b/releases/arduino/TinyProtocol/examples/sketch_tinyproto01/sketch_tinyproto01.ino @@ -2,7 +2,7 @@ * This example sends packet every second. * If some packet is received from remote side, it echos content back to the sender */ -#include +#include const int PIN_LED = 13; @@ -54,4 +54,4 @@ void loop() digitalWrite(PIN_LED, HIGH); delay(15); digitalWrite(PIN_LED, LOW); -} +} diff --git a/releases/arduino/TinyProto-Full/keywords.txt b/releases/arduino/TinyProtocol/keywords.txt similarity index 100% rename from releases/arduino/TinyProto-Full/keywords.txt rename to releases/arduino/TinyProtocol/keywords.txt diff --git a/releases/arduino/TinyProto-Nano/library.properties b/releases/arduino/TinyProtocol/library.properties similarity index 88% rename from releases/arduino/TinyProto-Nano/library.properties rename to releases/arduino/TinyProtocol/library.properties index 82763fa6..c2eb871e 100644 --- a/releases/arduino/TinyProto-Nano/library.properties +++ b/releases/arduino/TinyProtocol/library.properties @@ -1,9 +1,9 @@ -name=TinyProto-Nano -version=0.1.2 +name=TinyProtocol +version=0.2.0 author=Alexey Dynda maintainer=Alexey Dynda sentence=Allows to communicate other boards/PC via any physical connection. paragraph=Using this library you can easy communicate your Arduino with applications on PC and other boards. You don't need to think about data synchronization between points. category=Communication -url=https://github.com/lexus2k/tinyproto/tree/master/releases/arduino/TinyProto-Nano +url=https://github.com/lexus2k/tinyproto/tree/master/releases/arduino/TinyProtocol architectures=* diff --git a/releases/arduino/TinyProto-Nano/src/TinyProtocol.cpp b/releases/arduino/TinyProtocol/src/TinyProtocol.cpp similarity index 98% rename from releases/arduino/TinyProto-Nano/src/TinyProtocol.cpp rename to releases/arduino/TinyProtocol/src/TinyProtocol.cpp index 9e283a53..e89ab39a 100644 --- a/releases/arduino/TinyProto-Nano/src/TinyProtocol.cpp +++ b/releases/arduino/TinyProtocol/src/TinyProtocol.cpp @@ -25,7 +25,7 @@ # endif #endif -#include "TinyProto-Nano.h" +#include "TinyProtocol.h" namespace Tiny { /////////////////////////////////////////////////////////////////////// diff --git a/releases/arduino/TinyProto-Micro/src/TinyProto-Micro.h b/releases/arduino/TinyProtocol/src/TinyProtocol.h similarity index 98% rename from releases/arduino/TinyProto-Micro/src/TinyProto-Micro.h rename to releases/arduino/TinyProtocol/src/TinyProtocol.h index 2a7334cc..f44ff848 100644 --- a/releases/arduino/TinyProto-Micro/src/TinyProto-Micro.h +++ b/releases/arduino/TinyProtocol/src/TinyProtocol.h @@ -171,7 +171,7 @@ class Proto /** * Enables CRC 8-bit field in the protocol. This field * contains sum of all data bytes in the packet. - * 8-bit field is not supported by Nano version of Tiny library. + * 8-bit field is supported by Nano version of Tiny library. * @return true if successful * false in case of error. */ @@ -189,7 +189,7 @@ class Proto /** * Enables CRC 32-bit field in the protocol. This field * contains FCS 32-bit CCITT like defined in RFC 1662. - * 32-bit field is not supported by Nano and Micro versions of + * 32-bit field is not supported by Nano version of * Tiny library. * @return true if successful * false in case of error. diff --git a/releases/arduino/TinyProto-Full/src/proto/crc.c b/releases/arduino/TinyProtocol/src/proto/crc.c similarity index 100% rename from releases/arduino/TinyProto-Full/src/proto/crc.c rename to releases/arduino/TinyProtocol/src/proto/crc.c diff --git a/releases/arduino/TinyProto-Full/src/proto/crc.h b/releases/arduino/TinyProtocol/src/proto/crc.h similarity index 100% rename from releases/arduino/TinyProto-Full/src/proto/crc.h rename to releases/arduino/TinyProtocol/src/proto/crc.h diff --git a/releases/arduino/TinyProtocol/src/proto/tiny_config.h b/releases/arduino/TinyProtocol/src/proto/tiny_config.h new file mode 100644 index 00000000..b070d01b --- /dev/null +++ b/releases/arduino/TinyProtocol/src/proto/tiny_config.h @@ -0,0 +1,17 @@ +#ifdef ARDUINO_AVR_NANO +///////////////////////////////////////////////////////////////// +// Tiny protocol configuration for Nano boards +///////////////////////////////////////////////////////////////// + +# define CONFIG_ENABLE_CHECKSUM + +#else +///////////////////////////////////////////////////////////////// +// Tiny protocol configuration for All other boards +///////////////////////////////////////////////////////////////// + +# define CONFIG_ENABLE_CHECKSUM +# define CONFIG_ENABLE_FCS16 +# define CONFIG_ENABLE_FCS32 + +#endif diff --git a/releases/arduino/TinyProto-Full/src/proto/tiny_defines.h b/releases/arduino/TinyProtocol/src/proto/tiny_defines.h similarity index 100% rename from releases/arduino/TinyProto-Full/src/proto/tiny_defines.h rename to releases/arduino/TinyProtocol/src/proto/tiny_defines.h diff --git a/releases/arduino/TinyProto-Full/src/proto/tiny_layer2.c b/releases/arduino/TinyProtocol/src/proto/tiny_layer2.c similarity index 100% rename from releases/arduino/TinyProto-Full/src/proto/tiny_layer2.c rename to releases/arduino/TinyProtocol/src/proto/tiny_layer2.c diff --git a/releases/arduino/TinyProto-Full/src/proto/tiny_layer2.h b/releases/arduino/TinyProtocol/src/proto/tiny_layer2.h similarity index 100% rename from releases/arduino/TinyProto-Full/src/proto/tiny_layer2.h rename to releases/arduino/TinyProtocol/src/proto/tiny_layer2.h diff --git a/src/arduino/examples/sketch_echo/sketch_echo.ino b/src/arduino/examples/sketch_echo/sketch_echo.ino index 35f2e2db..8718854d 100755 --- a/src/arduino/examples/sketch_echo/sketch_echo.ino +++ b/src/arduino/examples/sketch_echo/sketch_echo.ino @@ -7,11 +7,11 @@ * TinyProtocol uses some special frame format, that means that it will ignore not valid * chars received over UART. Each packet should be in the following format: * ~[UID]DATA[FCS]~ - * UID and FCS field are optional. In the example below, they are disabled. Nano versition - * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use Micro and + * UID and FCS field are optional. In the example below, they are disabled. Nano version + * of Tiny protocol supports only simple 1-byte Checksum field. For CRC-16/CRC-32 use * Full versions of Tiny protocol. */ -#include +#include /* Creating protocol object is simple */ Tiny::Proto proto; @@ -44,4 +44,4 @@ void loop() /* Send received packet back to UART (echo) */ proto.write(g_packet, TINY_FLAG_WAIT_FOREVER); } -} +} diff --git a/src/arduino/examples/sketch_tinyproto01/sketch_tinyproto01.ino b/src/arduino/examples/sketch_tinyproto01/sketch_tinyproto01.ino index 041bbfcd..81b3bbe8 100755 --- a/src/arduino/examples/sketch_tinyproto01/sketch_tinyproto01.ino +++ b/src/arduino/examples/sketch_tinyproto01/sketch_tinyproto01.ino @@ -2,7 +2,7 @@ * This example sends packet every second. * If some packet is received from remote side, it echos content back to the sender */ -#include +#include const int PIN_LED = 13; @@ -54,4 +54,4 @@ void loop() digitalWrite(PIN_LED, HIGH); delay(15); digitalWrite(PIN_LED, LOW); -} +} diff --git a/src/arduino/library.properties b/src/arduino/library.properties.in similarity index 100% rename from src/arduino/library.properties rename to src/arduino/library.properties.in diff --git a/src/arduino/src/TinyProtocol.h b/src/arduino/src/TinyProtocol.h index 2a7334cc..f44ff848 100644 --- a/src/arduino/src/TinyProtocol.h +++ b/src/arduino/src/TinyProtocol.h @@ -171,7 +171,7 @@ class Proto /** * Enables CRC 8-bit field in the protocol. This field * contains sum of all data bytes in the packet. - * 8-bit field is not supported by Nano version of Tiny library. + * 8-bit field is supported by Nano version of Tiny library. * @return true if successful * false in case of error. */ @@ -189,7 +189,7 @@ class Proto /** * Enables CRC 32-bit field in the protocol. This field * contains FCS 32-bit CCITT like defined in RFC 1662. - * 32-bit field is not supported by Nano and Micro versions of + * 32-bit field is not supported by Nano version of * Tiny library. * @return true if successful * false in case of error.