update the configfile for gigemapper, and support user to take pictur…

…es by set imagetriger

Signed-off-by: zhangyanhua <[email protected]>

mappers/gige/Dockerfile.arm64

@@ -2,6 +2,7 @@ FROM ubuntu:16.04
 WORKDIR /usr/local/bin
 COPY ./res /usr/local/res
 COPY ./bin /usr/local/bin
+COPY ./bin/librcapi_aarch64.so /usr/local/bin/librcapi.so
 COPY ./baumer/Ubuntu-16.04/arm64 /usr/local/bin/cti
 ENV GENICAM_GENTL64_PATH /usr/local/bin/cti
 RUN apt update && apt install -y libpng16-dev libjpeg9-dev

mappers/gige/Dockerfile.x64

@@ -2,6 +2,7 @@ FROM ubuntu:16.04
 WORKDIR /usr/local/bin
 COPY ./res /usr/local/res
 COPY ./bin /usr/local/bin
+COPY ./bin/librcapi_linux_x64.so /usr/local/bin/librcapi.so
 COPY ./baumer/Ubuntu-16.04/x86_64 /usr/local/bin/cti
 ENV GENICAM_GENTL64_PATH /usr/local/bin/cti
 RUN apt update && apt install -y libpng16-dev libjpeg9-dev

mappers/gige/crd_example/deviceinstance.yaml

@@ -1,12 +1,12 @@
 apiVersion: devices.kubeedge.io/v1alpha2
 kind: Device
 metadata:
-  name: camera-instance
+  name: gige-camera-instance01
   labels:
     model: camera-instance-model
 spec:
   deviceModelRef:
-    name: camera-instance-model
+    name: basler-ac5472
   protocol:
     common:
       customizedValues:
@@ -20,52 +20,52 @@ spec:
             operator: In
             values:
               - edge51
-  propertyVisitors:
-    - propertyName: PixelFormat
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+  propertyVisitors:          
+    - propertyName: PixelFormat 
+      collectCycle: 3000000000  
+      reportCycle:  3000000000
       customizedProtocol:
         protocolName: GigEVision
-        configData:
+        configData: 
           FeatureName: 'PixelFormat'
     - propertyName: ImageTrigger
-      collectCycle: -1
-      reportCycle: -1
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'ImageTrigger'
     - propertyName: ImageFormat
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'ImageFormat'
     - propertyName: ImageURL
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'ImageURL'
-    - propertyName: Width
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+    - propertyName: Width         
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'Width'
     - propertyName: Height
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'Height'
     - propertyName: OffsetX
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
@@ -78,29 +78,29 @@ spec:
         configData:
           FeatureName: 'OffsetY'
     - propertyName: AcquisitionFrameRateAbs
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'AcquisitionFrameRateAbs'
     - propertyName: AcquisitionFrameRateEnable
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'AcquisitionFrameRateEnable'
     - propertyName: ExposureTimeAbs
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
           FeatureName: 'ExposureTimeAbs'
     - propertyName: AutoFunctionAOIUsageWhiteBalance
-      collectCycle: 1000000000
-      reportCycle: 1000000000
+      collectCycle: 3000000000
+      reportCycle: 3000000000
       customizedProtocol:
         protocolName: GigEVision
         configData:
@@ -138,11 +138,11 @@ status:
       desired:
         metadata:
           type: string
-        value: ''
+        value: 'http://127.0.0.1:5000/v2/push/picture'
       reported:
         metadata:
           type: string
-        value: '192.168.137.61'
+        value: 'http://127.0.0.1:5000/v2/push/picture'
     - propertyName: Width
       desired:
         metadata:
@@ -151,16 +151,16 @@ status:
       reported:
         metadata:
           type: integer
-        value: '659'
+        value: '600'
     - propertyName: Height
       desired:
         metadata:
           type: integer
-        value: '494'
+        value: '400'
       reported:
         metadata:
           type: integer
-        value: '494'
+        value: '400'
     - propertyName: OffsetX
       desired:
         metadata:

mappers/gige/crd_example/devicemodel.yaml

@@ -1,7 +1,7 @@
 apiVersion: devices.kubeedge.io/v1alpha2
 kind: DeviceModel
 metadata:
-  name: camera-instance-model
+  name: basler-ac5472
 spec:
   properties:
     - name: PixelFormat
@@ -10,29 +10,25 @@ spec:
           accessMode: ReadWrite
           defaultValue: 'Mono8'
     - name: ImageTrigger
-      type:
-        bytes:
-          accessMode: ReadOnly
-    - name: ImageFormat
-      type:
-        boolean:
-          accessMode: ReadWrite
-          defaultValue: "jpeg"
-    - name: ImageURL
+      description:  imageproc
       type:
         string:
           accessMode: ReadWrite
+          defaultValue: 'stop'
     - name: AutoFunctionAOIUsageWhiteBalance
+      description: White Balance
       type:
         boolean:
           accessMode: ReadWrite
           defaultValue: false
-    - name: AcquisitionFrameRateEnable
+    - name: AcquisitionFrameRateEnable 
+      description:  Acquisition FrameRate
       type:
         boolean:
           accessMode: ReadWrite
           defaultValue: false
     - name: ExposureTimeAbs
+      description:  Exposure Time
       type:
         float:
           accessMode: ReadWrite
@@ -41,32 +37,49 @@ spec:
           maximum: 100000
           unit: 'us'
     - name: AcquisitionFrameRateAbs
+      description:  Acquisition Frame Rate
       type:
         float:
           accessMode: ReadWrite
           defaultValue: 10.0
           unit: 'Hz'
     - name: Width
+      description:  picture width
       type:
         int:
           accessMode: ReadWrite
           defaultValue: 659
           minimum: 0
           maximum: 659
     - name: Height
+      description:  picture height
       type:
         int:
           accessMode: ReadWrite
           defaultValue: 494
           minimum: 0
           maximum: 494
     - name: OffsetX
+      description:  offset of x
       type:
         int:
           accessMode: ReadWrite
           defaultValue: 0
     - name: OffsetY
+      description:  offset of Y
       type:
         int:
           accessMode: ReadWrite
           defaultValue: 0
+    - name: ImageFormat
+      description:  mage format, jpeg,png,pnm
+      type:
+        string:
+          accessMode: ReadWrite
+          defaultValue: "jpeg"
+    - name: ImageURL
+      description:  url for post picture
+      type:
+        string:
+          accessMode: ReadWrite
+          defaultValue: "https://127.0.0.1/push/picture"