Merge pull request #2 from tgrundle/hpj4680-fixes-1

Minors changes to support HP Office Jet 4680j
sbs20 · Jan 2, 2017 · d0dc6c2 · d0dc6c2
2 parents 46c3943 + 1c5dc71
commit d0dc6c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/classes/Api.js b/classes/Api.js
@@ -73,7 +73,7 @@ module.exports = function () {
             brightness: req.brightness,
             contrast: req.contrast,
             outputFilepath: Config.PreviewDirectory + 'preview.tif',
-            resolution: 50
+            resolution: Config.PreviewResolution
         });
 
         var scanner = new Scanimage();

diff --git a/classes/Config.js b/classes/Config.js
@@ -9,5 +9,7 @@ module.exports = {
 	OutputDirectory: './data/output/',
 	PreviewDirectory: './data/preview/',
 	MaximumScanWidthInMm: 215,
-	MaximumScanHeightInMm: 297
+	MaximumScanHeightInMm: 297,
+	PreviewResolution: 100,
+	SupportsDepth: false;
 };
diff --git a/classes/Scanimage.js b/classes/Scanimage.js
@@ -15,7 +15,10 @@ module.exports = function () {
 	var commandLine = function (scanRequest) {
 		var cmd = Config.Scanimage;
 		cmd += ' --mode ' + scanRequest.mode;
-		cmd += ' --depth ' + scanRequest.depth;
+
+		if (Config.SupportsDepth) {
+		  cmd += ' --depth ' + scanRequest.depth;
+		}
 		cmd += ' --resolution ' + scanRequest.resolution;
 		cmd += ' -l ' + scanRequest.left;
 		cmd += ' -t ' + scanRequest.top;
@@ -65,4 +68,4 @@ module.exports = function () {
 			return Q.reject(response);
 		}
 	}
-};
+};