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

Register related fixes.

merge-requests/1/head
Jan Hauffa 2011-04-25 20:25:02 +02:00 zatwierdzone przez m. allan noah
rodzic 5d556cd5e6
commit 96b4950499
2 zmienionych plików z 7 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
backend/mustek_usb2_asic.c
Wyświetl plik

@ -457,8 +457,7 @@ SetMotorCurrentAndPhase (ASIC * chip,
if (MotorCurrentAndPhase->MoveType == _4_TABLE_SPACE_FOR_FULL_STEP) if (MotorCurrentAndPhase->MoveType == _4_TABLE_SPACE_FOR_FULL_STEP)
{ {
SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, MOTOR_PWM_CURRENT_0);
MOTOR_PWM_CURRENT_0 | MOTOR1_GPO_VALUE_0);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
@ -472,8 +471,7 @@ SetMotorCurrentAndPhase (ASIC * chip,
} }
else if (MotorCurrentAndPhase->MoveType == _8_TABLE_SPACE_FOR_1_DIV_2_STEP) else if (MotorCurrentAndPhase->MoveType == _8_TABLE_SPACE_FOR_1_DIV_2_STEP)
{ {
SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, MOTOR_PWM_CURRENT_1);
MOTOR_PWM_CURRENT_1 | MOTOR1_GPO_VALUE_0);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
@ -487,8 +485,7 @@ SetMotorCurrentAndPhase (ASIC * chip,
} }
else if (MotorCurrentAndPhase->MoveType == _16_TABLE_SPACE_FOR_1_DIV_4_STEP) else if (MotorCurrentAndPhase->MoveType == _16_TABLE_SPACE_FOR_1_DIV_4_STEP)
{ {
SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, MOTOR_PWM_CURRENT_2);
MOTOR_PWM_CURRENT_2 | MOTOR1_GPO_VALUE_0);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
@ -503,8 +500,7 @@ SetMotorCurrentAndPhase (ASIC * chip,
} }
else if (MotorCurrentAndPhase->MoveType == _32_TABLE_SPACE_FOR_1_DIV_8_STEP) else if (MotorCurrentAndPhase->MoveType == _32_TABLE_SPACE_FOR_1_DIV_8_STEP)
{ {
SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, SendData (chip, ES01_AB_PWM_CURRENT_CONTROL, MOTOR_PWM_CURRENT_3);
MOTOR_PWM_CURRENT_3 | MOTOR1_GPO_VALUE_0);
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
{ {
@ -1038,7 +1034,7 @@ InitTiming (ASIC * chip)
chip->Timing.CCD_DummyCycleTiming = 0; chip->Timing.CCD_DummyCycleTiming = 0;
chip->Timing.PHTG_PulseWidth = 12; chip->Timing.PHTG_PulseWidth = 12;
chip->Timing.PHTG_WaitWidth = 1; chip->Timing.PHTG_WaitWidth = 1;
chip->Timing.PHTG_TimingAdj = 1; chip->Timing.PHTG_TimingAdj = PHTG_INVERT_OUTPUT_ENABLE;
chip->Timing.PHTG_TimingSetup = 0; chip->Timing.PHTG_TimingSetup = 0;
chip->Timing.ChannelR_StartPixel = 100; chip->Timing.ChannelR_StartPixel = 100;
chip->Timing.ChannelR_EndPixel = 200; chip->Timing.ChannelR_EndPixel = 200;

3
backend/mustek_usb2_asic.h
Wyświetl plik

@ -559,7 +559,7 @@ typedef struct
/* bit[0] */ /* bit[0] */
#define PHTG_INVERT_OUTPUT_ENABLE 0x01 #define PHTG_INVERT_OUTPUT_ENABLE 0x01
/* bit[1] */ /* bit[1] */
#define TWO_TG 0x01 #define TWO_TG 0x02
#define MULTI_TG 0x00 #define MULTI_TG 0x00
/* bit[3:2] */ /* bit[3:2] */
#define CCD_PIXEL_MODE_RED 0x0C #define CCD_PIXEL_MODE_RED 0x0C
@ -974,6 +974,7 @@ typedef struct
#define ES01_2CE_VALID_PIXEL_PARAMETER_OF_SEGMENT15 0x2CE #define ES01_2CE_VALID_PIXEL_PARAMETER_OF_SEGMENT15 0x2CE
#define ES01_2CF_VALID_PIXEL_PARAMETER_OF_SEGMENT16 0x2CF #define ES01_2CF_VALID_PIXEL_PARAMETER_OF_SEGMENT16 0x2CF
extern const ASIC_ModelParams paramsMustekBP2448TAPro; extern const ASIC_ModelParams paramsMustekBP2448TAPro;
extern const ASIC_ModelParams paramsMicrotek4800H48U; extern const ASIC_ModelParams paramsMicrotek4800H48U;