Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 21 deletions

diff --git a/backend/genesys/enums.h b/backend/genesys/enums.h
index ae5dedd..88fc9c3 100644
--- a/backend/genesys/enums.h
+++ b/backend/genesys/enums.h
@@ -16,27 +16,6 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-   As a special exception, the authors of SANE give permission for
-   additional uses of the libraries contained in this release of SANE.
-
-   The exception is that, if you link a SANE library with other files
-   to produce an executable, this does not by itself cause the
-   resulting executable to be covered by the GNU General Public
-   License.  Your use of that executable is in no way restricted on
-   account of linking the SANE library code into it.
-
-   This exception does not, however, invalidate any other reasons why
-   the executable file might be covered by the GNU General Public
-   License.
-
-   If you submit changes to SANE to the maintainers to be included in
-   a subsequent release, you agree by submitting the changes that
-   those changes may be distributed with this exception intact.
-
-   If you write modifications of your own for SANE, it is your choice
-   whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice.
 */
 
 #ifndef BACKEND_GENESYS_ENUMS_H
@@ -372,6 +351,7 @@ enum class GpioId : unsigned
     DP665,
     DP685,
     G4050,
+    G4010,
     HP2300,
     HP2400,
     HP3670,
@@ -525,6 +505,9 @@ enum class ModelFlag : unsigned
     // disable fast feeding mode on this scanner
     DISABLE_FAST_FEEDING = 1 << 14,
 
+    // scan gray scans as color and combine on host side
+    HOST_SIDE_GRAY = 1 << 15,
+
     // the scanner uses multi-segment sensors that must be handled during calibration
     SIS_SENSOR = 1 << 16,