Update UVC XU bindings to be compatible with 3.3.13 SDK

groupgets · Oct 24, 2017 · e282c96 · e282c96
1 parent 023f2e0
commit e282c96
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/video/Inc/uvc_desc_vc.h b/Middlewares/ST/STM32_USB_Device_Library/Class/video/Inc/uvc_desc_vc.h
@@ -106,11 +106,11 @@
     'a','g','c','-',
     '0','0','0','0'
   },
-  .bNumControls = 0x13,                        // Number of controls in this terminal
+  .bNumControls = 0x14,                        // Number of controls in this terminal
   .bNrInPins = 0x01,                           // Number of input pins in this terminal
   .baSourceID = { 0x02 },                      // Source ID : 2 : Connected to Proc Unit
   .bControlSize = 0x04,                        // Size of controls field for this terminal : 1 byte
-  .bmControls = { 0xff, 0xff, 0x07, 0x00 },    // Registers 0x00 to 0x48
+  .bmControls = { 0xff, 0xff, 0x0f, 0x00 },    // Registers 0x00 to 0x48
   .iExtension = 0x00,                          // String desc index : Not used
 },
 
@@ -148,11 +148,11 @@
     'r','a','d','-',
     '0','0','0','0'
   },
-  .bNumControls = 47,                          // Number of controls in this terminal
+  .bNumControls = 48,                          // Number of controls in this terminal
   .bNrInPins = 0x01,                           // Number of input pins in this terminal
   .baSourceID = { 0x02 },                      // Source ID : 2 : Connected to Proc Unit
   .bControlSize = 0x08,                        // Size of controls field for this terminal : 1 byte
-  .bmControls = { 0xFF, 0xFF, 0xFF, 0x81, 0xFC, 0xCF, 0xFF, 0x01 },    // Registers 0x00 to 0x48
+  .bmControls = { 0xFF, 0xFF, 0xFF, 0x81, 0xFC, 0xCF, 0xFF, 0x03 },    // Registers 0x00 to 0x48
   .iExtension = 0x00,                          // String desc index : Not used
 },
 
@@ -169,11 +169,11 @@
     's','y','s','-',
     '0','0','0','0'
   },
-  .bNumControls = 0x12,                        // Number of controls in this terminal
+  .bNumControls = 0x17,                        // Number of controls in this terminal
   .bNrInPins = 0x01,                           // Number of input pins in this terminal
   .baSourceID = { 0x02 },                      // Source ID : 2 : Connected to Proc Unit
   .bControlSize = 0x04,                        // Size of controls field for this terminal : 1 byte
-  .bmControls = { 0xFF, 0xFF, 0x03, 0x00 },    // Registers 0x00 to 0x48
+  .bmControls = { 0xFF, 0xFF, 0x7F, 0x00 },    // Registers 0x00 to 0x48
   .iExtension = 0x00,                          // String desc index : Not used
 },
 
@@ -190,11 +190,11 @@
     'v','i','d','-',
     '0','0','0','0'
   },
-  .bNumControls = 0x0a,                        // Number of controls in this terminal
+  .bNumControls = 0x0e,                        // Number of controls in this terminal
   .bNrInPins = 0x01,                           // Number of input pins in this terminal
   .baSourceID = { 0x02 },                      // Source ID : 2 : Connected to Proc Unit
   .bControlSize = 0x04,                        // Size of controls field for this terminal : 1 byte
-  .bmControls = { 0xFF, 0x03, 0x00, 0x00 },    // Registers 0x00 to 0x48
+  .bmControls = { 0xFF, 0x3F, 0x00, 0x00 },    // Registers 0x00 to 0x48
   .iExtension = 0x00,                          // String desc index : Not used
 },
 

diff --git a/Src/usbd_uvc_lepton_xu.c b/Src/usbd_uvc_lepton_xu.c
@@ -78,6 +78,7 @@ static int8_t getAttributeLen_AGC(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_AGC_POLICY:
   case LEP_CID_AGC_HEQ_SCALE_FACTOR:
   case LEP_CID_AGC_CALC_ENABLE_STATE:
+  case LEP_CID_AGC_HEQ_LINEAR_PERCENT:
     *pbuf = 4;
     break;
   default:
@@ -158,6 +159,7 @@ static int8_t getAttributeLen_RAD(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_RAD_SHUTTER_TCP:
   case LEP_CID_RAD_LENS_TCP:
   case LEP_CID_RAD_SPOTMETER_ROI:
+  case LEP_CID_RAD_RADIO_CAL_VALUES:
     *pbuf = 8;
     break;
   case LEP_CID_RAD_TSHUTTER_MODE:
@@ -193,6 +195,12 @@ static int8_t getAttributeLen_SYS(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_SYS_FFC_SHUTTER_MODE_OBJ:
     *pbuf = 32;
     break;
+  case LEP_CID_SYS_GAIN_MODE_OBJ:
+    *pbuf = 28;
+    break;
+  case LEP_CID_SYS_BORESIGHT_VALUES:
+    *pbuf = 12;
+    break;
   case LEP_CID_SYS_CAM_STATUS:
   case LEP_CID_SYS_FLIR_SERIAL_NUMBER:
   case LEP_CID_SYS_SCENE_STATISTICS:
@@ -205,6 +213,9 @@ static int8_t getAttributeLen_SYS(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_SYS_NUM_FRAMES_TO_AVERAGE:
   case LEP_CID_SYS_SHUTTER_POSITION:
   case LEP_CID_SYS_FFC_STATUS:
+  case LEP_CID_SYS_GAIN_MODE:
+  case LEP_CID_SYS_FFC_STATE:
+  case LEP_CID_SYS_GAIN_MODE_DESIRED_FLAG:
     *pbuf = 4;
     break;
   case LEP_CID_SYS_PING:
@@ -226,6 +237,9 @@ static int8_t getAttributeLen_VID(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_VID_LUT_TRANSFER:
     *pbuf = 1024;
     break;
+  case LEP_CID_VID_BORESIGHT_COORDINATES:
+    *pbuf = 32;
+    break;
   case LEP_CID_VID_FOCUS_ROI:
     *pbuf = 8;
     break;
@@ -236,6 +250,9 @@ static int8_t getAttributeLen_VID(uint16_t module_register, uint16_t *pbuf)
   case LEP_CID_VID_FOCUS_THRESHOLD:
   case LEP_CID_VID_SBNUC_ENABLE:
   case LEP_CID_VID_FREEZE_ENABLE:
+  case LEP_CID_VID_BORESIGHT_CALC_ENABLE:
+  case LEP_CID_VID_VIDEO_OUTPUT_FORMAT:
+  case LEP_CID_VID_LOW_GAIN_COLOR_LUT:
     *pbuf = 4;
     break;
   default: