Revision f150aab5

View differences:

.clang-format
1
---
2
BasedOnStyle:  Google
3
ColumnLimit:    125
4
MaxEmptyLinesToKeep: 1
5
SortIncludes: false
6

  
7
Standard:        Auto
8
IndentWidth:     3
9
TabWidth:        3
10
UseTab:          ForIndentation
11
AccessModifierOffset: -3
12
ConstructorInitializerIndentWidth: 3
13
NamespaceIndentation: None
14
ContinuationIndentWidth: 3
15
IndentCaseLabels: true
16
IndentFunctionDeclarationAfterType: false
17

  
18
AlignEscapedNewlinesLeft: false
19
AlignTrailingComments: true
20

  
21
AllowAllParametersOfDeclarationOnNextLine: false
22
ExperimentalAutoDetectBinPacking: false
23
ObjCSpaceBeforeProtocolList: true
24
Cpp11BracedListStyle: false
25

  
26
AllowShortBlocksOnASingleLine: true
27
AllowShortIfStatementsOnASingleLine: false
28
AllowShortLoopsOnASingleLine: false
29
AllowShortFunctionsOnASingleLine: None
30
AllowShortCaseLabelsOnASingleLine: false
31

  
32
AlwaysBreakTemplateDeclarations: true
33
AlwaysBreakBeforeMultilineStrings: false
34
BreakBeforeBinaryOperators: false
35
BreakBeforeTernaryOperators: false
36
BreakConstructorInitializersBeforeComma: true
37

  
38
BinPackParameters: true
39
ConstructorInitializerAllOnOneLineOrOnePerLine: true
40
DerivePointerBinding: false
41
PointerBindsToType: true
42

  
43
PenaltyExcessCharacter: 50
44
PenaltyBreakBeforeFirstCallParameter: 30
45
PenaltyBreakComment: 1000
46
PenaltyBreakFirstLessLess: 10
47
PenaltyBreakString: 100
48
PenaltyReturnTypeOnItsOwnLine: 50
49

  
50
SpacesBeforeTrailingComments: 1
51
SpacesInParentheses: false
52
SpacesInAngles:  false
53
SpaceInEmptyParentheses: false
54
SpacesInCStyleCastParentheses: false
55
SpaceAfterCStyleCast: false
56
SpaceAfterControlStatementKeyword: true
57
SpaceBeforeAssignmentOperators: true
58

  
59
# Configure each individual brace in BraceWrapping
60
BreakBeforeBraces: Custom
61

  
62
# Control of individual brace wrapping cases
63
BraceWrapping:
64
    AfterCaseLabel: true
65
    AfterClass: false
66
    AfterControlStatement: false
67
    AfterEnum: true
68
    AfterFunction: false
69
    AfterNamespace: false
70
    AfterStruct: false
71
    AfterUnion: false
72
    BeforeCatch: true
73
    BeforeElse: true
74
    IndentBraces: false
