Versao thales

.gitattributes

@@ -0,0 +1,3 @@
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.opn filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,3 +1,4 @@
+## CodeRelease
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
@@ -9,4 +10,53 @@ compile_commands.json
 CTestTestfile.cmake
 build-*
 keys
-.vscode
+.vscode
+.qi
+sdk
+
+## Supervisor
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+*.user
+*.user.*
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*

README.md

@@ -1,2 +1,49 @@
 # Mari
 This is just a temporary code release
+
+## Get Started
+In order to make your computer ready to compile our code, first run the script *setup*.
+```shell
+./setup
+```
+This script will guide through all the required steps to make your environment ready. You will be asked to place an SDK inside the newly created *sdk* folder. We have used the version 2.1.4.13 from Aldebaran which can be found in [Aldebaran Community](https://community.ald.softbankrobotics.com/en/resources/software) website or in our [Mari Assets](https://github.com/AlexanderSilvaB/Mari-Assets) repository. 
+
+On running this script without any arguments, a toolchain called **rinobot-robot** will be created on your system. You can also setup with a custom toolchain name. To do that just run the script with a toolchain name as argument.
+```shell
+./setup toolchain-name
+```
+
+## Install on robot
+To install our code release on NAO, use the *sync* script. This script will configure the robot and copy all needed files to the correct places. On the first time you run this script on any robot is needed that you use the argument *--all* to make sure that all needed settings will be made on the robot. In this script is always required to pass a robot IP or hostname as an argument.
+
+You can use the *--build* argument to force the code compilation on sync. We recommend that you always use this parameter so the code changes will always be compiled before sync.
+
+To configure and sync a robot for the first time you can use:
+```shell
+./sync robot-hostname --all
+```
+
+To sync the robot after the first configuration you just need to use:
+```shell
+./sync robot-hostname --build
+```
+
+By default this script uses a toolchain called **rinobot-toolchain**, if you change your toolchain name with the script *setup* you will need to pass the correct toolchain name as an argument.
+```shell
+./sync robot-hostname toolchain-name --build
+```
+
+## Structure
+Our repository is structured in a way that 3 main folders are used, as described bellow:
+* **root**: This will be copied to the robot root directory
+
+* **src**: This is complete source code
+
+* **supervisor**: Here lives our Supervisor software
+
+There is also 3 main script that are used:
+* **setup**: This script is used to configure the user machine
+
+* **sync**: This script is responsible to configure the robot and copy the binaries and data needed to run our software.
+
+* **build**: This is the script used to compile the source code. Is also possible to not run this script directly and instead use the argument *--build* in the *sync* script.

build

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+toolchain="rinobot-robot"
+
+configure=false
+
+for i in "$@" ; do
+    if [[ $i == "--configure" ]] ; then
+        configure=true
+    else
+        toolchain=$i
+    fi
+done
+
+if [ ! -d ".qi" ]; then
+    echo "Initializing qibuild"
+    qibuild init
+fi
+
+if [ ! -d "src/build-$toolchain" ]; then
+    configure=true
+fi
+
+
+echo "Build with $toolchain"
+cd src
+if [ $configure == true ]; then
+    qibuild configure -c $toolchain
+fi
+qibuild make -c $toolchain
+cd ..

root/etc/naoqi/autoload_rinobot.ini

@@ -0,0 +1,110 @@
+# Here is the list of modules loaded in NaoQi core process.
+
+# You should not edit this file.
+
+# If you need to load your module at startup, create a file
+# in /home/nao/naoqi/preferences/autoload.ini looking like:
+
+#  [user]
+#  /the/full/path/to/your/libyourmodule.so
+#
+# Note: to use urbi, you should use:
+#
+#  [user]
+#  /usr/lib/naoqi/liburbistarter.so
+#
+
+
+[core]
+albase
+#preferencemanager
+#framemanager
+#logmanager
+#alservicemanager
+#aldebug
+
+[extra]
+#notificationmanager
+dcm_hal
+#expressiveness
+#alresourcemanager
+robotmodel
+#aldiagnosis
+sensors
+#albodytemperature
+motion
+#touch
+#robotposture
+#redballtracker
+#facetracker
+#motionrecorder
+#leds
+#alworldrepresentation
+#alvideodevice
+#colorblobdetection
+#redballdetection
+#facedetection
+#visionrecognition
+#landmarkdetection
+#darknessdetection
+#backlightingdetection
+#photocapture
+#videorecorder
+#alvisualcompass
+#visualspacehistory
+#alsystem
+#packagemanager
+#alusersession
+
+# modularity and filters
+#modularityperception
+#audiofilterloader
+
+audiodevice
+#audiorecorder
+audioout
+#speechrecognition
+#voiceemotionanalysis
+#albattery
+#alchestbutton
+#mecalogger
+#pythonbridge
+#launcher
+#allaser
+#behaviormanager
+#animatedspeech
+#memorywatcher
+#navigation
+albonjour
+#infrared
+#altelepathe
+#altracker
+#allocalization
+#alpanoramacompass
+#robothealthmonitor
+#notificationreader
+
+# vision modules using modularity
+#segmentation3D
+#barcodereader
+#movementdetection
+#peopleperception
+#engagementzones
+#sittingpeopledetection
+#gazeanalysis
+#wavingdetection
+#facecharacteristics
+#objectdetection
+#closeobjectdetection
+#fastpersontracking
+#findpersonhead
+
+# audition modules using modularity
+#sounddetection
+#soundlocalization
+
+#basicawareness
+#autonomousblinking
+#autonomousmoves
+#autonomouslife
+#dialog

root/home/nao/data/config.json

@@ -11,7 +11,7 @@
             "Vision":
             {
                 "Enabled": true,
-                "Record" : true,
+                "Record" : false,
                 "BallDetector": {
                     "Enabled": true,
                     "Method": "Cascade",
@@ -22,6 +22,12 @@
                         ]
                     }
                 },
+                "FeatureExtractor": {
+                    "Enabled": false
+                },
+                "RobotDetector": {
+                    "Enabled": true
+                },
                 "Localization":
                 {
                     "Enabled": false,
@@ -43,12 +49,15 @@
             }
         },
         "Strategy": {
-            "Enabled": true
+            "Enabled": true,
+            "Defensive" : false,
+            "FakeKick" : false
         },
         "Behaviour": {
             "Enabled": true,
             "Number" : 2,
-            "Names" : ["NAO 1", "NAO 2", "NAO 3", "NAO 4", "NAO 5", "NAO 6"]
+            "TeamNumber" : 47,
+            "Names" : ["Dino", "Luci", "Tiny Hand", "Lilith", "Morgana", "Unknown", "Localizer"]
         }
     }
 }