Skip to content

Commit e370cdf

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 2183e9d + 998b39f commit e370cdf

File tree

9 files changed

+196
-370
lines changed

9 files changed

+196
-370
lines changed

src/controller/include/goliath/controller/commands/dance_command.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ namespace goliath::commands {
3434
void moveWingOverTime(const std::chrono::milliseconds &duration, servo::WingController &wingController,
3535
std::vector<servo::WingCommand> commands);
3636
motor_controller::MotorId motorHandleToId(handles::HandleMap &handles, size_t handle);
37+
38+
void stand(handles::HandleMap &handles);
3739
};
3840
}

src/controller/include/goliath/controller/commands/line_dance_command.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ namespace goliath::commands {
4848
/**
4949
* @brief Used to calculate the running BPM
5050
*/
51-
std::vector<double> history;
51+
std::deque<double> history;
52+
53+
std::atomic<bool> hasBeat;
5254

5355
/**
5456
* @brief Running BPM

0 commit comments

Comments
 (0)