Переглянути джерело

优化修改相机模块的名称

niujiuru 6 днів тому
батько
коміт
59fb3b6387
88 змінених файлів з 4 додано та 4 видалено
  1. 0 0
      hk_g_takephoto/readme.txt
  2. 0 0
      hk_u_takephoto/Makefile
  3. 0 0
      hk_u_takephoto/bridge.go
  4. 0 0
      hk_u_takephoto/hkcam_reset.c
  5. 0 0
      hk_u_takephoto/include/CameraParams.h
  6. 0 0
      hk_u_takephoto/include/MvCameraControl.h
  7. 0 0
      hk_u_takephoto/include/MvErrorDefine.h
  8. 0 0
      hk_u_takephoto/include/MvISPErrorDefine.h
  9. 0 0
      hk_u_takephoto/include/MvObsoleteInterfaces.h
  10. 0 0
      hk_u_takephoto/include/ObsoleteCamParams.h
  11. 0 0
      hk_u_takephoto/include/PixelType.h
  12. 0 0
      hk_u_takephoto/lib/armv7hf/CommonParameters.ini
  13. 0 0
      hk_u_takephoto/lib/armv7hf/MvProducerGEV.cti
  14. 0 0
      hk_u_takephoto/lib/armv7hf/MvProducerU3V.cti
  15. 0 0
      hk_u_takephoto/lib/armv7hf/libFormatConversion.so
  16. 0 0
      hk_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so
  17. 0 0
      hk_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so.4.5.0.3
  18. 0 0
      hk_u_takephoto/lib/armv7hf/libMVRender.so
  19. 0 0
      hk_u_takephoto/lib/armv7hf/libMediaProcess.so
  20. 0 0
      hk_u_takephoto/lib/armv7hf/libMvCameraControl.so
  21. 0 0
      hk_u_takephoto/lib/armv7hf/libMvCameraControl.so.4.5.0.3
  22. 0 0
      hk_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so
  23. 0 0
      hk_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so.4.5.0.1
  24. 0 0
      hk_u_takephoto/lib/armv7hf/libMvSDKVersion.so
  25. 0 0
      hk_u_takephoto/lib/armv7hf/libMvUsb3vTL.so
  26. 0 0
      hk_u_takephoto/lib/armv7hf/libMvUsb3vTL.so.4.5.0.3
  27. 0 0
      hk_u_takephoto/lib/armv7hf/libavutil.so
  28. 0 0
      hk_u_takephoto/lib/armv7hf/libswscale.so
  29. 0 0
      hk_u_takephoto/lib/armv7hf/libusb-1.0.so.0
  30. 0 0
      hk_u_takephoto/lib/x86_64/32/CommonParameters.ini
  31. 0 0
      hk_u_takephoto/lib/x86_64/32/MvProducerGEV.cti
  32. 0 0
      hk_u_takephoto/lib/x86_64/32/MvProducerU3V.cti
  33. 0 0
      hk_u_takephoto/lib/x86_64/32/libFormatConversion.so
  34. 0 0
      hk_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so
  35. 0 0
      hk_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so.4.5.0.3
  36. 0 0
      hk_u_takephoto/lib/x86_64/32/libMVRender.so
  37. 0 0
      hk_u_takephoto/lib/x86_64/32/libMediaProcess.so
  38. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvCameraControl.so
  39. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvCameraControl.so.4.5.0.3
  40. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so
  41. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so.4.5.0.1
  42. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvSDKVersion.so
  43. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so
  44. 0 0
      hk_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so.4.5.0.3
  45. 0 0
      hk_u_takephoto/lib/x86_64/32/libavutil.so
  46. 0 0
      hk_u_takephoto/lib/x86_64/32/libswscale.so
  47. 0 0
      hk_u_takephoto/lib/x86_64/32/libusb-1.0.so.0
  48. 0 0
      hk_u_takephoto/lib/x86_64/64/CommonParameters.ini
  49. 0 0
      hk_u_takephoto/lib/x86_64/64/MvFGProducerCML.cti
  50. 0 0
      hk_u_takephoto/lib/x86_64/64/MvFGProducerCXP.cti
  51. 0 0
      hk_u_takephoto/lib/x86_64/64/MvFGProducerGEV.cti
  52. 0 0
      hk_u_takephoto/lib/x86_64/64/MvFGProducerXoF.cti
  53. 0 0
      hk_u_takephoto/lib/x86_64/64/MvProducerGEV.cti
  54. 0 0
      hk_u_takephoto/lib/x86_64/64/MvProducerU3V.cti
  55. 0 0
      hk_u_takephoto/lib/x86_64/64/libCLAllSerial_gcc485_v3_0.so
  56. 0 0
      hk_u_takephoto/lib/x86_64/64/libCLProtocol_gcc485_v3_0.so
  57. 0 0
      hk_u_takephoto/lib/x86_64/64/libCLSerCOM.so
  58. 0 0
      hk_u_takephoto/lib/x86_64/64/libCLSerHvc.so
  59. 0 0
      hk_u_takephoto/lib/x86_64/64/libFormatConversion.so
  60. 0 0
      hk_u_takephoto/lib/x86_64/64/libGCBase_gcc485_v3_0.so
  61. 0 0
      hk_u_takephoto/lib/x86_64/64/libGenCP_gcc485_v3_0.so
  62. 0 0
      hk_u_takephoto/lib/x86_64/64/libLog_gcc485_v3_0.so
  63. 0 0
      hk_u_takephoto/lib/x86_64/64/libMVFGControl.so
  64. 0 0
      hk_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so
  65. 0 0
      hk_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so.4.5.0.3
  66. 0 0
      hk_u_takephoto/lib/x86_64/64/libMVRender.so
  67. 0 0
      hk_u_takephoto/lib/x86_64/64/libMediaProcess.so
  68. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCamLVision.so
  69. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCamLVision.so.4.4.1.2
  70. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCameraControl.so
  71. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCameraControl.so.4.5.0.3
  72. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so
  73. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so.4.5.0.1
  74. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvSDKVersion.so
  75. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so
  76. 0 0
      hk_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so.4.5.0.3
  77. 0 0
      hk_u_takephoto/lib/x86_64/64/libavutil.so
  78. 0 0
      hk_u_takephoto/lib/x86_64/64/liblog4cpp_gcc485_v3_0.so
  79. 0 0
      hk_u_takephoto/lib/x86_64/64/libswscale.so
  80. 0 0
      hk_u_takephoto/lib/x86_64/64/libusb-1.0.so.0
  81. 0 0
      hk_u_takephoto/readme.txt
  82. 0 0
      hk_u_takephoto/takephoto.c
  83. 0 0
      hk_u_takephoto/takephoto.go
  84. 0 0
      hk_u_takephoto/takephoto.h
  85. 0 0
      hk_u_takephoto/takephoto_test.c
  86. 0 0
      hr_g_takephoto/readme.txt
  87. 0 0
      hr_u_takephoto/readme.txt
  88. 4 4
      readme.txt

