Merge branch '159-canon-mf113w-not-working' into 'master'

WIP: Resolve "Canon MF113W not working" Closes #159 See merge request sane-project/backends!244
Merge branch 'editorconfig_inline_comment' into 'master'
2024-04-25 12:58:09 +00:00 · 2024-04-19 19:53:22 +00:00 · 2024-02-26 12:00:00 +00:00 · 2020-08-14 20:38:33 +02:00 · 2020-08-14 20:15:12 +02:00 · 2020-06-06 13:46:30 +02:00
--- a/.editorconfig
+++ b/.editorconfig
@ -6,7 +6,8 @@
 # Your editor may need a plugin for this configuration to take effect.
 # See http://editorconfig.org/#download for details.

-root = true                     ; look no further
+; look no further
+root = true

 [*]
 charset = utf-8
--- a/backend/pixma/pixma_imageclass.c
+++ b/backend/pixma/pixma_imageclass.c
@ -984,7 +984,7 @@ const pixma_config_t pixma_iclass_devices[] = {
  DEV ("Canon imageCLASS MF634C", "MF632C/634C", MF634_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),
  DEV ("Canon imageCLASS MF733C", "MF731C/733C", MF731_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),            /* however, we need this for ethernet/wifi */
  DEV ("Canon imageCLASS D570", "D570", D570_PID, 600, 0, 640, 877, 0),
-  DEV ("Canon i-SENSYS MF110/910 Series", "MF110", MF110_PID, 600, 0, 640, 1050, 0),
+  DEV ("Canon i-SENSYS MF110/910 Series Series", "MF110", MF110_PID, 600, 0, 640, 1050, PIXMA_CAP_JPEG),
  DEV ("Canon i-SENSYS MF520 Series", "MF520", MF520_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
  DEV ("Canon i-SENSYS MF420 Series", "MF420", MF420_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
  DEV ("Canon i-SENSYS MF260 Series", "MF260", MF260_PID, 600, 0, 640, 1050, PIXMA_CAP_JPEG | PIXMA_CAP_ADFDUP),
Autor	SHA1	Wiadomość	Data
Rolf Bensch	bf08f62ad9	Merge branch '159-canon-mf113w-not-working' into 'master' WIP: Resolve "Canon MF113W not working" Closes #159 See merge request sane-project/backends!244	2024-04-25 12:58:09 +00:00
Ralph Little	0f472aa205	Merge branch 'editorconfig_inline_comment' into 'master' .editorconfig: inline comments are forbidden See merge request sane-project/backends!832	2024-04-19 19:53:22 +00:00
Guillaume Girol	a6d63a72ec	.editorconfig: inline comments are forbidden source: https://spec.editorconfig.org/#no-inline-comments this makes neovim unhappy, at least.	2024-02-26 12:00:00 +00:00
Rolf Bensch	863031ea82	fix "redefined" compile error on CI	2020-08-14 20:38:33 +02:00
Rolf Bensch	5e96ad1ccd	Merge branch 'master' into 159-canon-mf113w-not-working	2020-08-14 20:15:12 +02:00
Rolf Bensch	fe118fda01	Merge branch 'master' into 159-canon-mf113w-not-working # Conflicts solved: # backend/pixma/pixma.h	2020-06-06 13:46:30 +02:00
Rolf Bensch	46c6e05267	Merge branch 'master' into 159-canon-mf113w-not-working # Conflicts: # backend/pixma/pixma_imageclass.c	2020-03-14 13:20:53 +01:00
Rolf Bensch	ddf65b5c66	pixma: enable PIXMA_CAP_JPEG for Canon i-SENSYS MF110 Series	2020-01-05 12:51:13 +01:00
Rolf Bensch	e351d63d7e	pixma: new capability PIXMA_CAP_JPEG	2020-01-05 12:51:13 +01:00