diff --git a/components/maidsite_desk/maidsite_desk.cpp b/components/maidsite_desk/maidsite_desk.cpp index 756d41b..7e15db7 100644 --- a/components/maidsite_desk/maidsite_desk.cpp +++ b/components/maidsite_desk/maidsite_desk.cpp @@ -1,23 +1,5 @@ #include "maidsite_desk.h" -#define BUTTON_UNIT "unit" -#define BUTTON_STEP_UP "step_up" -#define BUTTON_STEP_DOWN "step_down" -#define BUTTON_STOP "stop" -#define BUTTON_GOTO_MAX "goto_max" -#define BUTTON_GOTO_MIN "goto_min" -#define BUTTON_GOTO_M1 "goto_m1" -#define BUTTON_GOTO_M2 "goto_m2" -#define BUTTON_GOTO_M3 "goto_m3" -#define BUTTON_GOTO_M4 "goto_m4" -#define BUTTON_SAVE_M1 "save_m1" -#define BUTTON_SAVE_M2 "save_m2" -#define BUTTON_SAVE_M3 "save_m3" -#define BUTTON_SAVE_M4 "save_m4" - -#define NUMBER_HEIGHT_ABS "height_abs" -#define NUMBER_HEIGHT_PCT "height_pct" - namespace esphome { diff --git a/components/maidsite_desk/maidsite_desk.h b/components/maidsite_desk/maidsite_desk.h index fa164dc..66b7746 100644 --- a/components/maidsite_desk/maidsite_desk.h +++ b/components/maidsite_desk/maidsite_desk.h @@ -64,11 +64,21 @@ namespace esphome void button_press_action(button::Button* object); void number_control(number::Number* object, float value); + void request_physical_limits(); void request_limits(); void request_settings(); void request_move_to(); + void step_up(); + void step_down(); + void stop(); + void goto_height(float height); + void goto_min_position(); + void goto_max_position(); + void goto_mem_position(int pos); + void save_mem_position(int pos); + protected: void decode_response(std::vector message); void send_simple_command(unsigned char cmd); @@ -76,15 +86,6 @@ namespace esphome float byte2float(int high, int low); void log_uart_hex(std::string prefix, std::vector bytes, uint8_t separator); - void step_up(); - void step_down(); - void stop(); - void goto_mem_position(int pos); - void save_mem_position(int pos); - void goto_height(float height); - void goto_max_position(); - void goto_min_position(); - private: std::vector response_message_; std::vector request_message_;