Patch Detail
Show a patch.
GET /api/1.1/patches/2397/?format=api
{ "id": 2397, "url": "https://patchwork.libcamera.org/api/1.1/patches/2397/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2397/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20191205204350.28196-3-jacopo@jmondi.org>", "date": "2019-12-05T20:43:42", "name": "[libcamera-devel,v2,02/10] libcamera: controls: Parse 'values' in gen-controls.py", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0cf17ddc54e0e7b8cbf1728c054ad4d48271e4f0", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2397/mbox/", "series": [ { "id": 582, "url": "https://patchwork.libcamera.org/api/1.1/series/582/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=582", "date": "2019-12-05T20:43:40", "name": "Introduce camera properties", "version": 2, "mbox": "https://patchwork.libcamera.org/series/582/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2397/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2397/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 295776136C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 5 Dec 2019 21:41:50 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 610F11BF206;\n\tThu, 5 Dec 2019 20:41:48 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 5 Dec 2019 21:43:42 +0100", "Message-Id": "<20191205204350.28196-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.23.0", "In-Reply-To": "<20191205204350.28196-1-jacopo@jmondi.org>", "References": "<20191205204350.28196-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 02/10] libcamera: controls: Parse\n\t'values' in gen-controls.py", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Thu, 05 Dec 2019 20:41:50 -0000" }, "content": "In preparation to add libcamera Camera definition by re-using the\ncontrol generation framework, augment the gen_controls.py script to\nsupport parsing the 'values' yaml tag and generate documentation and\ndefinition of possible values associated with a Control or a Property.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/gen-controls.py | 34 ++++++++++++++++++++++++++++++++++\n 1 file changed, 34 insertions(+)", "diff": "diff --git a/src/libcamera/gen-controls.py b/src/libcamera/gen-controls.py\nindex 940386cc68c8..f86f01f6759b 100755\n--- a/src/libcamera/gen-controls.py\n+++ b/src/libcamera/gen-controls.py\n@@ -17,10 +17,15 @@ def snake_case(s):\n \n \n def generate_cpp(controls):\n+ value_doc_template = string.Template('''/**\n+ * \\\\def ${name}\n+ * \\\\brief ${description} */''')\n+\n doc_template = string.Template('''/**\n * \\\\var extern const Control<${type}> ${name}\n ${description}\n */''')\n+\n def_template = string.Template('extern const Control<${type}> ${name}(${id_name}, \"${name}\");')\n \n ctrls_doc = []\n@@ -35,13 +40,27 @@ ${description}\n description[0] = '\\\\brief ' + description[0]\n description = '\\n'.join([(line and ' * ' or ' *') + line for line in description])\n \n+ try:\n+ values = ctrl['values']\n+ except KeyError:\n+ values = \"\"\n+\n info = {\n 'name': name,\n 'type': ctrl['type'],\n 'description': description,\n 'id_name': id_name,\n+ 'values' : values,\n }\n \n+ for value in values:\n+ value_info = {\n+ 'name': list(value.keys())[0],\n+ 'value': value['value'],\n+ 'description': value['description']\n+ }\n+ ctrls_doc.append(value_doc_template.substitute(value_info))\n+\n ctrls_doc.append(doc_template.substitute(info))\n ctrls_def.append(def_template.substitute(info))\n ctrls_map.append('\\t{ ' + id_name + ', &' + name + ' },')\n@@ -54,6 +73,7 @@ ${description}\n \n \n def generate_h(controls):\n+ value_template = string.Template('''#define ${name} ${value}''')\n template = string.Template('''extern const Control<${type}> ${name};''')\n \n ctrls = []\n@@ -66,11 +86,25 @@ def generate_h(controls):\n \n ids.append('\\t' + id_name + ' = ' + str(id_value) + ',')\n \n+ try:\n+ values = ctrl['values']\n+ except KeyError:\n+ values = \"\"\n+\n info = {\n 'name': name,\n 'type': ctrl['type'],\n+ 'values' : values,\n }\n \n+ for value in values:\n+ value_info = {\n+ 'name': list(value.keys())[0],\n+ 'value': value['value'],\n+ 'description': value['description']\n+ }\n+ ctrls.append(value_template.substitute(value_info))\n+\n ctrls.append(template.substitute(info))\n id_value += 1\n \n", "prefixes": [ "libcamera-devel", "v2", "02/10" ] }