diff --git a/ImageStiich.cpp b/ImageStiich.cpp deleted file mode 100644 index 2189521..0000000 --- a/ImageStiich.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// #include "ImageStitch.h" -// #include -// using namespace cv; - -// ImageStitch::ImageStitch(int pixtype, int width, int heigth) : m_pixtype(pixtype), -// m_width(width), -// m_height(heigth) -// { -// } - -// ImageStitch::~ImageStitch() -// { -// } - -// cv::Mat ImageStitch::GetStitchImage(cv::Mat mat) -// { -// //cv::imwrite("orgmat.jpg",mat); -// cv::Mat dst; -// cv::Mat ch_mats[3]; -// int dstwidth, dstheight; -// dstwidth = m_width * 3; -// dstheight = m_height / 3; -// if (m_pixtype == IMAGE_COLOR) -// { -// //mat = cv::Mat(m_height / 3, m_width * 9, CV_8UC1, imgdata); -// dst = cv::Mat(dstheight, dstwidth, CV_8UC3); -// cv::Mat mat1 = mat(cv::Rect(m_width * 3 * 1, 0, m_width * 3, m_height / 3)); //R 对应红通道 -// cv::Mat mat2 = mat(cv::Rect(m_width * 3 * 2, 0, m_width * 3, m_height / 3)); //G 对应绿通道 -// cv::Mat mat3 = mat(cv::Rect(m_width * 3 * 0, 0, m_width * 3, m_height / 3)); //B 对应蓝通道 -// ch_mats[0] = mat1; -// ch_mats[1] = mat2; -// ch_mats[2] = mat3; -// cv::merge(ch_mats, 3, dst); -// for (int i = 0; i < 3; i++) -// ch_mats[i].release(); -// LOG("merge mats end \n"); -// return dst.clone(); -// } -// else -// { //gray -// return mat; -// } -// } \ No newline at end of file diff --git a/ImageStitch.h b/ImageStitch.h deleted file mode 100644 index 9608b45..0000000 --- a/ImageStitch.h +++ /dev/null @@ -1,19 +0,0 @@ -// #pragma once -// #include -// #include "scanservices_utils.h" - -// class ImageStitch -// { -// private: -// /* data */ -// public: -// ImageStitch(int pixtype,int width,int heigth); -// ~ImageStitch(); -// cv::Mat GetStitchImage(cv::Mat mat); -// private: -// int m_pixtype; -// int m_width; -// int m_height; -// cv::Mat m_mat; -// }; - diff --git a/MultiFrameCapture.cpp b/MultiFrameCapture.cpp index 7c8d62b..0ba0941 100644 --- a/MultiFrameCapture.cpp +++ b/MultiFrameCapture.cpp @@ -11,9 +11,7 @@ #include "utilsfunc.h" #include "CImageMerge.h" #include "Jpegcompress.h" -#include "CSizedetect.h" #include "ThreadPool.h" - #include "HCamDevice.h" const int vsp_A = 45; diff --git a/README.md b/README.md deleted file mode 100644 index 103d0cb..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -2023-07-17创建 \ No newline at end of file diff --git a/main.cpp b/main.cpp index c0e93a5..16e3af2 100644 --- a/main.cpp +++ b/main.cpp @@ -33,7 +33,6 @@ using json = nlohmann::json; using namespace std; -// shared_ptr m_usb; shared_ptr m_scanner; ofstream updatePkg; static unsigned int total_length = 0; diff --git a/reload.sh b/reload.sh deleted file mode 100644 index d803a3a..0000000 --- a/reload.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# # 有无纸传感器 -# echo 225 > /sys/class/gpio/export -# echo in > /sys/class/gpio/gpio225/direction - -# #开盖传感器 -# echo 189 > /sys/class/gpio/export -# echo in > /sys/class/gpio/gpio189/direction - - -#开盖传感器 -# echo 226 > /sys/class/gpio/export -# echo in > /sys/class/gpio/gpio226/direction - -echo 7 > /sys/class/gpio/export -echo out > /sys/class/gpio/gpio7/direction -echo 1 > /sys/class/gpio/gpio7/value -sleep 0.01 -echo "init FPGA_INITN done" - -echo 8 > /sys/class/gpio/export -echo out > /sys/class/gpio/gpio8/direction -echo 1 > /sys/class/gpio/gpio8/value -sleep 0.01 -echo "init FPGA_RELOAD done" - -echo 0 > /sys/class/gpio/gpio8/value -sleep 0.1 -echo 0 > /sys/class/gpio/gpio7/value -sleep 0.2 -echo 1 > /sys/class/gpio/gpio8/value -sleep 0.01 -echo 1 > /sys/class/gpio/gpio7/value -sleep 0.01