From 04f7da680607cc81ee62e2bcee2b28d51ad49332 Mon Sep 17 00:00:00 2001
From: amalcor <amalio.coron@student-cs.Fr>
Date: Fri, 30 Nov 2018 20:59:41 +0100
Subject: [PATCH] =?UTF-8?q?FOnction=20compl=C3=A9t=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/inspectionProfiles/Project_Default.xml | 4 +
viscaoveriplib/commands_library.py | 95 ++++++++++++++------
2 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7518cc8..563625b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -12,6 +12,10 @@
<option value="E501" />
<option value="W29" />
<option value="E501" />
+ <option value="W29" />
+ <option value="E501" />
+ <option value="W29" />
+ <option value="E501" />
</list>
</option>
</inspection_tool>
diff --git a/viscaoveriplib/commands_library.py b/viscaoveriplib/commands_library.py
index 28bf3b6..36b190c 100644
--- a/viscaoveriplib/commands_library.py
+++ b/viscaoveriplib/commands_library.py
@@ -27,7 +27,7 @@ class Camera:
self.send_payload(payloadtype,payload)
def digital_zoom_on(self):
payloadtype='01 00'
- payload='81 01 04 06 03 FF'
+ payload="81 01 04 06 03 FF"
self.send_payload(payloadtype,payload)
#CAM_Focus : Focus Control
@@ -65,25 +65,38 @@ class Camera:
#CAM_WB : White Balance
def wb_auto(self): #Normal Auto
- 8x 01 04 35 00 FF
+ payloadtype='01 00'
+ payload="8x 01 04 35 00 FF"
def wb_indoor(self): #Indoor Mode
- 8x 01 04 35 01 FF
+ payloadtype='01 00'
+ payload="8x 01 04 35 01 FF"
+ self.send_payload(payloadtype,payload)
def wb_outdoor(self): #Outdoor Mode
- 8x 01 04 35 02 FF
+ payloadtype='01 00'
+ payload="81 01 04 35 02 FF"
+ self.send_payload(payloadtype,payload)
def wb_one_push(self): #One push white balance
- 8x 01 04 35 03 FF
+ payloadtype='01 00'
+ payload="81 01 04 35 03 FF"
+ self.send_payload(payloadtype,payload)
def wb_auto_tracing(self): #Auto tracing white balance
- 8x 01 04 35 04 FF
+ payloadtype='01 00'
+ payload="81 01 04 35 04 FF"
+ self.send_payload(payloadtype,payload)
def wb_manual(self): #Manual Control
- 8x 01 04 35 05 FF
+ payloadtype='01 00'
+ payload="81 01 04 35 05 FF"
+ self.send_payload(payloadtype,payload)
def wb_one_push_trigger(self): #One Push WB trigger
- 8x 01 04 10 05 FF
+ payloadtype='01 00'
+ payload="81 01 04 10 05 FF"
+ self.send_payload(payloadtype,payload)
#TOTERMINER
@@ -94,26 +107,40 @@ class Camera:
#CAM_AE : Exposure settings
def ae_full_auto(self): #Automatic Exposure mode
- 8x 01 04 39 00 FF
+ payloadtype='01 00'
+ payload="81 01 04 39 00 FF"
+ self.send_payload(payloadtype,payload)
def ae_manual(self): #Manual Control mode
- 8x 01 04 39 03 FF
+ payloadtype='01 00'
+ payload="81 01 04 39 03 FF"
+ self.send_payload(payloadtype,payload)
def ae_shutter_priority(self): #Shutter priority exposure mode
- 8x 01 04 39 0A FF
+ payloadtype='01 00'
+ payload="81 01 04 39 0A FF"
+ self.send_payload(payloadtype,payload)
def ae_iris_priority(self): #Iris priority exposure mode
- 8x 01 04 39 0B FF
+ payloadtype='01 00'
+ payload="81 01 04 39 0B FF"
+ self.send_payload(payloadtype,payload)
def ae_bright(self): # Bright mode (manual control)
- 8x 01 04 39 0D FF
+ payloadtype='01 00'
+ payload="81 01 04 39 0D FF"
+ self.send_payload(payloadtype,payload)
#CAM_Slowshutter : auto slow shutter ON/OFF
def slow_shutter_on(self):
- 8x 01 04 5A 02 FF
+ payloadtype='01 00'
+ payload="81 01 04 5A 02 FF"
+ self.send_payload(payloadtype,payload)
def slow_shutter_off(self):
- 8x 01 04 5A 03 FF
+ payloadtype='01 00'
+ payload="81 01 04 5A 03 FF"
+ self.send_payload(payloadtype,payload)
#CAM_shutter
@@ -137,29 +164,45 @@ class Camera:
#CAM_Backlight : Back Light Comp ON/OFF
def backlight_on(self):
- 8x 01 04 33 02 FF
+ payloadtype='01 00'
+ payload="81 01 04 33 02 FF"
+ self.send_payload(payloadtype,payload)
def backlight_off(self):
- 8x 01 04 33 03 FF
+ payloadtype='01 00'
+ payload="81 01 04 33 03 FF"
+ self.send_payload(payloadtype,payload)
#CAM_WD : Wide Dynamic Range Mode :
def wide_dynamic_off(self):
- 8x 01 7E 04 00 00 FF
+ payloadtype='01 00'
+ payload="81 01 7E 04 00 00 FF"
+ self.send_payload(payloadtype,payload)
def wide_dynamic_low(self):
- 8x 01 7E 04 00 01 FF
+ payloadtype='01 00'
+ payload="81 01 7E 04 00 01 FF"
+ self.send_payload(payloadtype,payload)
def wide_dynamic_mid(self):
- 8x 01 7E 04 00 02 FF
+ payloadtype='01 00'
+ payload="81 01 7E 04 00 02 FF"
+ self.send_payload(payloadtype,payload)
def wide_dynamic_high(self):
- 8x 01 7E 04 00 03 FF
+ payloadtype='01 00'
+ payload="81 01 7E 04 00 03 FF"
+ self.send_payload(payloadtype,payload)
#CAM_defog : defog mode : ça enlève le brouillard #WTF
def defog_on(self):
- 8x 01 04 37 02 00 FF
+ payloadtype='01 00'
+ payload="81 01 04 37 02 00 FF"
+ self.send_payload(payloadtype,payload)
def defog_off(self):
- 8x 01 04 37 03 00 FF
+ payloadtype='01 00'
+ payload="81 01 04 37 03 00 FF"
+ self.send_payload(payloadtype,payload)
#CAM_Aperture
@@ -168,8 +211,10 @@ class Camera:
#CAM_HR : High resolution mode
#CAM_NR : Noise reduction
- def noise_reduction_level(self,int): #entier entre 0= OFF et puis entre 1 et 5
- 8x 01 04 53 0p FF
+ def noise_reduction_level(self,parameter): #entier entre 0= OFF et puis entre 1 et 5
+ payloadtype='01 00'
+ payload="81 01 04 53 0"+str(parameter) + " FF"
+ self.send_payload(payloadtype,payload)
--
GitLab