Merge branch 'feature/emulator_base' of https://github.com/smartanthi…

…ll/smartanthill2_0-embedded into develop
smartanthill · Mar 16, 2015 · d095148 · d095148
2 parents 9c2a6c9 + 7c4d548
commit d095148
Show file tree

Hide file tree

Showing 18 changed files with 2,383 additions and 1,301 deletions.
diff --git a/tests/emulator/sa-commlayer.cpp b/tests/emulator/sa-commlayer.cpp
diff --git a/tests/emulator/sa-commlayer.h b/tests/emulator/sa-commlayer.h
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 #if !defined __SA_COMMLAYER_H__
@@ -31,12 +22,14 @@
 // RET codes
 #define COMMLAYER_RET_FAILED 0 // not authenticated, etc
 #define COMMLAYER_RET_OK 1 // new packet
+#define COMMLAYER_RET_PENDING 2
 
 
 bool communicationInitializeAsServer();
 bool communicationInitializeAsClient();
 void communicationTerminate();
-uint8_t sendMessage( uint16_t* msgSize, const unsigned char * buff );
-uint8_t getMessage( uint16_t* msgSize, unsigned char * buff, int maxSize );
+uint8_t sendMessage( uint16_t* msgSize, const uint8_t * buff );
+uint8_t getMessage( uint16_t* msgSize, uint8_t * buff, int maxSize ); // returns when a packet received
+uint8_t tryGetMessage(uint16_t* msgSize, uint8_t * buff, int maxSize); // returns immediately, but a packet reception is not guaranteed
 
 #endif // __SA_COMMLAYER_H__
diff --git a/tests/emulator/sa-common.h b/tests/emulator/sa-common.h
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 
@@ -48,10 +39,13 @@
 // note: internal structure is defined by a correspondent handler (see respective .h files for details)
 // TODO: think about more reliable mechanism
 #define DADA_OFFSET_SASP 0
-#define DADA_OFFSET_SAGDP 28
+#define DADA_OFFSET_SAGDP ( DADA_OFFSET_SASP + 28 )
+#define DADA_OFFSET_NEXT ( DADA_OFFSET_SAGDP + 28 )
 
 // debug helpers
 
+#define DEBUG_PRINTING
+
 #ifdef DEBUG_PRINTING
 #include <stdio.h>
 #define PRINTF printf

diff --git a/tests/emulator/sa-eeprom.cpp b/tests/emulator/sa-eeprom.cpp
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 #include "sa-common.h"
@@ -32,7 +23,7 @@
 // Interface is implemented based on file IO
 // Files have standard names, each corresponding to master/slave distinguisher and data ID
 
-void prepareFileName( char* nameBuff, unsigned char id )
+void prepareFileName( char* nameBuff, uint8_t id )
 {
 	sprintf( nameBuff, "eeprom-%s-%d.dat", MASTER_SLAVE_BIT ? "master" : "slave", id );
 }

diff --git a/tests/emulator/sa-eeprom.h b/tests/emulator/sa-eeprom.h
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 #if !defined __SA_EEPROM_H__

diff --git a/tests/emulator/sa-timer.cpp b/tests/emulator/sa-timer.cpp
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 #include "sa-timer.h"
@@ -31,14 +22,16 @@
 
 #include <Windows.h>
 
+#define TIME_FACTOR 500
+
 void waitForTimeQuantum()
 {
-	Sleep(1);
+	Sleep(TIME_FACTOR);
 }
 
 unsigned short getTime()
 {
-	return (unsigned short)( GetTickCount() );
+	return (unsigned short)( GetTickCount() / TIME_FACTOR ); // 100 ms
 }
 
 #endif
diff --git a/tests/emulator/sa-timer.h b/tests/emulator/sa-timer.h
@@ -1,27 +1,18 @@
 /*******************************************************************************
-    Copyright (c) 2015, OLogN Technologies AG. All rights reserved.
-    Redistribution and use of this file in source and compiled
-    forms, with or without modification, are permitted
-    provided that the following conditions are met:
-        * Redistributions in source form must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in compiled form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the OLogN Technologies AG nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL OLogN Technologies AG BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE
+Copyright (C) 2015 OLogN Technologies AG
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *******************************************************************************/
 
 #if !defined __SA_TIMER_H__