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

hp5400: Added support for all buttons. 

Support to read copy counter display to be done shortly.
fix-build-obselete-jpeg
Ralph Little 2020-03-05 08:58:54 -08:00
rodzic 4f6b7665a8
commit dd078cd17d
3 zmienionych plików z 251 dodań i 63 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
backend/hp5400_internal.c
Wyświetl plik

@ -1,4 +1,5 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2020 Ralph Little <skelband@gmail.com>
Copyright (C) 2003 Martijn van Oosterhout <kleptog@svana.org> Copyright (C) 2003 Martijn van Oosterhout <kleptog@svana.org>
Copyright (C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net> Copyright (C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
Copyright (c) 2003 Henning Meier-Geinitz, <henning@meier-geinitz.de> Copyright (c) 2003 Henning Meier-Geinitz, <henning@meier-geinitz.de>
@ -149,11 +150,38 @@ SetLamp (THWParams * pHWParams, int fLampOn)
if (fLampOn) if (fLampOn)
{ {
if (WriteByte (pHWParams->iXferHandle, 0x0000, 0x01) == 0) if (WriteByte (pHWParams->iXferHandle, 0x0000, 0x01) == 0)
return 0; return 0;
} }
return -1; return -1;
} }
HP5400_SANE_STATIC
int
GetSensors(THWParams * pHWParams, uint16_t *sensorMap)
{
/*
* Read until we get 0.
* Max 10 iterations for safety.
*
*/
uint16_t thisSensorMap = 0;
size_t iterCount = 10;
do
{
if (hp5400_command_read
(pHWParams->iXferHandle, CMD_GETSENSORS, sizeof (uint16_t), &thisSensorMap) < 0)
{
HP5400_DBG (DBG_MSG, "failed to read sensors\n");
return -1;
}
*sensorMap |= thisSensorMap;
} while (iterCount-- && (thisSensorMap > 0));
return 0;
}
HP5400_SANE_STATIC HP5400_SANE_STATIC
int int
WarmupLamp (int iHandle) WarmupLamp (int iHandle)

6
backend/hp5400_internal.h
Wyświetl plik

