This commit is contained in:
parent
5cc75d234f
commit
1efab70b36
|
@ -7,7 +7,6 @@
|
|||
#include "CameraParam.h"
|
||||
#include "correct_ultis.h"
|
||||
|
||||
#include "USBProtocol.h"
|
||||
#include "utilsfunc.h"
|
||||
#include "CImageMerge.h"
|
||||
#include "Jpegcompress.h"
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "MemoryInfo.h"
|
||||
#include "SysInforTool.h"
|
||||
#include "USBProtocol.h"
|
||||
#include "StopWatch.h"
|
||||
|
||||
#define BTN_START 0
|
||||
|
@ -31,7 +30,7 @@ Scanner::Scanner(ScannerGlue glue)
|
|||
|
||||
capturer->SetParent(this);
|
||||
capturer->set_image_callback(&have_img_callback);
|
||||
this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
|
||||
//固件版本
|
||||
int version=7010;
|
||||
|
||||
|
@ -66,22 +65,19 @@ Scanner::Scanner(ScannerGlue glue)
|
|||
}
|
||||
};
|
||||
sensor = std::make_shared<Sensor>(sysEvent);
|
||||
this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
|
||||
|
||||
m_keyboard.reset(new huagao::Keyboard(btnevent));
|
||||
m_keyboard->init();
|
||||
this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
|
||||
motorZouzhi.enablePower(true);
|
||||
motorZouzhi.setSpeed(4000);
|
||||
motorCuozhi.setSpeed(3000);
|
||||
motorCuozhi.setDirection(false);
|
||||
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
|
||||
FsmState::setScanner(this);
|
||||
threadRunMessageLoop = std::thread(&Scanner::runMessageLoop, this);
|
||||
Motor::enablePower(true);
|
||||
this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||
|
||||
}
|
||||
|
||||
Scanner::~Scanner()
|
||||
|
@ -222,10 +218,8 @@ void Scanner::runScan()
|
|||
isPaperInit = true;
|
||||
}
|
||||
|
||||
this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||
|
||||
sensor->resetPaperPin();
|
||||
|
||||
this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||
sensor->resetPaperPin();
|
||||
capturer->resetimageremain();
|
||||
capturer->setScanFlag(true);
|
||||
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
#pragma once
|
|
@ -1,7 +1,6 @@
|
|||
#include "UsbScanner.h"
|
||||
#include <turbojpeg.h>
|
||||
#include "JsonConfig.h"
|
||||
#include "USBProtocol.h"
|
||||
#include "logs_out.h"
|
||||
#include "JsonConfig.h"
|
||||
#include "StopWatch.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "utilsfunc.h"
|
||||
#include "correct_ultis.h"
|
||||
#include <errno.h>
|
||||
#include "USBProtocol.h"
|
||||
|
||||
#include "MotorConfig.h"
|
||||
#include <iomanip>
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ typedef struct
|
|||
typedef void (*image_callback)(int element);
|
||||
static std::map<int , sp_COLOR_or_GRAY>mapFradme_SP={
|
||||
{1,{0x08ED1003,0x1ACC1002,CON(G34D,231027)}},//40 ppm
|
||||
{2,{0x06DB1003,0x14A01002,CON(G3ZY,231102)}},//50 ppm
|
||||
{2,{0x06DB1003,0x14A01002,CON(G3ZY,231118)}},//50 ppm
|
||||
{3,{0x05591003,0x100E1002,CON(G36D,231027)}},//60 ppm
|
||||
{4,{0x04421003,0x0CD11002,CON(G37D,231027)}},//70 ppm
|
||||
{5,{0x036c1003,0x0A421002,CON(G38D,231027)}},//80 ppm
|
||||
|
|
Loading…
Reference in New Issue