From 3de0e671eebc73f1fdc4d326d6370981b93ef440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CAlihossein?= Date: Tue, 10 Jun 2025 17:39:38 -0600 Subject: [PATCH 1/2] merged maui's changes --- kicad_pcb.py | 13 +++++++++---- sexp_parser | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kicad_pcb.py b/kicad_pcb.py index f45072c..f6e92f9 100644 --- a/kicad_pcb.py +++ b/kicad_pcb.py @@ -16,7 +16,7 @@ __author__ = "Zheng, Lei" __copyright__ = "Copyright 2016, Zheng, Lei" __license__ = "MIT" -__version__ = "1.0.0" +__version__ = "1.1.5" #maui __email__ = "realthunder.dev@gmail.com" __status__ = "Prototype" @@ -51,9 +51,14 @@ class KicadPCB_module(SexpParser): class KicadPCB(SexpParser): # To make sure the following key exists, and is of type SexpList - _module = ['fp_text', + _module = ['property', # maui + 'fp_text', 'fp_circle', 'fp_arc', + 'fp_line', # maui + 'fp_rect', # maui + 'fp_poly', # maui + 'zone', # maui 'pad', 'model'] @@ -65,8 +70,9 @@ class KicadPCB(SexpParser): 'gr_line', 'gr_circle', 'gr_arc', + 'gr_poly', # maui 'gr_curve', - 'gr_poly', + 'gr_rect', # maui 'segment', 'arc', 'via', @@ -91,4 +97,3 @@ def getError(self): def load(filename, quote_no_parse=None, encoding='utf-8'): with open(filename,'r', encoding=encoding) as f: return KicadPCB(parseSexp(f.read(), quote_no_parse)) - diff --git a/sexp_parser b/sexp_parser index a589906..72d2ef2 160000 --- a/sexp_parser +++ b/sexp_parser @@ -1 +1 @@ -Subproject commit a589906e42abee1a1b09caaf2a7bd5f2996923dc +Subproject commit 72d2ef2a1c895b6820af6ac9ea29e0ba6674a006 From 2404e6a54739b0bce598067f7414878d0fc12c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CAlihossein?= Date: Tue, 10 Jun 2025 17:54:04 -0600 Subject: [PATCH 2/2] Update submodule URL for sexp_parser --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index dcbc563..f8c76f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "sexp_parser"] path = sexp_parser - url = https://github.com/realthunder/sexp_parser.git + url = https://github.com/tapegoji/sexp_parser.git