SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Merge branch 'pip2'

Browse Source
This commit is contained in:
Бычков Андрей
2022-07-22 11:18:03 +03:00
parent 12c032392c a69de63db0
commit 59c7896577
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/main/io_devices/piserial.cpp
View File

@@ -433,8 +433,13 @@ int PISerial::convertSpeed(PISerial::Speed speed) {
case S4000000: return B4000000; case S4000000: return B4000000;
default: break; default: break;
} }
#ifdef WINDOWS
piCoutObj << "Warning: Custom speed" << (int)speed;
return (int)speed;
#else
piCoutObj << "Warning: Unknown speed" << (int)speed << ", using 115200"; piCoutObj << "Warning: Unknown speed" << (int)speed << ", using 115200";
return B115200; return B115200;
#endif
} }

2
utils/code_model_generator/main.cpp
View File

@@ -423,7 +423,7 @@ void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, const PI
PIString defname = "CCM_" + PIString::fromNumber(out.hash()) + "_H"; PIString defname = "CCM_" + PIString::fromNumber(out.hash()) + "_H";
PISet<PIString> inc_files; PISet<PIString> inc_files;
piForeachC (PICodeParser::Entity * e, parser.entities) piForeachC (PICodeParser::Entity * e, parser.entities)
if (e->name.find("::") < 0 && !e->name.startsWith("_PI")) if (!e->name.startsWith("_PI"))
inc_files << e->file; inc_files << e->file;
PIVector<PIString> incf = inc_files.toVector(); PIVector<PIString> incf = inc_files.toVector();
for (auto & f: files) incf << f; for (auto & f: files) incf << f;