Merge branch '251-scanner-canon-mf110-910-series-is-not-supported' into 'master'

Resolve "Scanner Canon MF110/910 Series is not supported" Closes #251 See merge request sane-project/backends!742
Merge branch 'editorconfig_inline_comment' into 'master'
2024-04-25 19:40:56 +00:00 · 2024-04-19 19:53:22 +00:00 · 2024-02-26 12:00:00 +00:00 · 2022-07-22 14:04:06 -07: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
@ -985,6 +985,7 @@ const pixma_config_t pixma_iclass_devices[] = {
  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 MF113w", "Canon MF110/910 Series", MF110_PID, 600, 0, 640, 1050, 0),
  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
Ralph Little	6235a040dc	Merge branch '251-scanner-canon-mf110-910-series-is-not-supported' into 'master' Resolve "Scanner Canon MF110/910 Series is not supported" Closes #251 See merge request sane-project/backends!742	2024-04-25 19:40:56 +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
Ralph Little	0c5cd1791c	pixma: Added reported working entry for MF113w model.	2022-07-22 14:04:06 -07:00