merged for cyclop support

rody-fernandez · May 29, 2019 · d6d7f3b · d6d7f3b
1 parent dbddcf4
commit d6d7f3b
Show file tree

Hide file tree

Showing 20 changed files with 886 additions and 79 deletions.
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/fabscan/__init__.py b/src/fabscan/__init__.py
@@ -16,7 +16,7 @@ class Main(Daemon):
         def __init__(self, pidfile, configfile, basedir, host, port, debug, allowRoot, logConf):
             Daemon.__init__(self, pidfile)
 
-            self._logger =  logging.getLogger(__name__)
+            self._logger = logging.getLogger(__name__)
             self._logger.setLevel(logging.DEBUG)
             self._configfile = configfile
             self._basedir = basedir

diff --git a/src/fabscan/config/ciclop.config.json b/src/fabscan/config/ciclop.config.json
@@ -4,8 +4,8 @@
         "scans": "/home/pi/scans/"
     },
     "laser": {
-        "numbers": 2,
-        "interleaved": "True"
+        "interleaved": "True",
+        "numbers": 1
     },
     "scanner_type": "laserscanner",
     "calibration": {
@@ -15,11 +15,16 @@
             "square_size": 11,
             "rows": 6,
             "columns": 8,
-            "origin_distance": 48
+            "origin_distance": 37.2
         },
         "camera_matrix": [],
         "distortion_vector": [],
         "laser_planes": [
+            {
+                "deviation": 0,
+                "distance": 0,
+                "normal": []
+            },
             {
                 "deviation": 0,
                 "distance": 0,
@@ -38,24 +43,28 @@
         "radius": 70
     },
     "camera": {
-        "rotate": "True",
-        "type": "USBCAM",
-        "vflip": "False",
+        "resolution": {
+            "width": 1640,
+            "height": 1232
+        },
         "preview_resolution": {
-            "width": 320,
-            "height": 240
+            "width": 800,
+            "height": 600
         },
+        "rotate": "True",
         "hflip": "True",
-        "resolution": {
-            "width": 1280,
-            "height": 720
-        }
+        "vflip": "False",
+        "type": "PICAM",
+        "undistort": "False"
     },
     "serial": {
-        "baudrate": 115200,
-        "autoflash": "False",
-        "flash_baudrate": 115200,
-        "port": "/dev/ttyUSB0"
+        "plattform_type": "cyclop",
+        "baudrate": 57600,
+        "autoflash": "True",
+        "port": "/dev/ttyUSB0",
+        "flash_baudrate": 115200
     },
-    "texture_illumination": 40
-}
+    "texture_illumination": 140,
+    "keep_raw_images": "True",
+    "discoverable": "True"
+}
diff --git a/src/fabscan/config/dev.config.json b/src/fabscan/config/dev.config.json
@@ -4,7 +4,7 @@
         "scans": "/home/pi/scans/"
     },
     "laser": {
-        "interleaved": "False",
+        "interleaved": "True",
         "numbers": 2
     },
     "scanner_type": "laserscanner",