Skip to content

Commit f3618f4

Browse files
🔀 Backmerge master
2 parents 842a79f + b173977 commit f3618f4

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

pip_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.1
1+
3.5.3

pros/conductor/conductor.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def __init__(self, file=None):
107107
needs_saving = True
108108
if self.default_libraries is None:
109109
self.default_libraries = {
110-
'v5': ['okapilib'],
110+
'v5': ['okapilib', 'liblvgl'],
111111
'cortex': []
112112
}
113113
needs_saving = True
@@ -383,10 +383,14 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro
383383
if not no_default_libs:
384384
libraries = self.early_access_libraries if proj.use_early_access and (kwargs.get("version", ">").startswith("4") or kwargs.get("version", ">").startswith(">")) else self.default_libraries
385385

386-
if kwargs['version'][0] == '>' or kwargs['version'][0] == '4':
387-
libraries[proj.target].remove('okapilib')
388-
386+
version = kwargs['version'][0]
389387
for library in libraries[proj.target]:
388+
if version == '>' or version == '4':
389+
if library == "okapilib":
390+
continue
391+
if version != '>' and version != '4':
392+
if library == "liblvgl":
393+
continue
390394
try:
391395
# remove kernel version so that latest template satisfying query is correctly selected
392396
if 'version' in kwargs:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
click>=8
2-
rich-click
2+
rich-click==1.7.4
33
pyserial
44
cachetools
55
requests

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.1
1+
3.5.3

win_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.5.1.0
1+
3.5.3.0

0 commit comments

Comments
 (0)