@ -2,6 +2,7 @@
#define _HP5400_INTERNAL_H_ #define _HP5400_INTERNAL_H_
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2020 Ralph Little <skelband@gmail.com>
(C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net> (C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
(c) 2003 Martijn van Oosterhout, kleptog@svana.org (c) 2003 Martijn van Oosterhout, kleptog@svana.org
(c) 2002 Bertrik Sikken, bertrik@zonnet.nl (c) 2002 Bertrik Sikken, bertrik@zonnet.nl
@ -73,6 +74,7 @@
#define CMD_SCANREQUEST 0x2505 /* This is for previews */ #define CMD_SCANREQUEST 0x2505 /* This is for previews */
#define CMD_SCANREQUEST2 0x2500 /* This is for real scans */ #define CMD_SCANREQUEST2 0x2500 /* This is for real scans */
#define CMD_SCANRESPONSE 0x3400 #define CMD_SCANRESPONSE 0x3400
#define CMD_GETSENSORS 0x2000
/* Testing stuff to make it work */ /* Testing stuff to make it work */
#define CMD_SETDPI 0x1500 /* ??? */ #define CMD_SETDPI 0x1500 /* ??? */
@ -156,6 +158,10 @@ HP5400_SANE_STATIC
int int
SetLamp (THWParams * pHWParams, int fLampOn); SetLamp (THWParams * pHWParams, int fLampOn);
HP5400_SANE_STATIC
int
GetSensors (THWParams * pHWParams, uint16_t *sensorMap);
HP5400_SANE_STATIC HP5400_SANE_STATIC
int int
WarmupLamp (int iHandle); WarmupLamp (int iHandle);

278
backend/hp5400_sane.c
Wyświetl plik

@ -1,4 +1,5 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2020 Ralph Little <skelband@gmail.com>
Copyright (C) 2003 Martijn van Oosterhout <kleptog@svana.org> Copyright (C) 2003 Martijn van Oosterhout <kleptog@svana.org>
Copyright (C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net> Copyright (C) 2003 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
@ -115,30 +116,74 @@ typedef enum
{ {
optCount = 0, optCount = 0,
optGroupGeometry,
optTLX, optTLY, optBRX, optBRY,
optDPI, optDPI,
optGroupImage, optGroupGeometry,
optTLX, optTLY, optBRX, optBRY,
optGroupEnhancement,
optGammaTableRed, /* Gamma Tables */ optGammaTableRed, /* Gamma Tables */
optGammaTableGreen, optGammaTableGreen,
optGammaTableBlue, optGammaTableBlue,
optGroupSensors,
optSensorScanTo,
optSensorWeb,
optSensorReprint,
optSensorEmail,
optSensorCopy,
optSensorMoreOptions,
optSensorCancel,
optSensorPowerSave,
optSensorCopiesUp,
optSensorCopiesDown,
optSensorColourBW,
// Unsupported as yet.
//optGroupMisc,
//optLamp,
//optCalibrate,
optLast, /* Disable the offset code */ optLast, /* Disable the offset code */
optGroupMisc,
optOffsetX, optOffsetY
/* put temporarily disabled options here after optLast */
/*
optLamp,
*/
} }
EOptionIndex; EOptionIndex;
/*
* Array mapping (optSensor* - optGroupSensors - 1) to the bit mask of the
* corresponding sensor bit that we get from the scanner.
* All sensor bits are reported as a complete 16-bit word with individual bits set
* to indicate that the sensor has been activated.
* They seem to be latched so that they are picked up on next query and a number
* of bits can be set in any one query.
*
*/
uint16_t sensorMaskMap[] =
{
0x0400, // Scan To button
0x0200, // Web (WWW) button
0x0002, // Reprint button
0x0080, // Email button
0x0040, // Copy button
0x0004, // More Options button
0x0100, // Cancel button
// Special buttons.
// These affect local machine settings, but we can still detect them being pressed.
0x2000, // Power Save button.
0x0008, // Copies Up button
0x0020, // Copies Down button
0x0010, // Color/BW Selection button.
// Extra entries to make the array up to the 16 possible bits.
0x0000, // Unused
0x0000, // Unused
0x0000, // Unused
0x0000, // Unused
0x0000 // Unused
};
typedef union typedef union
{ {
SANE_Word w; SANE_Word w;
@ -165,6 +210,8 @@ typedef struct
int fScanning; /* TRUE if actively scanning */ int fScanning; /* TRUE if actively scanning */
int fCanceled; int fCanceled;
uint16_t sensorMap; /* Contains the current unreported sensor bits. */
} }
TScanner; TScanner;
@ -198,11 +245,6 @@ static const SANE_Int setResolutions[] = {5, 75, 150, 300, 600, 1200};
#endif #endif
static const SANE_Range rangeXmm = {0, 216, 1}; static const SANE_Range rangeXmm = {0, 216, 1};
static const SANE_Range rangeYmm = {0, 297, 1}; static const SANE_Range rangeYmm = {0, 297, 1};
static const SANE_Range rangeXoffset = {0, 20, 1};
static const SANE_Range rangeYoffset = {0, 70, 1};
static const SANE_Int offsetX = 0;
static const SANE_Int offsetY = 0;
static void _InitOptions(TScanner *s) static void _InitOptions(TScanner *s)
{ {
@ -248,8 +290,22 @@ static void _InitOptions(TScanner *s)
pVal->w = (SANE_Word)optLast; pVal->w = (SANE_Word)optLast;
break; break;
case optDPI:
pDesc->name = SANE_NAME_SCAN_RESOLUTION;
pDesc->title = SANE_TITLE_SCAN_RESOLUTION;
pDesc->desc = SANE_DESC_SCAN_RESOLUTION;
pDesc->unit = SANE_UNIT_DPI;
pDesc->constraint_type = SANE_CONSTRAINT_WORD_LIST;
pDesc->constraint.word_list = setResolutions;
pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
pVal->w = setResolutions[1];
break;
//---------------------------------
case optGroupGeometry: case optGroupGeometry:
pDesc->title = "Geometry"; pDesc->name = SANE_NAME_GEOMETRY;
pDesc->title = SANE_TITLE_GEOMETRY;
pDesc->desc = SANE_DESC_GEOMETRY;
pDesc->type = SANE_TYPE_GROUP; pDesc->type = SANE_TYPE_GROUP;
pDesc->size = 0; pDesc->size = 0;
break; break;
@ -298,19 +354,11 @@ static void _InitOptions(TScanner *s)
pVal->w = rangeYmm.max; pVal->w = rangeYmm.max;
break; break;
case optDPI: //---------------------------------
pDesc->name = SANE_NAME_SCAN_RESOLUTION; case optGroupEnhancement:
pDesc->title = SANE_TITLE_SCAN_RESOLUTION; pDesc->name = SANE_NAME_ENHANCEMENT;
pDesc->desc = SANE_DESC_SCAN_RESOLUTION; pDesc->title = SANE_TITLE_ENHANCEMENT;
pDesc->unit = SANE_UNIT_DPI; pDesc->desc = SANE_DESC_ENHANCEMENT;
pDesc->constraint_type = SANE_CONSTRAINT_WORD_LIST;
pDesc->constraint.word_list = setResolutions;
pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
pVal->w = setResolutions[1];
break;
case optGroupImage:
pDesc->title = SANE_I18N("Image");
pDesc->type = SANE_TYPE_GROUP; pDesc->type = SANE_TYPE_GROUP;
pDesc->size = 0; pDesc->size = 0;
break; break;
@ -348,34 +396,110 @@ static void _InitOptions(TScanner *s)
pVal->wa = s->aGammaTableB; pVal->wa = s->aGammaTableB;
break; break;
//---------------------------------
case optGroupSensors:
pDesc->name = SANE_NAME_SENSORS;
pDesc->title = SANE_TITLE_SENSORS;
pDesc->type = SANE_TYPE_GROUP;
pDesc->desc = SANE_DESC_SENSORS;
pDesc->size = 0;
break;
case optSensorScanTo:
pDesc->name = SANE_NAME_SCAN;
pDesc->title = SANE_TITLE_SCAN;
pDesc->desc = SANE_DESC_SCAN;
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorWeb:
pDesc->name = SANE_I18N("web");
pDesc->title = SANE_I18N("Power Save button");
pDesc->desc = SANE_I18N("Puts the scanner in an energy-conservation mode");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorReprint:
pDesc->name = SANE_I18N("reprint");
pDesc->title = SANE_I18N("Reprint Photos button");
pDesc->desc = SANE_I18N("Button for duplicating photos");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorEmail:
pDesc->name = SANE_NAME_EMAIL;
pDesc->title = SANE_TITLE_EMAIL;
pDesc->desc = SANE_DESC_EMAIL;
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorCopy:
pDesc->name = SANE_NAME_COPY;
pDesc->title = SANE_TITLE_COPY;
pDesc->desc = SANE_DESC_COPY;
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorMoreOptions:
pDesc->name = SANE_I18N("more-options");
pDesc->title = SANE_I18N("More Options button");
pDesc->desc = SANE_I18N("Additional options/configuration");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorCancel:
pDesc->name = SANE_NAME_CANCEL;
pDesc->title = SANE_TITLE_CANCEL;
pDesc->desc = SANE_DESC_CANCEL;
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorPowerSave:
pDesc->name = SANE_I18N("power-save");
pDesc->title = SANE_I18N("Power Save button");
pDesc->desc = SANE_I18N("Puts the scanner in an energy-conservation mode");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorCopiesUp:
pDesc->name = SANE_I18N("copies-up");
pDesc->title = SANE_I18N("Increase Copies button");
pDesc->desc = SANE_I18N("Increase the number of copies");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorCopiesDown:
pDesc->name = SANE_I18N("copies-down");
pDesc->title = SANE_I18N("Decrease Copies button");
pDesc->desc = SANE_I18N("Decrease the number of copies");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
case optSensorColourBW:
pDesc->name = SANE_I18N("color-bw");
pDesc->title = SANE_I18N("Select color/BW button");
pDesc->desc = SANE_I18N("Alternates between color and black/white");
pDesc->type = SANE_TYPE_BOOL;
pDesc->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_HARD_SELECT | SANE_CAP_ADVANCED;
break;
#if 0
case optGroupMisc: case optGroupMisc:
pDesc->title = SANE_I18N("Miscellaneous"); pDesc->title = SANE_I18N("Miscellaneous");
pDesc->type = SANE_TYPE_GROUP; pDesc->type = SANE_TYPE_GROUP;
pDesc->size = 0; pDesc->size = 0;
break; break;
case optOffsetX:
pDesc->title = SANE_I18N("offset X");
pDesc->desc = SANE_I18N("Hardware internal X position of the scanning area.");
pDesc->unit = SANE_UNIT_MM;
pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
pDesc->constraint.range = &rangeXoffset;
pDesc->cap = SANE_CAP_SOFT_SELECT;
pVal->w = offsetX;
break;
case optOffsetY:
pDesc->title = SANE_I18N("offset Y");
pDesc->desc = SANE_I18N("Hardware internal Y position of the scanning area.");
pDesc->unit = SANE_UNIT_MM;
pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
pDesc->constraint.range = &rangeYoffset;
pDesc->cap = SANE_CAP_SOFT_SELECT;
pVal->w = offsetY;
break;
#if 0
case optLamp: case optLamp:
pDesc->name = "lamp"; pDesc->name = "lamp";
pDesc->title = SANE_I18N("Lamp status"); pDesc->title = SANE_I18N("Lamp status");
@ -385,8 +509,7 @@ static void _InitOptions(TScanner *s)
/* switch the lamp on when starting for first the time */ /* switch the lamp on when starting for first the time */
pVal->w = SANE_TRUE; pVal->w = SANE_TRUE;
break; break;
#endif
#if 0
case optCalibrate: case optCalibrate:
pDesc->name = "calibrate"; pDesc->name = "calibrate";
pDesc->title = SANE_I18N("Calibrate"); pDesc->title = SANE_I18N("Calibrate");
@ -467,7 +590,7 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
SANE_String_Const proper_str; SANE_String_Const proper_str;
int nline = 0; int nline = 0;
/* prevent compiler from complaing about unused parameters */ /* prevent compiler from complaining about unused parameters */
pfnAuth = pfnAuth; pfnAuth = pfnAuth;
strcpy(usb_devfile, "/dev/usb/scanner0"); strcpy(usb_devfile, "/dev/usb/scanner0");
@ -531,7 +654,6 @@ sane_init (SANE_Int * piVersion, SANE_Auth_Callback pfnAuth)
*piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD); *piVersion = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
} }
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }
@ -708,8 +830,6 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
*(SANE_Word *) pVal); *(SANE_Word *) pVal);
break; break;
case optOffsetX:
case optOffsetY:
case optCount: case optCount:
case optDPI: case optDPI:
HP5400_DBG (DBG_MSG, HP5400_DBG (DBG_MSG,
@ -726,14 +846,48 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
memcpy (pVal, s->aValues[n].wa, s->aOptions[n].size); memcpy (pVal, s->aValues[n].wa, s->aOptions[n].size);
break; break;
case optSensorScanTo:
case optSensorWeb:
case optSensorReprint:
case optSensorEmail:
case optSensorCopy:
case optSensorMoreOptions:
case optSensorCancel:
case optSensorPowerSave:
case optSensorCopiesUp:
case optSensorCopiesDown:
case optSensorColourBW:
{
HP5400_DBG (DBG_MSG, "Reading sensor state\n");
uint16_t sensorMap;
if (GetSensors(&s->HWParams, &sensorMap) != 0)
{
HP5400_DBG (DBG_ERR,
"sane_control_option: SANE_ACTION_SET_VALUE could not retrieve sensors\n");
return SANE_STATUS_IO_ERROR;
}
HP5400_DBG (DBG_MSG, "Sensor state=%x\n", sensorMap);
// Add read flags to what we already have so that we can report them when requested.
s->sensorMap |= sensorMap;
// Look up the mask based on the option number.
uint16_t mask = sensorMaskMap[n - optGroupSensors - 1];
*(SANE_Word *) pVal = (s->sensorMap & mask)? 1:0;
s->sensorMap &= ~mask;
break;
}
#if 0 #if 0
/* Get options of type SANE_Bool */ /* Get options of type SANE_Bool */
case optLamp: case optLamp:
GetLamp (&s->HWParams, &fLampIsOn); GetLamp (&s->HWParams, &fLampIsOn);
*(SANE_Bool *) pVal = fLampIsOn; *(SANE_Bool *) pVal = fLampIsOn;
break; break;
#endif
#if 0
case optCalibrate: case optCalibrate:
/* although this option has nothing to read, /* although this option has nothing to read,
it's added here to avoid a warning when running scanimage --help */ it's added here to avoid a warning when running scanimage --help */