mvs_g_takephoto/readme.txt → hk_g_takephoto/readme.txt


mvs_u_takephoto/Makefile → hk_u_takephoto/Makefile


mvs_u_takephoto/bridge.go → hk_u_takephoto/bridge.go


mvs_u_takephoto/hkcam_reset.c → hk_u_takephoto/hkcam_reset.c


mvs_u_takephoto/include/CameraParams.h → hk_u_takephoto/include/CameraParams.h


mvs_u_takephoto/include/MvCameraControl.h → hk_u_takephoto/include/MvCameraControl.h


mvs_u_takephoto/include/MvErrorDefine.h → hk_u_takephoto/include/MvErrorDefine.h


mvs_u_takephoto/include/MvISPErrorDefine.h → hk_u_takephoto/include/MvISPErrorDefine.h


mvs_u_takephoto/include/MvObsoleteInterfaces.h → hk_u_takephoto/include/MvObsoleteInterfaces.h


mvs_u_takephoto/include/ObsoleteCamParams.h → hk_u_takephoto/include/ObsoleteCamParams.h


mvs_u_takephoto/include/PixelType.h → hk_u_takephoto/include/PixelType.h


mvs_u_takephoto/lib/armv7hf/CommonParameters.ini → hk_u_takephoto/lib/armv7hf/CommonParameters.ini


mvs_u_takephoto/lib/armv7hf/MvProducerGEV.cti → hk_u_takephoto/lib/armv7hf/MvProducerGEV.cti


mvs_u_takephoto/lib/armv7hf/MvProducerU3V.cti → hk_u_takephoto/lib/armv7hf/MvProducerU3V.cti


mvs_u_takephoto/lib/armv7hf/libFormatConversion.so → hk_u_takephoto/lib/armv7hf/libFormatConversion.so


mvs_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so → hk_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so


mvs_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so.4.5.0.3 → hk_u_takephoto/lib/armv7hf/libMVGigEVisionSDK.so.4.5.0.3


mvs_u_takephoto/lib/armv7hf/libMVRender.so → hk_u_takephoto/lib/armv7hf/libMVRender.so


mvs_u_takephoto/lib/armv7hf/libMediaProcess.so → hk_u_takephoto/lib/armv7hf/libMediaProcess.so


mvs_u_takephoto/lib/armv7hf/libMvCameraControl.so → hk_u_takephoto/lib/armv7hf/libMvCameraControl.so


