Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔖 (release): Bump to v1.2.0 #1045

Merged
merged 2 commits into from
Oct 2, 2022
Merged

🔖 (release): Bump to v1.2.0 #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78cbf1f
:bookmark: (release): Bump to v1.2.0
YannLocatelli Sep 26, 2022
512b191
:bug: (supersimon): Move increment before last round check
HPezz Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/os_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0
1 change: 0 additions & 1 deletion libs/ActivityKit/include/activities/SuperSimon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <optional>

#include "Color.h"
#include "Number.h"
#include "RFIDKit.h"
#include "ReinforcerKit.h"
#include "interface/Activity.h"
Expand Down
4 changes: 2 additions & 2 deletions libs/ActivityKit/source/activities/SuperSimon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ void SuperSimon::processCard(const MagicCard &card)
_reinforcerkit.playDefault();
rtos::ThisThread::sleep_for(1s);
_expected_color_index = 0;
++_current_round;

if (_current_round >= _last_round) {
if (_current_round == _last_round) {
_backup_callback(MagicCard::dice_roll);
return;
}

++_current_round;
launchNextRound();
return;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/RobotKit/include/RobotController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class RobotController : public interface::RobotController
auto _serial_number = _serialnumberkit.getSerialNumber();
_service_device_information.setSerialNumber(_serial_number);

auto _os_version = _firmware_update.getCurrentVersion();
auto _os_version = FirmwareVersion {.major = 1, .minor = 2, .revision = 0};
_service_device_information.setOSVersion(_os_version);

auto advertising_data = _ble.getAdvertisingData();
Expand Down
2 changes: 1 addition & 1 deletion libs/RobotKit/tests/RobotController_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class RobotControllerTest : public testing::Test
EXPECT_CALL(mock_mcu, getID).Times(1);
EXPECT_CALL(mbed_mock_gatt, write(_, _, _, _)).Times(1);

EXPECT_CALL(firmware_update, getCurrentVersion).Times(1);
// EXPECT_CALL(firmware_update, getCurrentVersion).Times(1);
EXPECT_CALL(mbed_mock_gatt, write(_, _, _, _)).Times(1);

Sequence set_serial_number_as_ble_device_name;
Expand Down
2 changes: 1 addition & 1 deletion libs/RobotKit/tests/RobotController_test_initializeComponents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TEST_F(RobotControllerTest, initializeComponents)
// TODO: Specify which BLE service and what is expected if necessary
EXPECT_CALL(mbed_mock_gatt, write(_, _, _, _)).Times(1);

EXPECT_CALL(firmware_update, getCurrentVersion).Times(1);
// EXPECT_CALL(firmware_update, getCurrentVersion).Times(1);
EXPECT_CALL(mbed_mock_gatt, write(_, _, _, _)).Times(1);

Sequence set_serial_number_as_ble_device_name;
Expand Down