Browse Source

update

change_pipette_api
zhaohe 2 years ago
parent
commit
09f7b267d2
  1. 2
      api/zi_code_scaner.hpp
  2. 2
      protocol_parser.cpp
  3. 2
      protocol_proxy.cpp
  4. 3
      protocol_proxy.hpp
  5. 2
      zmodule_device_manager.cpp
  6. 2
      zmodule_device_manager.hpp
  7. 2
      zmodule_device_script_cmder_paser.cpp

2
api/zi_code_scaner.hpp

@ -7,10 +7,12 @@
namespace iflytop {
using namespace std;
#if 0
class ZICodeScaner {
public:
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
};
#endif
} // namespace iflytop

2
protocol_parser.cpp

@ -257,11 +257,11 @@ void ZIProtocolParser::onRceivePacket(zcr_cmd_header_t* rxcmd, uint8_t* data, in
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
#endif
PROCESS_PACKET_00(kcode_scaner_start_scan, ZICodeScaner, code_scaner_start_scan);
PROCESS_PACKET_00(kcode_scaner_stop_scan, ZICodeScaner, code_scaner_stop_scan);
PROCESS_BUF_REQUEST_1(kcode_scaner_read_scaner_result, ZICodeScaner, code_scaner_read_scaner_result);
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

2
protocol_proxy.cpp

@ -193,7 +193,6 @@ int32_t ZIProtocolProxy::xymotor_calculated_pos_by_move_to_zero() { PROXY_IMPL_0
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
#endif
int32_t ZIProtocolProxy::code_scaner_start_scan() { PROXY_IMPL_00(kcode_scaner_start_scan, OVERTIME); }
int32_t ZIProtocolProxy::code_scaner_stop_scan() { PROXY_IMPL_00(kcode_scaner_stop_scan, OVERTIME); }
@ -203,6 +202,7 @@ int32_t ZIProtocolProxy::code_scaner_read_scaner_result(int32_t para0, uint8_t *
int32_t ecode = m_cancmder->sendCmdAndReceiveBuf(kmodule_read_raw, m_id, param, 1, data, len, 100);
return ecode;
}
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

3
protocol_proxy.hpp

@ -9,7 +9,6 @@ namespace iflytop {
class ZIProtocolProxy : public ZIMotor, //
public ZIXYMotor, //
public ZIModule,
public ZICodeScaner,
public ZIPipetteCtrlModule,
public ZIA8000OpticalModule {
private:
@ -149,11 +148,11 @@ class ZIProtocolProxy : public ZIMotor, //
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
#endif
virtual int32_t code_scaner_start_scan() override;
virtual int32_t code_scaner_stop_scan() override;
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) override;
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

2
zmodule_device_manager.cpp

@ -138,10 +138,10 @@ int32_t ZModuleDeviceManager::xymotor_calculated_pos_by_move_to_zero(uint16_t id
virtual int32_t code_scaner_start_scan(uint16_t id);
virtual int32_t code_scaner_stop_scan(uint16_t id);
virtual int32_t code_scaner_read_scaner_result(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len);
#endif
int32_t ZModuleDeviceManager::code_scaner_start_scan(uint16_t id) { PROXY_IMPL(ZICodeScaner, code_scaner_start_scan); }
int32_t ZModuleDeviceManager::code_scaner_stop_scan(uint16_t id) { PROXY_IMPL(ZICodeScaner, code_scaner_stop_scan); }
int32_t ZModuleDeviceManager::code_scaner_read_scaner_result(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len) { PROXY_IMPL(ZICodeScaner, code_scaner_read_scaner_result, startadd, data, len); }
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

2
zmodule_device_manager.hpp

@ -184,11 +184,11 @@ class ZModuleDeviceManager {
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
#endif
virtual int32_t code_scaner_start_scan(uint16_t id);
virtual int32_t code_scaner_stop_scan(uint16_t id);
virtual int32_t code_scaner_read_scaner_result(uint16_t id, int32_t startadd, uint8_t *data, int32_t *len);
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

2
zmodule_device_script_cmder_paser.cpp

@ -207,7 +207,6 @@ void ZModuleDeviceScriptCmderPaser::regfn() {
virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
#endif
PROCESS_PACKET_10(code_scaner_start_scan, "(mid)");
PROCESS_PACKET_10(code_scaner_stop_scan, "(mid)");
@ -220,6 +219,7 @@ void ZModuleDeviceScriptCmderPaser::regfn() {
ack->ecode = m_deviceManager->module_read_raw(atoi(paraV[0]), atoi(paraV[1]), ack->rawdata, &ack->rawlen);
ack->acktype = ICmdParserACK::kAckType_buf;
});
#endif
#if 0
virtual int32_t pipette_ctrl_init_device() { return err::koperation_not_support; };

Loading…
Cancel
Save