cmodules: Fix merge conflicts (add omv module)

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

Author: hlym123

docs/Makefile

@@ -5,7 +5,7 @@
 # from the environment for the first two.
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = en
+SOURCEDIR     = zh_CN
 BUILDDIR      = build/$(SOURCEDIR)
 
 # Put it first so that "make" without argument is like "make help".

docs/_static/software/camera/camera_display.svg

@@ -2,7 +2,7 @@
 =====================================
 The camera module is used for taking pictures.
 
-.. include:: ../refs/software.camera.ref
+.. include:: ../refs/hardware.camera.ref
 
 .. note:: This module is only applicable to the CoreS3 Controller
 
@@ -15,7 +15,7 @@ Micropython Example
 capture display 
 ++++++++++++++++++++++++++++
 
-    .. literalinclude:: ../../../examples/softwave/camera/cores3_example_camera_display.py
+    .. literalinclude:: ../../../examples/hardware/camera/cores3_example_camera_display.py
         :language: python
         :linenos:
 

docs/_static/software/dl/human_face_detect.svg

@@ -15,3 +15,5 @@ Hardware
     rotary.rst
     speaker.rst
     wdt.rst
+    camera.rst
+    display.rst