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

* doc/plustek/Plustek-PARPORT.changes doc/plustek/Plustek-USB.changes 

doc/u12/U12.changes: update.
* backend/artec_eplus48u.c backend/plustek.c backend/plustek_pp.c
  backend/u12.c: changed sane.type to "flatbed scanner" only.
* backend/plustek-usbdevs.c: fixed LiDE20/30 motor settings
merge-requests/1/head
Gerhard Jaeger 2006-08-09 12:47:58 +00:00
rodzic 850ad80287
commit 67ae886d9c
9 zmienionych plików z 38 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
ChangeLog
Wyświetl plik

@ -1,3 +1,11 @@
2006-08-09 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-PARPORT.changes doc/plustek/Plustek-USB.changes
doc/u12/U12.changes: update.
* backend/artec_eplus48u.c backend/plustek.c backend/plustek_pp.c
backend/u12.c: changed sane.type to "flatbed scanner" only.
* backend/plustek-usbdevs.c: fixed LiDE20/30 motor settings
2006-08-06 Stephane Voltz <stefdev@modulonet.fr> 2006-08-06 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c backend/genesys.c: fix y scan area offset * backend/genesys_gl646.c backend/genesys.c: fix y scan area offset

2
backend/artec_eplus48u.c
Wyświetl plik

@ -792,7 +792,7 @@ attach (const char *dev_name, Artec48U_Device ** devp)
XDBG ((3, "attach: setting vendor string: %s\n", vendor_string)); XDBG ((3, "attach: setting vendor string: %s\n", vendor_string));
dev->sane.model = strdup (model_string); dev->sane.model = strdup (model_string);
XDBG ((3, "attach: setting model string: %s\n", model_string)); XDBG ((3, "attach: setting model string: %s\n", model_string));
dev->sane.type = "USB flatbed scanner"; dev->sane.type = "flatbed scanner";
dev->firmware_path = strdup (firmwarePath); dev->firmware_path = strdup (firmwarePath);
dev->epro_mult = eProMult; dev->epro_mult = eProMult;

13
backend/plustek-usbdevs.c
Wyświetl plik