75
...
client/cpp/examples/random_gaze/main.cpp
1 1
/*
2
* This file is part of hlrc_client
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc_server
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc_client
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc_server
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#include "RobotController.h"
30 30
#include "RobotGaze.h"
31 31
#include <unistd.h>
32 32

  
33
float rand_float(float min, float max){
34
    float f = (float)rand() / RAND_MAX;
35
    return min + f * (max - min);
33
float rand_float(float min, float max) {
34
	float f = (float)rand() / RAND_MAX;
35
	return min + f * (max - min);
36 36
}
37 37

  
38
int main (int argc, char **argv){
39
    if (argc != 3){
40
        printf("usage: %s <middleware> <robot scope>\n", argv[0]);
41
        printf("       <middleware> is either ROS or RSB\n");
42
	printf("       <robot scope> e.g. /flobi or /icub\n\n");
43
        exit(EXIT_FAILURE);
44
    }
38
int main(int argc, char** argv) {
39
	if (argc != 3) {
40
		printf("usage: %s <middleware> <robot scope>\n", argv[0]);
41
		printf("       <middleware> is either ROS or RSB\n");
42
		printf("       <robot scope> e.g. /flobi or /icub\n\n");
43
		exit(EXIT_FAILURE);
44
	}
45 45

  
46
    RobotController *robot_controller = new RobotController(argv[1], argv[2]); //"/flobi");
47
    //robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::NEUTRAL));
48
    RobotGaze gaze;
46
	RobotController* robot_controller = new RobotController(argv[1], argv[2]); //"/flobi");
47
	// robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::NEUTRAL));
48
	RobotGaze gaze;
49 49

  
50
    int count=0;
50
	int count = 0;
51 51

  
52
    while(1){
53
        if (count++ >= 50){
54
			//a new target every second:
55
			gaze.pan  = rand_float(-20.0, 20.0);
52
	while (1) {
53
		if (count++ >= 50) {
54
			// a new target every second:
55
			gaze.pan = rand_float(-20.0, 20.0);
56 56
			gaze.tilt = rand_float(-20.0, 20.0);
57 57
			gaze.roll = 0.0;
58 58
			gaze.vergence = 0.0;
59 59

  
60
            //absolute mode
61
            gaze.gaze_type      = RobotGaze::ABSOLUTE;
62
            gaze.gaze_timestamp = RobotTimestamp::now();
60
			// absolute mode
61
			gaze.gaze_type = RobotGaze::ABSOLUTE;
62
			gaze.gaze_timestamp = RobotTimestamp::now();
63 63

  
64
            //robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::ANGRY));
64
			// robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::ANGRY));
65 65

  
66
			//reset counter
66
			// reset counter
67 67
			count = 0;
68 68
		}
69 69

  
70
        robot_controller->set_gaze_target(gaze);
71
		usleep(1000/50 * 1000 );
72
    }	
73

  
70
		robot_controller->set_gaze_target(gaze);
71
		usleep(1000 / 50 * 1000);
72
	}
74 73
}
client/cpp/examples/speech_test/main.cpp
1 1
/*
2
* This file is part of hlrc_client
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc_server
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc_client
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc_server
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#include "RobotController.h"
30 30
#include <unistd.h>
31 31

  
32 32
#define BLOCKING true
33 33

  
34
int main (int argc, char **argv){
35
    RobotController *robot_controller = new RobotController("RSB", "/flobi");
34
int main(int argc, char** argv) {
35
	RobotController* robot_controller = new RobotController("RSB", "/flobi");
36 36

  
37
    int count=0;
37
	int count = 0;
38 38

  
39
    printf("> speech test starting.\n");
40

  
41
    robot_controller->set_speak("i will start counting now.\n", BLOCKING);
42
    while(1){
43
        std::string text = std::to_string(count++);
44
        printf("> saying '%s'\n",text.c_str());
45
        robot_controller->set_speak(text, BLOCKING);
46
        sleep(1);
47
    }
39
	printf("> speech test starting.\n");
48 40

  
41
	robot_controller->set_speak("i will start counting now.\n", BLOCKING);
42
	while (1) {
43
		std::string text = std::to_string(count++);
44
		printf("> saying '%s'\n", text.c_str());
45
		robot_controller->set_speak(text, BLOCKING);
46
		sleep(1);
47
	}
49 48
}
client/cpp/include/Middleware.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28
#pragma once
29 29

  
30 30
//*********************************************************************************
31
//allow direct synthesis using inprotk calls. by default this is disabled
32
//until inprotk gets to an usable state (e.g. the completion flag has to work)
31
// allow direct synthesis using inprotk calls. by default this is disabled
32
// until inprotk gets to an usable state (e.g. the completion flag has to work)
33 33
#define USE_INPROTK_SYNTHESIS 0
34 34
//*********************************************************************************
35 35

  
......
39 39
#include "RobotGaze.h"
40 40
#include "RobotMouth.h"
41 41

  
42
class Middleware{
42
class Middleware {
43 43
public:
44
    Middleware(std::string scope);
44
	Middleware(std::string scope);
45 45

  
46
    void set_default_emotion(RobotEmotion e, bool blocking);
47
    void set_current_emotion(RobotEmotion e, bool blocking);
48
    void set_gaze_target(RobotGaze target, bool blocking);
49
    void set_lookat_target(float x, float y, float z, const std::string frame_id,
50
                           bool blocking, float roll);
51
    void set_mouth_target(RobotMouth target, bool blocking);
52
    void set_head_animation(RobotHeadAnimation a, bool blocking);
53
    void set_speak(std::string text, bool blocking);
46
	void set_default_emotion(RobotEmotion e, bool blocking);
47
	void set_current_emotion(RobotEmotion e, bool blocking);
48
	void set_gaze_target(RobotGaze target, bool blocking);
49
	void set_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll);
50
	void set_mouth_target(RobotMouth target, bool blocking);
51
	void set_head_animation(RobotHeadAnimation a, bool blocking);
52
	void set_speak(std::string text, bool blocking);
54 53

  
55
    RobotEmotion get_current_emotion();
56
    RobotEmotion get_default_emotion();
57
    RobotGaze get_gaze_target();
54
	RobotEmotion get_current_emotion();
55
	RobotEmotion get_default_emotion();
56
	RobotGaze get_gaze_target();
58 57

  
59 58
protected:
60
    virtual void init() = 0;
61
    virtual void publish_default_emotion(RobotEmotion e, bool blocking) = 0;
62
    virtual void publish_current_emotion(RobotEmotion e, bool blocking) = 0;
63
    virtual void publish_gaze_target(RobotGaze g, bool blocking) = 0;
64
    virtual void publish_lookat_target(float x, float y, float z, const std::string frame_id,
65
                                       bool blocking, float roll) = 0;
66
    virtual void publish_mouth_target(RobotMouth m, bool blocking) = 0;
67
    virtual void publish_head_animation(RobotHeadAnimation a, bool blocking) = 0;
68
    virtual void publish_speech(std::string text, bool blocking) = 0;
59
	virtual void init() = 0;
60
	virtual void publish_default_emotion(RobotEmotion e, bool blocking) = 0;
61
	virtual void publish_current_emotion(RobotEmotion e, bool blocking) = 0;
62
	virtual void publish_gaze_target(RobotGaze g, bool blocking) = 0;
63
	virtual void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll) = 0;
64
	virtual void publish_mouth_target(RobotMouth m, bool blocking) = 0;
65
	virtual void publish_head_animation(RobotHeadAnimation a, bool blocking) = 0;
66
	virtual void publish_speech(std::string text, bool blocking) = 0;
69 67

  
70
    std::string base_scope;
68
	std::string base_scope;
71 69

  
72 70
private:
73
    RobotEmotion defaultEmotion;
74
    RobotEmotion currentEmotion;
71
	RobotEmotion defaultEmotion;
72
	RobotEmotion currentEmotion;
75 73

  
76
    RobotGaze gazeTarget;
77
    RobotMouth mouthTarget;
74
	RobotGaze gazeTarget;
75
	RobotMouth mouthTarget;
78 76

  
79
    RobotHeadAnimation headAnimation;
77
	RobotHeadAnimation headAnimation;
80 78
};
81

  
82

  
client/cpp/include/MiddlewareROS.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the con