New native functions nn.* in playground

.gitmodules

@@ -40,3 +40,6 @@
 [submodule "third_party/quazip"]
 	path = third_party/quazip
 	url = https://github.com/mobsya/quazip
+[submodule "third_party/thymio-nn"]
+	path = third_party/thymio-nn
+	url = https://github.com/Mobsya/thymio-nn.git

aseba/targets/playground/CMakeLists.txt

@@ -1,5 +1,7 @@
 set(CMAKE_AUTOMOC on)
 
+set(NN_ROOT ${CMAKE_SOURCE_DIR}/third_party/thymio-nn)
+
 set (ASEBASIM_SRC
 	EnkiGlue.cpp
 	AsebaGlue.cpp
@@ -9,10 +11,15 @@ set (ASEBASIM_SRC
 	robots/e-puck/EPuck-descriptions.c
 	robots/thymio2/Thymio2.cpp
 	robots/thymio2/Thymio2-natives.cpp
-	robots/thymio2/Thymio2-descriptions.c
+    robots/thymio2/Thymio2-descriptions.c
+    ${NN_ROOT}/thymio/nn-natives.c
+    ${NN_ROOT}/thymio/nn-descriptions.c
+    ${NN_ROOT}/nn/nn.c
+    ${NN_ROOT}/nn/nn-alloc-stdlib.c
 )
 
 add_library(asebasim STATIC ${ASEBASIM_SRC})
+target_include_directories(asebasim PUBLIC ${CMAKE_SOURCE_DIR}/third_party/thymio-nn)
 set_target_properties(asebasim PROPERTIES VERSION ${LIB_VERSION_STRING}
 										SOVERSION ${LIB_VERSION_MAJOR})
 
@@ -69,4 +76,4 @@ if(APPLE)
     set(playground_icon ${PROJECT_SOURCE_DIR}/menu/osx/asebaplayground.icns)
     set_source_files_properties(${playground_icon} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
     target_sources(${PLAYGROUND_EXECUTABLE_NAME} PRIVATE ${playground_icon})
-endif()
+endif()

aseba/targets/playground/robots/thymio2/Thymio2.cpp

@@ -20,6 +20,7 @@
 
 #include "Thymio2.h"
 #include "Thymio2-natives.h"
+#include "thymio/nn-natives.h"
 #include "../../Parameters.h"
 #include "../../EnkiGlue.h"
 #include "common/productids.h"
@@ -210,16 +211,23 @@ const AsebaLocalEventDescription* AsebaThymio2::getLocalEventsDescriptions() con
 // array of descriptions of native functions, static so only visible in this file
 
 static const AsebaNativeFunctionDescription* nativeFunctionsDescriptions[] = {
-    ASEBA_NATIVES_STD_DESCRIPTIONS, PLAYGROUND_THYMIO2_NATIVES_DESCRIPTIONS, nullptr};
+    ASEBA_NATIVES_STD_DESCRIPTIONS,
+    PLAYGROUND_THYMIO2_NATIVES_DESCRIPTIONS,
+    NN_NATIVES_DESCRIPTIONS,
+    nullptr
+};
 
 const AsebaNativeFunctionDescription* const* AsebaThymio2::getNativeFunctionsDescriptions() const {
     return nativeFunctionsDescriptions;
 }
 
 // array of native functions, static so only visible in this file
 
-static AsebaNativeFunctionPointer nativeFunctions[] = {ASEBA_NATIVES_STD_FUNCTIONS,
-                                                       PLAYGROUND_THYMIO2_NATIVES_FUNCTIONS};
+static AsebaNativeFunctionPointer nativeFunctions[] = {
+    ASEBA_NATIVES_STD_FUNCTIONS,
+    PLAYGROUND_THYMIO2_NATIVES_FUNCTIONS,
+    NN_NATIVES_FUNCTIONS
+};
 
 void AsebaThymio2::callNativeFunction(uint16_t id) {
     nativeFunctions[id](&vm);