diff --git a/.gitmodules b/.gitmodules index fae227a..c0fb768 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "assignment_3/thermostat_shield/AltiumLib"] path = assignment_3/thermostat_shield/AltiumLib url = git@gitlab.com:hoo2/altium-lib.git +[submodule "assignment_3/Libraries/STM32CubeF4"] + path = assignment_3/Libraries/STM32CubeF4 + url = https://github.com/STMicroelectronics/STM32CubeF4.git +[submodule "assignment_3/report/config"] + path = assignment_3/report/config + url = https://git.hoo2.net/hoo2/LaTeX_confing.git diff --git a/assignment_3/Libraries/STM32CubeF4 b/assignment_3/Libraries/STM32CubeF4 new file mode 160000 index 0000000..5d01400 --- /dev/null +++ b/assignment_3/Libraries/STM32CubeF4 @@ -0,0 +1 @@ +Subproject commit 5d01400afd60410f6e049cbd19179a67d44d53fd diff --git a/assignment_3/report/config b/assignment_3/report/config new file mode 160000 index 0000000..c27d16e --- /dev/null +++ b/assignment_3/report/config @@ -0,0 +1 @@ +Subproject commit c27d16e915615bc56a7b09f56e882661ac69b860 diff --git a/assignment_3/thermostat_shield/Main.SchDoc b/assignment_3/thermostat_shield/Main.SchDoc index b93709a..49d57bb 100755 Binary files a/assignment_3/thermostat_shield/Main.SchDoc and b/assignment_3/thermostat_shield/Main.SchDoc differ diff --git a/assignment_3/thermostat_shield/Output/Thermostat.pdf b/assignment_3/thermostat_shield/Output/Thermostat.pdf new file mode 100755 index 0000000..128abfb Binary files /dev/null and b/assignment_3/thermostat_shield/Output/Thermostat.pdf differ diff --git a/assignment_3/thermostat_shield/Thermostat.OutJob b/assignment_3/thermostat_shield/Thermostat.OutJob new file mode 100755 index 0000000..560c59a --- /dev/null +++ b/assignment_3/thermostat_shield/Thermostat.OutJob @@ -0,0 +1,143 @@ +[OutputJobFile] +Version=1.0 +Caption= +Description= +VaultGUID= +ItemGUID= +ItemHRID= +RevisionGUID= +RevisionId= +VaultHRID= +AutoItemHRID= +NextRevId= +FolderGUID= +LifeCycleDefinitionGUID= +RevisionNamingSchemeGUID= + +[PublishSettings] +OutputFilePath2=\\vmware-host\Shared Folders\Shares\Micro\assignment_3\thermostat_shield\.PDF +ReleaseManaged2=0 +OutputBasePath2=\\vmware-host\Shared Folders\Shares\Micro\assignment_3\thermostat_shield\ +OutputPathMedia2= +OutputPathMediaValue2= +OutputPathOutputer2=[Output Type] +OutputPathOutputerPrefix2= +OutputPathOutputerValue2= +OutputFileName2=Thermostat.pdf +OutputFileNameMulti2= +UseOutputNameForMulti2=1 +OutputFileNameSpecial2= +OpenOutput2=1 +PromptOverwrite2=1 +PublishMethod2=0 +ZoomLevel2=50 +FitSCHPrintSizeToDoc2=0 +FitPCBPrintSizeToDoc2=0 +GenerateNetsInfo2=1 +MarkPins2=1 +MarkNetLabels2=1 +MarkPortsId2=1 +GenerateTOC=1 +ShowComponentParameters2=1 +GlobalBookmarks2=0 +OutputFilePath3= +ReleaseManaged3=1 +OutputBasePath3= +OutputPathMedia3= +OutputPathMediaValue3= +OutputPathOutputer3=[Output Type] +OutputPathOutputerPrefix3= +OutputPathOutputerValue3= +OutputFileName3= +OutputFileNameMulti3= +UseOutputNameForMulti3=1 +OutputFileNameSpecial3= +OpenOutput3=1 +OutputFilePath4= +ReleaseManaged4=1 +OutputBasePath4= +OutputPathMedia4= +OutputPathMediaValue4= +OutputPathOutputer4=[Output Type] +OutputPathOutputerPrefix4= +OutputPathOutputerValue4= +OutputFileName4= +OutputFileNameMulti4= +UseOutputNameForMulti4=1 +OutputFileNameSpecial4= +OpenOutput4=1 +PromptOverwrite4=1 +PublishMethod4=5 +ZoomLevel4=50 +FitSCHPrintSizeToDoc4=1 +FitPCBPrintSizeToDoc4=1 +GenerateNetsInfo4=1 +MarkPins4=1 +MarkNetLabels4=1 +MarkPortsId4=1 +MediaFormat4=Windows Media file (*.wmv,*.wma,*.asf) +FixedDimensions4=1 +Width4=352 +Height4=288 +MultiFile4=0 +FramesPerSecond4=25 +FramesPerSecondDenom4=1 +AviPixelFormat4=7 +AviCompression4=MP42 MS-MPEG4 V2 +AviQuality4=100 +FFmpegVideoCodecId4=13 +FFmpegPixelFormat4=0 +FFmpegQuality4=80 +WmvVideoCodecName4=Windows Media Video V7 +WmvQuality4=80 + +[GeneratedFilesSettings] +RelativeOutputPath2=\\vmware-host\Shared Folders\Shares\Micro\assignment_3\thermostat_shield\.PDF +OpenOutputs2=1 +RelativeOutputPath3= +OpenOutputs3=1 +AddToProject3=1 +TimestampFolder3=0 +UseOutputName3=0 +OpenODBOutput3=0 +OpenGerberOutput3=0 +OpenNCDrillOutput3=0 +OpenIPCOutput3=0 +EnableReload3=0 +RelativeOutputPath4= +OpenOutputs4=1 + +[OutputGroup1] +Name= +Description= +TargetOutputMedium=PDF +VariantName=[No Variations] +VariantScope=0 +CurrentConfigurationName= +TargetPrinter=Virtual Printer +PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 +OutputMedium1=Print Job +OutputMedium1_Type=Printer +OutputMedium1_Printer= +OutputMedium1_PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 +OutputMedium2=PDF +OutputMedium2_Type=Publish +OutputMedium3=Folder Structure +OutputMedium3_Type=GeneratedFiles +OutputMedium4=Video +OutputMedium4_Type=Multimedia +OutputType1=Schematic Print +OutputName1=Schematic Prints +OutputCategory1=Documentation +OutputDocumentPath1= +OutputVariantName1= +OutputEnabled1=1 +OutputEnabled1_OutputMedium1=0 +OutputEnabled1_OutputMedium2=1 +OutputEnabled1_OutputMedium3=0 +OutputEnabled1_OutputMedium4=0 +OutputDefault1=0 +PageOptions1=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|PrintScale=1.09|XCorrection=1.00|YCorrection=1.00|PrintKind=0|BorderSize=5000000|LeftOffset=0|BottomOffset=0|Orientation=2|PaperLength=1000|PaperWidth=1000|Scale=100|PaperSource=7|PrintQuality=-3|MediaType=1|DitherType=10|PrintScaleMode=1|PaperKind=A4|PaperIndex=9 +Configuration1_Name1=OutputConfigurationParameter1 +Configuration1_Item1=Record=SchPrintView|ShowNoERC=True|ShowParamSet=True|ShowProbe=True|ShowBlanket=True|NoERCSymbolsToShow="Thin Cross","Thick Cross","Small Cross",Checkbox,Triangle|ShowNote=True|ShowNoteCollapsed=True|ExpandDesignator=True|ExpandNetLabel=False|ExpandPort=False|ExpandSheetNum=False|ExpandDocNum=False|PrintArea=0|PrintAreaRect.X1=0|PrintAreaRect.Y1=0|PrintAreaRect.X2=0|PrintAreaRect.Y2=0 + diff --git a/assignment_3/thermostat_shield/Thermostat.PrjPCB b/assignment_3/thermostat_shield/Thermostat.PrjPCB index 65ef376..aca7e46 100755 --- a/assignment_3/thermostat_shield/Thermostat.PrjPCB +++ b/assignment_3/thermostat_shield/Thermostat.PrjPCB @@ -28,7 +28,7 @@ PowerPortNamesTakePriority=0 PushECOToAnnotationFile=1 DItemRevisionGUID= ReportSuppressedErrorsInMessages=0 -OutputPath= +OutputPath=Project Outputs for Thermostat LogFolderPath= ManagedProjectGUID= @@ -155,6 +155,23 @@ DItemRevisionGUID= GenerateClassCluster=0 DocumentUniqueId=TKJADFBV +[Document8] +DocumentPath=Thermostat.OutJob +AnnotationEnabled=1 +AnnotateStartValue=1 +AnnotationIndexControlEnabled=0 +AnnotateSuffix= +AnnotateScope=All +AnnotateOrder=-1 +DoLibraryUpdate=1 +DoDatabaseUpdate=1 +ClassGenCCAutoEnabled=1 +ClassGenCCAutoRoomEnabled=1 +ClassGenNCAutoScope=None +DItemRevisionGUID= +GenerateClassCluster=0 +DocumentUniqueId= + [Configuration1] Name=Default Configuration ParameterCount=0 @@ -165,6 +182,45 @@ Variant=[No Variations] GenerateBOM=1 OutputJobsCount=0 +[Generic_SmartPDF] +AutoOpenFile=-1 +AutoOpenOutJob=-1 + +[Generic_SmartPDFSettings] +ProjectMode=-1 +ZoomPrecision=50 +AddNetsInformation=-1 +AddNetPins=-1 +AddNetNetLabels=-1 +AddNetPorts=-1 +ShowComponentParameters=-1 +GlobalBookmarks=0 +ExportBOM=0 +TemplateFilename=Board Stack Report.XLT +TemplateStoreRelative=-1 +PCB_PrintColor=1 +SCH_PrintColor=0 +PrintQuality=-3 +SCH_ShowNoErc=-1 +SCH_ShowParameter=-1 +SCH_ShowProbes=-1 +SCH_ShowBlankets=-1 +SCH_NoERCSymbolsToShow="Thin Cross","Thick Cross","Small Cross",Checkbox,Triangle +SCH_ShowNote=-1 +SCH_ShowNoteCollapsed=-1 +SCH_ExpandLogicalToPhysical=0 +SCH_VariantName=[No Variations] +SCH_ExpandComponentDesignators=-1 +SCH_ExpandNetlabels=0 +SCH_ExpandPorts=0 +SCH_ExpandSheetNumber=0 +SCH_ExpandDocumentNumber=0 +SCH_HasExpandLogicalToPhysicalSheets=-1 +SaveSettingsToOutJob=-1 + +[Generic_EDE] +OutputDir=Project Outputs for Thermostat + [OutputGroup1] Name=Netlist Outputs Description= diff --git a/assignment_3/thermostat_shield/Thermostat_Shield.PcbDoc b/assignment_3/thermostat_shield/Thermostat_Shield.PcbDoc index 93090ea..bfd1f71 100755 Binary files a/assignment_3/thermostat_shield/Thermostat_Shield.PcbDoc and b/assignment_3/thermostat_shield/Thermostat_Shield.PcbDoc differ