Merge branch 'pip2'

libs/main/io_devices/piserial.cpp

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

utils/code_model_generator/main.cpp

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