mvs_u_takephoto/lib/armv7hf/libMvCameraControl.so.4.5.0.3 → hk_u_takephoto/lib/armv7hf/libMvCameraControl.so.4.5.0.3


mvs_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so → hk_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so


mvs_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so.4.5.0.1 → hk_u_takephoto/lib/armv7hf/libMvCameraControlWrapper.so.4.5.0.1


mvs_u_takephoto/lib/armv7hf/libMvSDKVersion.so → hk_u_takephoto/lib/armv7hf/libMvSDKVersion.so


mvs_u_takephoto/lib/armv7hf/libMvUsb3vTL.so → hk_u_takephoto/lib/armv7hf/libMvUsb3vTL.so


mvs_u_takephoto/lib/armv7hf/libMvUsb3vTL.so.4.5.0.3 → hk_u_takephoto/lib/armv7hf/libMvUsb3vTL.so.4.5.0.3


mvs_u_takephoto/lib/armv7hf/libavutil.so → hk_u_takephoto/lib/armv7hf/libavutil.so


mvs_u_takephoto/lib/armv7hf/libswscale.so → hk_u_takephoto/lib/armv7hf/libswscale.so


mvs_u_takephoto/lib/armv7hf/libusb-1.0.so.0 → hk_u_takephoto/lib/armv7hf/libusb-1.0.so.0


mvs_u_takephoto/lib/x86_64/32/CommonParameters.ini → hk_u_takephoto/lib/x86_64/32/CommonParameters.ini


mvs_u_takephoto/lib/x86_64/32/MvProducerGEV.cti → hk_u_takephoto/lib/x86_64/32/MvProducerGEV.cti


mvs_u_takephoto/lib/x86_64/32/MvProducerU3V.cti → hk_u_takephoto/lib/x86_64/32/MvProducerU3V.cti


mvs_u_takephoto/lib/x86_64/32/libFormatConversion.so → hk_u_takephoto/lib/x86_64/32/libFormatConversion.so


mvs_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so → hk_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so


mvs_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/32/libMVGigEVisionSDK.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/32/libMVRender.so → hk_u_takephoto/lib/x86_64/32/libMVRender.so


mvs_u_takephoto/lib/x86_64/32/libMediaProcess.so → hk_u_takephoto/lib/x86_64/32/libMediaProcess.so


mvs_u_takephoto/lib/x86_64/32/libMvCameraControl.so → hk_u_takephoto/lib/x86_64/32/libMvCameraControl.so


mvs_u_takephoto/lib/x86_64/32/libMvCameraControl.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/32/libMvCameraControl.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so → hk_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so


mvs_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so.4.5.0.1 → hk_u_takephoto/lib/x86_64/32/libMvCameraControlWrapper.so.4.5.0.1


mvs_u_takephoto/lib/x86_64/32/libMvSDKVersion.so → hk_u_takephoto/lib/x86_64/32/libMvSDKVersion.so


mvs_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so → hk_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so


mvs_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/32/libMvUsb3vTL.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/32/libavutil.so → hk_u_takephoto/lib/x86_64/32/libavutil.so


mvs_u_takephoto/lib/x86_64/32/libswscale.so → hk_u_takephoto/lib/x86_64/32/libswscale.so


mvs_u_takephoto/lib/x86_64/32/libusb-1.0.so.0 → hk_u_takephoto/lib/x86_64/32/libusb-1.0.so.0


mvs_u_takephoto/lib/x86_64/64/CommonParameters.ini → hk_u_takephoto/lib/x86_64/64/CommonParameters.ini


mvs_u_takephoto/lib/x86_64/64/MvFGProducerCML.cti → hk_u_takephoto/lib/x86_64/64/MvFGProducerCML.cti


mvs_u_takephoto/lib/x86_64/64/MvFGProducerCXP.cti → hk_u_takephoto/lib/x86_64/64/MvFGProducerCXP.cti


mvs_u_takephoto/lib/x86_64/64/MvFGProducerGEV.cti → hk_u_takephoto/lib/x86_64/64/MvFGProducerGEV.cti


mvs_u_takephoto/lib/x86_64/64/MvFGProducerXoF.cti → hk_u_takephoto/lib/x86_64/64/MvFGProducerXoF.cti


mvs_u_takephoto/lib/x86_64/64/MvProducerGEV.cti → hk_u_takephoto/lib/x86_64/64/MvProducerGEV.cti


mvs_u_takephoto/lib/x86_64/64/MvProducerU3V.cti → hk_u_takephoto/lib/x86_64/64/MvProducerU3V.cti


