...
This commit is contained in:
@@ -481,7 +481,7 @@ public:
|
|||||||
|
|
||||||
/* stop moving function */
|
/* stop moving function */
|
||||||
|
|
||||||
_stopMovingFunc = [hardware, cb_sptr, this]() {
|
_stopMovingFunc = [send_to_hardware, hardware, cb_sptr, this]() {
|
||||||
typename HARDWARE_T::hardware_state_t hw_state;
|
typename HARDWARE_T::hardware_state_t hw_state;
|
||||||
hw_state.movementState == HARDWARE_T::hardware_movement_state_t::HW_MOVE_STOPPING;
|
hw_state.movementState == HARDWARE_T::hardware_movement_state_t::HW_MOVE_STOPPING;
|
||||||
|
|
||||||
|
|||||||
@@ -1011,35 +1011,35 @@ protected:
|
|||||||
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_INIT_STR)) {
|
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_INIT_STR)) {
|
||||||
m_err = mount_ptr->initMount();
|
m_err = mount_ptr->initMount();
|
||||||
if (m_err) {
|
if (m_err) {
|
||||||
err = mcc_deduce_error_code(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_INIT);
|
err = mcc_deduced_err(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_INIT);
|
||||||
} else {
|
} else {
|
||||||
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_INIT_STR);
|
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_INIT_STR);
|
||||||
}
|
}
|
||||||
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_STOP_STR)) {
|
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_STOP_STR)) {
|
||||||
m_err = mount_ptr->stopMount();
|
m_err = mount_ptr->stopMount();
|
||||||
if (m_err) {
|
if (m_err) {
|
||||||
err = mcc_deduce_error_code(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_STOP);
|
err = mcc_deduced_err(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_STOP);
|
||||||
} else {
|
} else {
|
||||||
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_STOP_STR);
|
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_STOP_STR);
|
||||||
}
|
}
|
||||||
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_SLEW_STR)) {
|
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_SLEW_STR)) {
|
||||||
m_err = mount_ptr->slewToTarget(false);
|
m_err = mount_ptr->slewToTarget(false);
|
||||||
if (m_err) {
|
if (m_err) {
|
||||||
err = mcc_deduce_error_code(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_SLEW);
|
err = mcc_deduced_err(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_SLEW);
|
||||||
} else {
|
} else {
|
||||||
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_SLEW_STR);
|
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_SLEW_STR);
|
||||||
}
|
}
|
||||||
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_MOVE_STR)) {
|
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_MOVE_STR)) {
|
||||||
m_err = mount_ptr->slewToTarget(true);
|
m_err = mount_ptr->slewToTarget(true);
|
||||||
if (m_err) {
|
if (m_err) {
|
||||||
err = mcc_deduce_error_code(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_MOVE);
|
err = mcc_deduced_err(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_MOVE);
|
||||||
} else {
|
} else {
|
||||||
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_MOVE_STR);
|
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_MOVE_STR);
|
||||||
}
|
}
|
||||||
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_TRACK_STR)) {
|
} else if (input_msg.withKey(MCC_COMMPROTO_KEYWORD_TRACK_STR)) {
|
||||||
m_err = mount_ptr->trackTarget();
|
m_err = mount_ptr->trackTarget();
|
||||||
if (m_err) {
|
if (m_err) {
|
||||||
err = mcc_deduce_error_code(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_TRACK);
|
err = mcc_deduced_err(m_err, MccGenericMountNetworkServerErrorCode::ERROR_MOUNT_TRACK);
|
||||||
} else {
|
} else {
|
||||||
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_TRACK_STR);
|
output_msg.construct(MCC_COMMPROTO_KEYWORD_SERVER_ACK_STR, MCC_COMMPROTO_KEYWORD_TRACK_STR);
|
||||||
}
|
}
|
||||||
@@ -1074,7 +1074,7 @@ protected:
|
|||||||
impl::MccSkyPoint sp;
|
impl::MccSkyPoint sp;
|
||||||
|
|
||||||
auto sz = input_msg.paramSize();
|
auto sz = input_msg.paramSize();
|
||||||
if (sz) { // set or get operation
|
if (sz) { // set or get operation
|
||||||
auto vp = input_msg.template paramValue<impl::MccCoordPairKind>(0); // is it get operation?
|
auto vp = input_msg.template paramValue<impl::MccCoordPairKind>(0); // is it get operation?
|
||||||
if (vp) { // coordinate pair kind is given, it is get operation
|
if (vp) { // coordinate pair kind is given, it is get operation
|
||||||
pair_kind = vp.value();
|
pair_kind = vp.value();
|
||||||
|
|||||||
Reference in New Issue
Block a user