Skip to content

Commit ddcee8d

Browse files
Fixed script.repeat() and gamepad events
1 parent 30ce197 commit ddcee8d

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

trikNetwork/include/trikNetwork/gamepadInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public slots:
6060

6161
/// Emitted when user tilts his Android device with "wheel" turned on.
6262
/// @param percent - percent of a tilt angle.
63-
void wheel(int percent);
63+
void wheelEvent(int percent);
6464

6565
/// Emitted when user pushes or moves his finger on a pad.
6666
/// @param pad - id of a pad on which the event occurs.

trikNetwork/src/gamepad.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,24 @@ void Gamepad::init(int port)
109109
void Gamepad::onPadUp(int padId)
110110
{
111111
mPads[padId].isPressed = false;
112+
113+
emit padUp(padId);
112114
}
113115

114116
void Gamepad::onWheel(int percent)
115117
{
116118
mWheelPercent = percent;
119+
120+
emit wheelEvent(percent);
117121
}
118122

119123
void Gamepad::onPad(int padId, int x, int y)
120124
{
121125
mPads[padId].isPressed = true;
122126
mPads[padId].x = x;
123127
mPads[padId].y = y;
128+
129+
emit pad(padId, x, y);
124130
}
125131

126132
void Gamepad::onButton(int button, int pressed)
@@ -137,6 +143,8 @@ void Gamepad::onButton(int button, int pressed)
137143
}
138144

139145
mButtonStateClearTimers[button]->start();
146+
147+
emit Gamepad::button(button, pressed);
140148
}
141149

142150
void Gamepad::onButtonStateClearTimerTimeout()

trikScriptRunner/system.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ if (!String.prototype.format) {
4444
};
4545
}
4646

47-
brick.repeat = function(mscs, f) {
48-
var timer = brick.timer(mscs);
47+
script.repeat = function(mscs, f) {
48+
var timer = script.timer(mscs);
4949
timer.timeout.connect(f);
5050
}
5151

0 commit comments

Comments
 (0)