mvs_u_takephoto/lib/x86_64/64/libCLAllSerial_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/libCLAllSerial_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libCLProtocol_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/libCLProtocol_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libCLSerCOM.so → hk_u_takephoto/lib/x86_64/64/libCLSerCOM.so


mvs_u_takephoto/lib/x86_64/64/libCLSerHvc.so → hk_u_takephoto/lib/x86_64/64/libCLSerHvc.so


mvs_u_takephoto/lib/x86_64/64/libFormatConversion.so → hk_u_takephoto/lib/x86_64/64/libFormatConversion.so


mvs_u_takephoto/lib/x86_64/64/libGCBase_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/libGCBase_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libGenCP_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/libGenCP_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libLog_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/libLog_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libMVFGControl.so → hk_u_takephoto/lib/x86_64/64/libMVFGControl.so


mvs_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so → hk_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so


mvs_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/64/libMVGigEVisionSDK.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/64/libMVRender.so → hk_u_takephoto/lib/x86_64/64/libMVRender.so


mvs_u_takephoto/lib/x86_64/64/libMediaProcess.so → hk_u_takephoto/lib/x86_64/64/libMediaProcess.so


mvs_u_takephoto/lib/x86_64/64/libMvCamLVision.so → hk_u_takephoto/lib/x86_64/64/libMvCamLVision.so


mvs_u_takephoto/lib/x86_64/64/libMvCamLVision.so.4.4.1.2 → hk_u_takephoto/lib/x86_64/64/libMvCamLVision.so.4.4.1.2


mvs_u_takephoto/lib/x86_64/64/libMvCameraControl.so → hk_u_takephoto/lib/x86_64/64/libMvCameraControl.so


mvs_u_takephoto/lib/x86_64/64/libMvCameraControl.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/64/libMvCameraControl.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so → hk_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so


mvs_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so.4.5.0.1 → hk_u_takephoto/lib/x86_64/64/libMvCameraControlWrapper.so.4.5.0.1


mvs_u_takephoto/lib/x86_64/64/libMvSDKVersion.so → hk_u_takephoto/lib/x86_64/64/libMvSDKVersion.so


mvs_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so → hk_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so


mvs_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so.4.5.0.3 → hk_u_takephoto/lib/x86_64/64/libMvUsb3vTL.so.4.5.0.3


mvs_u_takephoto/lib/x86_64/64/libavutil.so → hk_u_takephoto/lib/x86_64/64/libavutil.so


mvs_u_takephoto/lib/x86_64/64/liblog4cpp_gcc485_v3_0.so → hk_u_takephoto/lib/x86_64/64/liblog4cpp_gcc485_v3_0.so


mvs_u_takephoto/lib/x86_64/64/libswscale.so → hk_u_takephoto/lib/x86_64/64/libswscale.so


mvs_u_takephoto/lib/x86_64/64/libusb-1.0.so.0 → hk_u_takephoto/lib/x86_64/64/libusb-1.0.so.0


mvs_u_takephoto/readme.txt → hk_u_takephoto/readme.txt


mvs_u_takephoto/takephoto.c → hk_u_takephoto/takephoto.c


mvs_u_takephoto/takephoto.go → hk_u_takephoto/takephoto.go


mvs_u_takephoto/takephoto.h → hk_u_takephoto/takephoto.h


mvs_u_takephoto/takephoto_test.c → hk_u_takephoto/takephoto_test.c


mv_g_takephoto/readme.txt → hr_g_takephoto/readme.txt


mv_u_takephoto/readme.txt → hr_u_takephoto/readme.txt


+ 4 - 4
readme.txt

@@ -28,16 +28,16 @@ SHELL脚本封装库, 后台守护软件运行等功能, 可以平替硬件看
 09、./netmgrd
 实现联网检测、自动切换有线与移动网络及时间同步等基础网管功能
 
-10、./mv_u_takephoto  (目前尚未实现)
+10、./hr_u_takephoto  (目前尚未实现)
 华睿IRAYPLE工业相机-U口, 通过其提供的SDK, 封装实现拍照功能
 
-11、./mv_g_takephoto  (网口工业相机)
+11、./hr_g_takephoto  (网口工业相机)
 华睿IRAYPLE工业相机-G口, 通过其提供的SDK, 封装实现拍照功能
 
-12、./mvs_u_takephoto (U口-工业相机)
+12、./hk_u_takephoto  (U口-工业相机)
 海康机器人工业相机-U口, 通过海康提供的SDK, 封装实现拍照功能
 
-13、./mvs_g_takephoto (目前尚未实现)
+13、./hk_g_takephoto  (目前尚未实现)
 海康机器人工业相机-G口, 通过海康提供的SDK, 封装实现拍照功能
 
 14、./camera          (目前尚未实现)