From 025a945027e89fd2ae670cd6e8efc1b257d44a8e Mon Sep 17 00:00:00 2001 From: Ayush Shukla <71904196+ayushuk@users.noreply.github.com> Date: Sat, 18 May 2024 17:10:39 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Apply=20liblvgl=20as=20a=20defau?= =?UTF-8?q?lt=20template=20for=20PROS=204=20(#356)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index 4b195283..cc01f4f0 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -107,7 +107,7 @@ def __init__(self, file=None): needs_saving = True if self.default_libraries is None: self.default_libraries = { - 'v5': ['okapilib'], + 'v5': ['okapilib', 'liblvgl'], 'cortex': [] } needs_saving = True @@ -386,6 +386,9 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro if kwargs['version'][0] == '>' or kwargs['version'][0] == '4': libraries[proj.target].remove('okapilib') + if 'liblvgl' in libraries[proj.target] and kwargs['version'][0] != '>' and kwargs['version'][0] != '4': + libraries[proj.target].remove('liblvgl') + for library in libraries[proj.target]: try: # remove kernel version so that latest template satisfying query is correctly selected