{"id":2326,"url":"https://patchwork.libcamera.org/api/patches/2326/?format=json","web_url":"https://patchwork.libcamera.org/patch/2326/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191119164421.68983-3-jacopo@jmondi.org>","date":"2019-11-19T16:44:17","name":"[libcamera-devel,RFC,2/6] libcamera: controls: Add 'values' to Control","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f6bb583c02f37dc95d38c6645061ccbaae33ec16","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/2326/mbox/","series":[{"id":571,"url":"https://patchwork.libcamera.org/api/series/571/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=571","date":"2019-11-19T16:44:15","name":"Collect Camera properties","version":1,"mbox":"https://patchwork.libcamera.org/series/571/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2326/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2326/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAA626138B\n\tfor ;\n\tTue, 19 Nov 2019 17:42:26 +0100 (CET)","from uno.lan (93-34-114-233.ip49.fastwebnet.it [93.34.114.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 49E9E20013;\n\tTue, 19 Nov 2019 16:42:26 +0000 (UTC)"],"X-Originating-IP":"93.34.114.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 Nov 2019 17:44:17 +0100","Message-Id":"<20191119164421.68983-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191119164421.68983-1-jacopo@jmondi.org>","References":"<20191119164421.68983-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC 2/6] libcamera: controls: Add 'values' to\n\tControl","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 19 Nov 2019 16:42:26 -0000"},"content":"In preparation to add libcamera Camera properties definition, re-using\nthe control generation framework, augment the gen_controls.py script to\nsupport parsing possible Control and Properties values defined in the\ninput yaml file.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/gen-controls.py | 35 +++++++++++++++++++++++++++++++++++\n 1 file changed, 35 insertions(+)","diff":"diff --git a/src/libcamera/gen-controls.py b/src/libcamera/gen-controls.py\nindex 940386cc68c8..920bb9f350d6 100755\n--- a/src/libcamera/gen-controls.py\n+++ b/src/libcamera/gen-controls.py\n@@ -11,6 +11,24 @@ import string\n import sys\n import yaml\n \n+class define:\n+ doc_template = string.Template('''/**\n+ * \\\\def ${name}\n+ * \\\\brief ${description} */''')\n+ def_template = string.Template('''#define ${name} ${value}''')\n+\n+ def __init__(self, value):\n+ self.info = {\n+ 'name': value['name'],\n+ 'value': value['value'],\n+ 'description': value['description']\n+ }\n+\n+ def dumpDoc(self):\n+ return self.doc_template.substitute(self.info)\n+\n+ def dumpDef(self):\n+ return self.def_template.substitute(self.info)\n \n def snake_case(s):\n return ''.join([c.isupper() and ('_' + c) or c for c in s]).strip('_')\n@@ -35,14 +53,23 @@ ${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 v in values:\n+ ctrls_doc.append(define(v).dumpDoc())\n ctrls_doc.append(doc_template.substitute(info))\n+\n ctrls_def.append(def_template.substitute(info))\n ctrls_map.append('\\t{ ' + id_name + ', &' + name + ' },')\n \n@@ -66,11 +93,19 @@ 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 v in values:\n+ ctrls.append(define(v).dumpDef())\n ctrls.append(template.substitute(info))\n id_value += 1\n \n","prefixes":["libcamera-devel","RFC","2/6"]}