This commit is contained in:
13038267101 2023-02-08 16:19:42 +08:00
parent 8e85228709
commit 532811f0d1
2 changed files with 5 additions and 4 deletions

View File

@ -1114,7 +1114,7 @@ namespace setting3399
{PAPER_LETTER_LATERAL, TwSS::USLetter, setting3399::G400_LETTERR}, {PAPER_LETTER_LATERAL, TwSS::USLetter, setting3399::G400_LETTERR},
{PAPER_DOUBLE_LETTER, TwSS::USLedger, setting3399::G400_DOUBLELETTER}, {PAPER_DOUBLE_LETTER, TwSS::USLedger, setting3399::G400_DOUBLELETTER},
{PAPER_LEGAL, TwSS::USLegal, setting3399::G400_LEGAL}, {PAPER_LEGAL, TwSS::USLegal, setting3399::G400_LEGAL},
{PAPER_AUTO_MATCH, TwSS::None, 0}, {PAPER_AUTO_MATCH, TwSS::None, 0}, //重影版本发布之后 需要变更为G400_MAXAUTO
{PAPER_MAX_SIZE_CLIP, TwSS::USStatement, setting3399::G400_MAXAUTO}, {PAPER_MAX_SIZE_CLIP, TwSS::USStatement, setting3399::G400_MAXAUTO},
{PAPER_MAX_SIZE, TwSS::MaxSize, setting3399::G400_MAXSIZE}, {PAPER_MAX_SIZE, TwSS::MaxSize, setting3399::G400_MAXSIZE},
{PAPER_TRIGEMINY, TwSS::Trigeminy, setting3399::G400_LONGLETTER} {PAPER_TRIGEMINY, TwSS::Trigeminy, setting3399::G400_LONGLETTER}

View File

@ -756,9 +756,10 @@ int hg_scanner_239::on_paper_check_changed(bool& check)
} }
int hg_scanner_239::on_resolution_changed(int& dpi) int hg_scanner_239::on_resolution_changed(int& dpi)
{ {
dev_conf_.params_3399.dpi = 1; //dpi 华凌cis和敦南cis 默认发1无需改变 dev_conf_.params_3399.dpi = dpi == 600 ? 3 : (dpi < 599 && dpi>299) ? 2 : 1;
int ret = writedown_device_configuration(); //dev_conf_.params_3399.dpi = 1; //dpi 华凌cis和敦南cis 默认发1无需改变
return ret; int ret = writedown_device_configuration();
return ret;
} }
int hg_scanner_239::on_ultrasonic_check_changed(bool& check) int hg_scanner_239::on_ultrasonic_check_changed(bool& check)
{ {