lmh188
/
huago-corrcet_tools
mirror of http://192.168.1.51:8099/lmh188/huago-corrcet_-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加reboot loader功能

This commit is contained in:
lovelyyoung 2021-12-30 13:55:29 +08:00
parent c94029abf4
commit 21b4849332
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HuaGoCorrect/A4.cpp
View File

@ -183,7 +183,9 @@ void CA4::OnBnClickedBtnReboot()
{ {
auto parent = (CHuaGoCorrectDlg*)GetParent(); auto parent = (CHuaGoCorrectDlg*)GetParent();
if (parent->m_drv.get() && parent->m_drv->IsConnected()) { if (parent->m_drv.get() && parent->m_drv->IsConnected()) {
parent->m_drv->Reboot();
bool ret= ((CButton*)GetDlgItem(IDC_CKBLOADER))->GetCheck();
parent->m_drv->Reboot(ret);
} }
} }

BIN
HuaGoCorrect/HuaGoCorrect.rc
View File

Binary file not shown.

2
HuaGoCorrect/IScanner.h
View File

@ -20,7 +20,7 @@ public:
virtual std::string GetKernelVersion() =0; virtual std::string GetKernelVersion() =0;
virtual void SetRatio(int tyepe, int ration) = 0; virtual void SetRatio(int tyepe, int ration) = 0;
virtual void GetRatio(int type, int& ratio) = 0; virtual void GetRatio(int type, int& ratio) = 0;
virtual void Reboot() = 0; virtual void Reboot(bool loader=false) = 0;
virtual void PowerOff() = 0; virtual void PowerOff() = 0;
virtual bool is_scan() = 0; virtual bool is_scan() = 0;
virtual bool Get_Scanner_PaperOn() = 0; virtual bool Get_Scanner_PaperOn() = 0;

BIN
HuaGoCorrect/Resource.h
View File

Binary file not shown.

4
HuaGoCorrect/gscan3399.cpp
View File

@ -207,9 +207,9 @@ void gscan3399::GetRatio(int type, int& ratio)
ratio = scanner_read_reg(m_usb, type == 0 ? SR_GET_H_RATIO : SR_GET_V_RATIO); ratio = scanner_read_reg(m_usb, type == 0 ? SR_GET_H_RATIO : SR_GET_V_RATIO);
} }
void gscan3399::Reboot() void gscan3399::Reboot(bool loader)
{ {
scanner_write_reg(m_usb, SR_REBOOT, 0); scanner_write_reg(m_usb, SR_REBOOT, loader?1:0);
} }
void gscan3399::PowerOff() void gscan3399::PowerOff()

2
HuaGoCorrect/gscan3399.h
View File

@ -21,7 +21,7 @@ public:
virtual std::string GetMbVersion(); virtual std::string GetMbVersion();
virtual void SetRatio(int tyepe, int ration); virtual void SetRatio(int tyepe, int ration);
virtual void GetRatio(int type, int& ratio); virtual void GetRatio(int type, int& ratio);
virtual void Reboot(); virtual void Reboot(bool loader=false);
virtual void PowerOff(); virtual void PowerOff();
virtual bool is_scan(); virtual bool is_scan();
virtual bool Get_Scanner_PaperOn(); virtual bool Get_Scanner_PaperOn();

4
HuaGoCorrect/gscn_drv.cpp
View File

@ -759,9 +759,9 @@ void GScn_Drv::GetRatio(int type, int& ratio)
ratio = cmd.u32_Data; ratio = cmd.u32_Data;
} }
void GScn_Drv::Reboot() void GScn_Drv::Reboot(bool loader)
{ {
USBCB cmd = { REBOOT,0,0 }; USBCB cmd = { REBOOT,loader?1:0,0 };
m_usb->write_bulk(&cmd, sizeof(cmd)); m_usb->write_bulk(&cmd, sizeof(cmd));
} }

2
HuaGoCorrect/gscn_drv.h
View File

@ -32,7 +32,7 @@ public:
virtual std::string GetKernelVersion(); virtual std::string GetKernelVersion();
virtual void SetRatio(int tyepe, int ration); virtual void SetRatio(int tyepe, int ration);
virtual void GetRatio(int type, int& ratio); virtual void GetRatio(int type, int& ratio);
virtual void Reboot(); virtual void Reboot(bool loader=false);
virtual void PowerOff() {}; virtual void PowerOff() {};
virtual bool is_scan()override; virtual bool is_scan()override;
virtual bool Get_Scanner_PaperOn()override; virtual bool Get_Scanner_PaperOn()override;