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

Merge branch 'patch-1' into 'master' 

Added support for Canon Pixma MX340 buttons and ADF status

See merge request sane-project/backends!513
merge-requests/540/head
Rolf Bensch 2020-09-25 14:35:40 +00:00
rodzic 72fd68cb56 4a76bbd162
commit e80612275e
1 zmienionych plików z 2 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/pixma/pixma_mp150.c
Wyświetl plik

@ -917,6 +917,7 @@ handle_interrupt (pixma_t * s, int timeout)
|| s->cfg->pid == MG5400_PID || s->cfg->pid == MG5400_PID
|| s->cfg->pid == MG6200_PID || s->cfg->pid == MG6200_PID
|| s->cfg->pid == MG6300_PID || s->cfg->pid == MG6300_PID
|| s->cfg->pid == MX340_PID
|| s->cfg->pid == MX520_PID || s->cfg->pid == MX520_PID
|| s->cfg->pid == MX720_PID || s->cfg->pid == MX720_PID
|| s->cfg->pid == MX920_PID || s->cfg->pid == MX920_PID
@ -947,7 +948,7 @@ handle_interrupt (pixma_t * s, int timeout)
* document type in buf[6] 01=Document; 02=Photo; 03=Auto Scan * document type in buf[6] 01=Document; 02=Photo; 03=Auto Scan
* ADF status in buf[8] 01 = ADF empty; 02 = ADF filled * ADF status in buf[8] 01 = ADF empty; 02 = ADF filled
* ADF orientation in buf[16] 01=Portrait; 02=Landscape */ * ADF orientation in buf[16] 01=Portrait; 02=Landscape */
if (s->cfg->pid == TR4500_PID) if (s->cfg->pid == TR4500_PID || s->cfg->pid == MX340_PID)
{ {
s->events |= (buf[6] & 0x0f) << 12; s->events |= (buf[6] & 0x0f) << 12;
s->events |= (buf[8] & 0x0f) << 20; s->events |= (buf[8] & 0x0f) << 20;