Skip to content

Commit 4dd4ad7

Browse files
authored
Merge branch 'main' into add_alternative_async_send
2 parents bbb42d3 + aaef96d commit 4dd4ad7

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

Diff for: exes/operations/inc/details/state_machine_owner_impl.hpp

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#include <cstddef>
4+
35
#include <boost/asio.hpp>
46
#include <tfc/stx/glaze_meta.hpp>
57
#include "state_machine.hpp"
@@ -174,11 +176,19 @@ void state_machine_owner<signal_t, slot_t, sml_t>::leave_emergency() {}
174176
// clang-format off
175177
template <template <typename, typename> typename signal_t, template <typename, typename> typename slot_t, template <typename, typename...> typename sml_t>
176178
// clang-format on
177-
void state_machine_owner<signal_t, slot_t, sml_t>::enter_fault() {}
179+
void state_machine_owner<signal_t, slot_t, sml_t>::enter_fault() {
180+
fault_out_.async_send(true, [this](std::error_code const& err, std::size_t) {
181+
logger_.info("Unable to send fault signal true, error: {}", err.message());
182+
});
183+
}
178184
// clang-format off
179185
template <template <typename, typename> typename signal_t, template <typename, typename> typename slot_t, template <typename, typename...> typename sml_t>
180186
// clang-format on
181-
void state_machine_owner<signal_t, slot_t, sml_t>::leave_fault() {}
187+
void state_machine_owner<signal_t, slot_t, sml_t>::leave_fault() {
188+
fault_out_.async_send(false, [this](std::error_code const& err, std::size_t) {
189+
logger_.info("Unable to send fault signal true, error: {}", err.message());
190+
});
191+
}
182192
// clang-format off
183193
template <template <typename, typename> typename signal_t, template <typename, typename> typename slot_t, template <typename, typename...> typename sml_t>
184194
// clang-format on

Diff for: exes/operations/inc/state_machine_owner.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class state_machine_owner {
111111
bool_signal_t running_{ ctx_, mclient_, "running" };
112112
bool_signal_t stopping_{ ctx_, mclient_, "stopping" };
113113
bool_signal_t cleaning_{ ctx_, mclient_, "cleaning" };
114+
bool_signal_t fault_out_{ ctx_, mclient_, "fault" };
114115
uint_signal_t mode_{ ctx_, mclient_, "mode" };
115116
string_signal_t mode_str_{ ctx_, mclient_, "mode" };
116117
bool_slot_t starting_finished_{ ctx_, mclient_, "starting_finished",

0 commit comments

Comments
 (0)