Skip to content

Commit 4c13a58

Browse files
committed
Update to bazel 5.4.1
Update deps while we're at it
1 parent fcbb225 commit 4c13a58

File tree

6 files changed

+26
-12
lines changed

6 files changed

+26
-12
lines changed

WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
workspace(name = "com_github_mjbots_power_dist")
1818

19-
BAZEL_VERSION = "4.0.0"
20-
BAZEL_VERSION_SHA = "7bee349a626281fc8b8d04a7a0b0358492712377400ab12533aeb39c2eb2b901"
19+
BAZEL_VERSION = "5.4.1"
20+
BAZEL_VERSION_SHA = "5d90515f84b5ee1fd6ec22ee9e83103e77ed1a907ee5eec198fef3a5b45abf13"
2121

2222
load("//tools/workspace:default.bzl", "add_default_repositories")
2323

fw/fdcan_micro_server.h

+15-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ namespace fw {
2222

2323
class FDCanMicroServer : public mjlib::multiplex::MicroDatagramServer {
2424
public:
25+
// Fields in Header::flags
26+
static constexpr uint32_t kBrsFlag = 0x01;
27+
static constexpr uint32_t kFdcanFlag = 0x02;
28+
2529
FDCanMicroServer(FDCan* can) : fdcan_(can) {}
2630

2731
void AsyncRead(Header* header,
@@ -35,19 +39,28 @@ class FDCanMicroServer : public mjlib::multiplex::MicroDatagramServer {
3539

3640
void AsyncWrite(const Header& header,
3741
const std::string_view& data,
42+
const Header& query_header,
3843
const mjlib::micro::SizeCallback& callback) override {
3944
const auto actual_dlc = RoundUpDlc(data.size());
4045
const uint32_t id =
4146
((header.source & 0xff) << 8) | (header.destination & 0xff);
4247

48+
FDCan::SendOptions send_options;
49+
send_options.bitrate_switch =
50+
(query_header.flags & kBrsFlag) ?
51+
FDCan::Override::kRequire : FDCan::Override::kDisable;
52+
send_options.fdcan_frame =
53+
((query_header.flags & kFdcanFlag) ==0 && data.size() <= 8) ?
54+
FDCan::Override::kDisable : FDCan::Override::kRequire;
55+
4356
if (actual_dlc == data.size()) {
44-
fdcan_->Send(id, data, {});
57+
fdcan_->Send(id, data, send_options);
4558
} else {
4659
std::memcpy(buf_, data.data(), data.size());
4760
for (size_t i = data.size(); i < actual_dlc; i++) {
4861
buf_[i] = 0x50;
4962
}
50-
fdcan_->Send(id, std::string_view(buf_, actual_dlc), {});
63+
fdcan_->Send(id, std::string_view(buf_, actual_dlc), send_options);
5164
}
5265

5366
callback(mjlib::micro::error_code(), data.size());

fw/power_dist.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -998,11 +998,12 @@ class PowerDist : public mjlib::multiplex::MicroServer::Server {
998998
micro::AsyncStream* serial_ = multiplex_protocol_.MakeTunnel(1);
999999
micro::AsyncExclusive<micro::AsyncWriteStream> write_stream_{serial_};
10001000
micro::CommandManager command_manager_{&pool_, serial_, &write_stream_};
1001+
char micro_output_buffer[2048] = {};
10011002
micro::TelemetryManager telemetry_manager_{
1002-
&pool_, &command_manager_, &write_stream_};
1003+
&pool_, &command_manager_, &write_stream_, micro_output_buffer};
10031004
fw::Stm32G4Flash flash_interface_;
10041005
micro::PersistentConfig persistent_config_{
1005-
pool_, command_manager_, flash_interface_};
1006+
pool_, command_manager_, flash_interface_, micro_output_buffer};
10061007
fw::Uuid uuid_{persistent_config_};
10071008
fw::GitInfo git_info_;
10081009
fw::FirmwareInfo firmware_info_{pool_, telemetry_manager_, 0, 0};

tools/workspace/bazel_deps/repository.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ def bazel_deps_repository(name):
2020
github_archive(
2121
name = name,
2222
repo = "mjbots/bazel_deps",
23-
commit = "4a2b308a03ccd20513c1aa7e413debbc0b8366e8",
24-
sha256 = "2304d22ac96bb3ab3a38821e018d7768d7f51d65f84103b94569513c3d66f775",
23+
commit = "c1c112d26ad879b8ddf79939029ec209a905d455",
24+
sha256 = "d376e3b76ceace38280c81f7c787a68ccc09437b6024dd31238a90cc3c3b4203",
2525
)

tools/workspace/mjlib/repository.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ def mjlib_repository(name):
2020
github_archive(
2121
name = name,
2222
repo = "mjbots/mjlib",
23-
commit = "80887a520d866a003830501b86f318f5eff4a5c7",
24-
sha256 = "e4031bd646ad33e8b29469de4eddb56e883b190e16f21f3dbc9e78a73eb8b142",
23+
commit = "9ce0aeeab9dad44da79515864854eff74a9e46b1",
24+
sha256 = "f0007a5934bdfb7dead58fcf4b52d67d6166555379ae7505185ab9af5b22c7f2",
2525
)

tools/workspace/rules_mbed/repository.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ def rules_mbed_repository():
2020
github_archive(
2121
name = "com_github_mjbots_rules_mbed",
2222
repo = "mjbots/rules_mbed",
23-
commit = "de613d7f8387a4d205be3b5f1e9d2ea76dc6f44b",
24-
sha256 = "43ad7bd1c25dc056ba3fdc1bf33948b8cac91974aa95293a17b6d65b67ec70fc",
23+
commit = "c0d35752d4d17cd00b7f5b21b5c55732e48e6562",
24+
sha256 = "87f0b4bbe639e6b2e621862ff06fb9d3a29776e99e844dd6abe911765f7ea1de",
2525
)

0 commit comments

Comments
 (0)