@ -65,6 +65,7 @@
* - 0.51 - tweaked CanoScan N1220U settings again * - 0.51 - tweaked CanoScan N1220U settings again
* - added settings for Syscan Travelscan 662 * - added settings for Syscan Travelscan 662
* - tweaked settings for Bearpaw 1200 * - tweaked settings for Bearpaw 1200
* - fixed Motorsettings for LiDE20/30
* *
* <hr> * <hr>
* This file is part of the SANE package. * This file is part of the SANE package.
@ -2195,8 +2196,8 @@ static HWDef Hw0x04A9_0x2208 =
/** Canon 670/676/LiDE20 */ /** Canon 670/676/LiDE20 */
static HWDef Hw0x04A9_0x220D = static HWDef Hw0x04A9_0x220D =
{ {
0.86, /* dMaxMotorSpeed */ 0.72, /* dMaxMotorSpeed */
0.243, /* dMaxMoveSpeed */ 0.23, /* dMaxMoveSpeed */
0.0, /* dHighSpeed */ 0.0, /* dHighSpeed */
100, /* dIntegrationTimeLowLamp */ 100, /* dIntegrationTimeLowLamp */
100, /* dIntegrationTimeHighLamp */ 100, /* dIntegrationTimeHighLamp */
@ -2657,7 +2658,7 @@ static ClkMotorDef Motors[] = {
{ 8.0, 8.0, 8.0, 8.0, 8.0, 13.0, 13.0, 13.0, 13.0, 13.0 } { 8.0, 8.0, 8.0, 8.0, 8.0, 13.0, 13.0, 13.0, 13.0, 13.0 }
}, },
{ MODEL_CANON600, 8, 31, 6, 0, 0, { MODEL_CANON600, 8, 31, 12, 0, 0,
/* Motor settings (PWM and PWM_Duty) */ /* Motor settings (PWM and PWM_Duty) */
/* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */ /* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
{{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, {{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 },
@ -2667,11 +2668,11 @@ static ClkMotorDef Motors[] = {
{ 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 }, { 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 },
{ 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 }, { 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0 },
/* Gray mode MCLK settings */ /* Gray mode MCLK settings */
{ 12.5, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 }, { 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 },
{ 12.5, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 } { 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 }
}, },
{ MODEL_CANON1200, 8, 31, 3, 0, 0, { MODEL_CANON1200, 8, 31, 8, 0, 0,
/* Motor settings (PWM and PWM_Duty) */ /* Motor settings (PWM and PWM_Duty) */
/* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */ /* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */
{{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, {{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 },

6
backend/plustek.c
Wyświetl plik

@ -157,7 +157,7 @@
#include "../include/sane/sanei.h" #include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h" #include "../include/sane/saneopts.h"
#define BACKEND_VERSION "0.51-12" #define BACKEND_VERSION "0.51-13"
#define BACKEND_NAME plustek #define BACKEND_NAME plustek
#include "../include/sane/sanei_access.h" #include "../include/sane/sanei_access.h"
@ -1311,9 +1311,9 @@ attach( const char *dev_name, CnfDef *cnf, Plustek_Device **devp )
/* okay, so assign the handle and the scanner type */ /* okay, so assign the handle and the scanner type */
dev->fd = handle; dev->fd = handle;
if( usb_IsSheetFedDevice( dev )) if( usb_IsSheetFedDevice( dev ))
dev->sane.type = "USB sheet-fed scanner"; dev->sane.type = SANE_I18N("sheetfed scanner");
else else
dev->sane.type = "USB flatbed scanner"; dev->sane.type = SANE_I18N("flatbed scanner");
result = usbDev_getCaps( dev ); result = usbDev_getCaps( dev );
if( result < 0 ) { if( result < 0 ) {

4
backend/plustek_pp.c
Wyświetl plik

@ -83,7 +83,7 @@
#include "../include/sane/sanei.h" #include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h" #include "../include/sane/saneopts.h"
#define BACKEND_VERSION "0.43-10" #define BACKEND_VERSION "0.43-11"
#define BACKEND_NAME plustek_pp #define BACKEND_NAME plustek_pp
#include "../include/sane/sanei_backend.h" #include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h" #include "../include/sane/sanei_config.h"
@ -1011,7 +1011,7 @@ static SANE_Status attach( const char *dev_name, pCnfDef cnf,
show_cnf( cnf ); show_cnf( cnf );
dev->sane.type = "parallel port flatbed scanner"; dev->sane.type = SANE_I18N ("flatbed scanner");
dev->open = ppDev_open; dev->open = ppDev_open;
dev->close = ppDev_close; dev->close = ppDev_close;
dev->getCaps = ppDev_getCaps; dev->getCaps = ppDev_getCaps;

4
backend/u12.c
Wyświetl plik

@ -80,7 +80,7 @@
#include "../include/sane/sanei.h" #include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h" #include "../include/sane/saneopts.h"
#define BACKEND_VERSION "0.02-10" #define BACKEND_VERSION "0.02-11"
#define BACKEND_NAME u12 #define BACKEND_NAME u12
#include "../include/sane/sanei_backend.h" #include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h" #include "../include/sane/sanei_config.h"
@ -848,7 +848,7 @@ static SANE_Status attach( const char *dev_name,
dev->sane.name = dev->name; /* compiler warnings */ dev->sane.name = dev->name; /* compiler warnings */
dev->sane.vendor = "Plustek"; dev->sane.vendor = "Plustek";
dev->sane.model = "U12/1212U"; dev->sane.model = "U12/1212U";
dev->sane.type = "USB flatbed scanner"; dev->sane.type = SANE_I18N ("flatbed scanner");
dev->initialized = SANE_FALSE; dev->initialized = SANE_FALSE;
memcpy( &dev->adj, &cnf->adj, sizeof(AdjDef)); memcpy( &dev->adj, &cnf->adj, sizeof(AdjDef));

3
doc/plustek/Plustek-PARPORT.changes
Wyświetl plik

@ -160,3 +160,6 @@ Version 0.43-10 02/16/2006
1.0 Fixed bug, that prevents backend from working, when the 1.0 Fixed bug, that prevents backend from working, when the
device is connected to parport1 or higher, parport0 works. device is connected to parport1 or higher, parport0 works.
Bug spotted by Christoph Steinbruchel. Bug spotted by Christoph Steinbruchel.
Version 0.43-11 08/09/2006
1.0 Changed sane.type to "flatbed scanner" only

5
doc/plustek/Plustek-USB.changes
Wyświetl plik

@ -3,6 +3,11 @@ Plustek.changes - Gerhard J
Note: All other not mentioned builds have never been released. Note: All other not mentioned builds have never been released.
V 0.51-13 (2006-08-09)
----------------------
Changed sane.type to "flatbed scanner" only
Fixed motorsettings for LiDE20/30
V 0.51-12 (2006-06-30) V 0.51-12 (2006-06-30)
---------------------- ----------------------
Fixed bit-depth selection Fixed bit-depth selection

3
doc/u12/U12.changes
Wyświetl plik

@ -31,3 +31,6 @@ V 0.02-10 (2006-14-02)
- SoftwareReset is now disabled in cancelSequence when the device - SoftwareReset is now disabled in cancelSequence when the device
is a Genius (reported by Jose Alberto Reguero <jareguero@telefonica.net>) is a Genius (reported by Jose Alberto Reguero <jareguero@telefonica.net>)
V 0.02-11 (2006-09-08)
----------------------
- Changed sane.type to "flatbed scanner" only