mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

add page loaded sensor option 

- add page loaded sensor option
- detect page loaded status by usign '0x59' request
merge-requests/1/head
Stphane Voltz 2009-11-30 21:36:12 +01:00
rodzic 409e1d29d2
commit 157587e90e
2 zmienionych plików z 67 dodań i 47 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

113
backend/gt68xx.c
Wyświetl plik

@ -750,57 +750,73 @@ init_options (GT68xx_Scanner * s)
s->opt[OPT_BR_Y].constraint.range = &y_range; s->opt[OPT_BR_Y].constraint.range = &y_range;
s->val[OPT_BR_Y].w = y_range.max; s->val[OPT_BR_Y].w = y_range.max;
/* sensor group, mainly for sheet fed scanners calibration /* sensor group */
* for now */ s->opt[OPT_SENSOR_GROUP].name = SANE_NAME_SENSORS;
if (s->dev->model->flags & GT68XX_FLAG_HAS_CALIBRATE) s->opt[OPT_SENSOR_GROUP].title = SANE_TITLE_SENSORS;
{ s->opt[OPT_SENSOR_GROUP].desc = SANE_DESC_SENSORS;
/* sensor group */ s->opt[OPT_SENSOR_GROUP].type = SANE_TYPE_GROUP;
s->opt[OPT_SENSOR_GROUP].name = SANE_NAME_SENSORS; s->opt[OPT_SENSOR_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
s->opt[OPT_SENSOR_GROUP].title = SANE_TITLE_SENSORS;
s->opt[OPT_SENSOR_GROUP].desc = SANE_DESC_SENSORS;
s->opt[OPT_SENSOR_GROUP].type = SANE_TYPE_GROUP;
s->opt[OPT_SENSOR_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
/* calibration needed */ /* calibration needed */
s->opt[OPT_NEED_CALIBRATION_SW].name = "need-calibration"; s->opt[OPT_NEED_CALIBRATION_SW].name = "need-calibration";
s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Need calibration"); s->opt[OPT_NEED_CALIBRATION_SW].title = SANE_I18N ("Need calibration");
s->opt[OPT_NEED_CALIBRATION_SW].desc = SANE_I18N ("The scanner needs calibration for the current settings"); s->opt[OPT_NEED_CALIBRATION_SW].desc = SANE_I18N ("The scanner needs calibration for the current settings");
s->opt[OPT_NEED_CALIBRATION_SW].type = SANE_TYPE_BOOL; s->opt[OPT_NEED_CALIBRATION_SW].type = SANE_TYPE_BOOL;
s->opt[OPT_NEED_CALIBRATION_SW].unit = SANE_UNIT_NONE; s->opt[OPT_NEED_CALIBRATION_SW].unit = SANE_UNIT_NONE;
s->opt[OPT_NEED_CALIBRATION_SW].cap = if (s->dev->model->flags & GT68XX_FLAG_HAS_CALIBRATE)
SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED; s->opt[OPT_NEED_CALIBRATION_SW].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
s->val[OPT_NEED_CALIBRATION_SW].b = 0; else
s->opt[OPT_NEED_CALIBRATION_SW].cap = SANE_CAP_INACTIVE;
s->val[OPT_NEED_CALIBRATION_SW].b = 0;
/* button group */ /* document present sensor */
s->opt[OPT_BUTTON_GROUP].name = "Buttons"; s->opt[OPT_PAGE_LOADED_SW].name = SANE_NAME_PAGE_LOADED;
s->opt[OPT_BUTTON_GROUP].title = SANE_I18N ("Buttons"); s->opt[OPT_PAGE_LOADED_SW].title = SANE_TITLE_PAGE_LOADED;
s->opt[OPT_BUTTON_GROUP].desc = SANE_I18N ("Buttons"); s->opt[OPT_PAGE_LOADED_SW].desc = SANE_DESC_PAGE_LOADED;
s->opt[OPT_BUTTON_GROUP].type = SANE_TYPE_GROUP; s->opt[OPT_PAGE_LOADED_SW].type = SANE_TYPE_BOOL;
s->opt[OPT_BUTTON_GROUP].constraint_type = SANE_CONSTRAINT_NONE; s->opt[OPT_PAGE_LOADED_SW].unit = SANE_UNIT_NONE;
if (s->dev->model->command_set->document_present)
s->opt[OPT_PAGE_LOADED_SW].cap =
SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
else
s->opt[OPT_PAGE_LOADED_SW].cap = SANE_CAP_INACTIVE;
s->val[OPT_PAGE_LOADED_SW].b = 0;
/* calibrate button */ /* button group */
s->opt[OPT_CALIBRATE].name = "calibrate"; s->opt[OPT_BUTTON_GROUP].name = "Buttons";
s->opt[OPT_CALIBRATE].title = SANE_I18N ("Calibrate"); s->opt[OPT_BUTTON_GROUP].title = SANE_I18N ("Buttons");
s->opt[OPT_CALIBRATE].desc = s->opt[OPT_BUTTON_GROUP].desc = SANE_I18N ("Buttons");
SANE_I18N ("Start calibration using special sheet"); s->opt[OPT_BUTTON_GROUP].type = SANE_TYPE_GROUP;
s->opt[OPT_CALIBRATE].type = SANE_TYPE_BUTTON; s->opt[OPT_BUTTON_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
s->opt[OPT_CALIBRATE].unit = SANE_UNIT_NONE;
s->opt[OPT_CALIBRATE].cap =
SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED |
SANE_CAP_AUTOMATIC;
s->val[OPT_CALIBRATE].b = 0;
/* clear calibration cache button */ /* calibrate button */
s->opt[OPT_CLEAR_CALIBRATION].name = "clear"; s->opt[OPT_CALIBRATE].name = "calibrate";
s->opt[OPT_CLEAR_CALIBRATION].title = SANE_I18N ("Clear calibration"); s->opt[OPT_CALIBRATE].title = SANE_I18N ("Calibrate");
s->opt[OPT_CLEAR_CALIBRATION].desc = SANE_I18N ("Clear calibration cache"); s->opt[OPT_CALIBRATE].desc =
s->opt[OPT_CLEAR_CALIBRATION].type = SANE_TYPE_BUTTON; SANE_I18N ("Start calibration using special sheet");
s->opt[OPT_CLEAR_CALIBRATION].unit = SANE_UNIT_NONE; s->opt[OPT_CALIBRATE].type = SANE_TYPE_BUTTON;
s->opt[OPT_CLEAR_CALIBRATION].cap = s->opt[OPT_CALIBRATE].unit = SANE_UNIT_NONE;
SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED | if (s->dev->model->flags & GT68XX_FLAG_HAS_CALIBRATE)
SANE_CAP_AUTOMATIC; s->opt[OPT_CALIBRATE].cap =
s->val[OPT_CLEAR_CALIBRATION].b = 0; SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED |
} SANE_CAP_AUTOMATIC;
else
s->opt[OPT_CALIBRATE].cap = SANE_CAP_INACTIVE;
s->val[OPT_CALIBRATE].b = 0;
/* clear calibration cache button */
s->opt[OPT_CLEAR_CALIBRATION].name = "clear";
s->opt[OPT_CLEAR_CALIBRATION].title = SANE_I18N ("Clear calibration");
s->opt[OPT_CLEAR_CALIBRATION].desc = SANE_I18N ("Clear calibration cache");
s->opt[OPT_CLEAR_CALIBRATION].type = SANE_TYPE_BUTTON;
s->opt[OPT_CLEAR_CALIBRATION].unit = SANE_UNIT_NONE;
if (s->dev->model->flags & GT68XX_FLAG_HAS_CALIBRATE)
s->opt[OPT_CLEAR_CALIBRATION].cap =
SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED |
SANE_CAP_AUTOMATIC;
else
s->opt[OPT_CLEAR_CALIBRATION].cap = SANE_CAP_INACTIVE;
s->val[OPT_CLEAR_CALIBRATION].b = 0;
RIE (calc_parameters (s)); RIE (calc_parameters (s));
@ -1661,6 +1677,9 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
case OPT_NEED_CALIBRATION_SW: case OPT_NEED_CALIBRATION_SW:
*(SANE_Bool *) val = !s->calibrated; *(SANE_Bool *) val = !s->calibrated;
break; break;
case OPT_PAGE_LOADED_SW:
s->dev->model->command_set->document_present (s->dev, val);
break;
default: default:
DBG (2, "sane_control_option: can't get unknown option %d\n", DBG (2, "sane_control_option: can't get unknown option %d\n",
option); option);

1
backend/gt68xx_high.h
Wyświetl plik

@ -231,6 +231,7 @@ enum GT68xx_Option
OPT_SENSOR_GROUP, OPT_SENSOR_GROUP,
OPT_NEED_CALIBRATION_SW, /* signals calibration is needed */ OPT_NEED_CALIBRATION_SW, /* signals calibration is needed */
OPT_PAGE_LOADED_SW, /* signals that a document is inserted in feeder */
OPT_BUTTON_GROUP, OPT_BUTTON_GROUP,
OPT_CALIBRATE, /* button option to trigger call OPT_CALIBRATE, /* button option to trigger call