diff options
Diffstat (limited to '')
| -rw-r--r-- | Lab 2.X/dist/default/debug/memoryfile.xml | 18 | ||||
| -rw-r--r-- | Lab 2.X/nbproject/configurations.xml | 190 | ||||
| -rw-r--r-- | Lab 2.X/nbproject/private/configurations.xml | 25 | ||||
| -rw-r--r-- | Lab2A.X/Lab2A.s (renamed from Lab 2.X/Lab2A.s) | 246 | ||||
| -rw-r--r-- | Lab2A.X/debug/default/defmplabxtrace.log (renamed from Lab 2.X/debug/default/defmplabxtrace.log) | 0 | ||||
| -rw-r--r-- | Lab2A.X/debug/default/defmplabxtrace.log.inx (renamed from Lab 2.X/debug/default/defmplabxtrace.log.inx) | bin | 25 -> 25 bytes | |||
| -rw-r--r-- | Lab2A.X/nbproject/Makefile-default.mk (renamed from Lab 2.X/nbproject/Makefile-default.mk) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/Makefile-genesis.properties (renamed from Lab 2.X/nbproject/Makefile-genesis.properties) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/Makefile-impl.mk (renamed from Lab 2.X/nbproject/Makefile-impl.mk) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/Makefile-local-default.mk (renamed from Lab 2.X/nbproject/Makefile-local-default.mk) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/Makefile-variables.mk (renamed from Lab 2.X/nbproject/Makefile-variables.mk) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/Package-default.bash (renamed from Lab 2.X/nbproject/Package-default.bash) | 0 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/private/private.xml (renamed from Lab 2.X/nbproject/private/private.xml) | 14 | ||||
| -rw-r--r-- | Lab2A.X/nbproject/project.xml (renamed from Lab 2.X/nbproject/project.xml) | 56 | ||||
| -rw-r--r-- | Lab2B.X/Makefile (renamed from Lab 2.X/Makefile) | 0 |
15 files changed, 157 insertions, 392 deletions
diff --git a/Lab 2.X/dist/default/debug/memoryfile.xml b/Lab 2.X/dist/default/debug/memoryfile.xml deleted file mode 100644 index a0d099a..0000000 --- a/Lab 2.X/dist/default/debug/memoryfile.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
- <executable name="dist/default/debug/Lab_2.X.debug.elf">
- <memory name="data">
- <units>bytes</units>
- <length>8192</length>
- <used>34</used>
- <free>8158</free>
- </memory>
- <memory name="program">
- <units>bytes</units>
- <length>65274</length>
- <used>408</used>
- <free>64866</free>
- </memory>
- </executable>
-</project>
diff --git a/Lab 2.X/nbproject/configurations.xml b/Lab 2.X/nbproject/configurations.xml deleted file mode 100644 index d7f4bad..0000000 --- a/Lab 2.X/nbproject/configurations.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="65">
- <logicalFolder name="root" displayName="root" projectFiles="true">
- <logicalFolder name="HeaderFiles"
- displayName="Header Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="LinkerScript"
- displayName="Linker Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="SourceFiles"
- displayName="Source Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="ExternalFiles"
- displayName="Important Files"
- projectFiles="false">
- <itemPath>Makefile</itemPath>
- </logicalFolder>
- <itemPath>Lab2A.s</itemPath>
- </logicalFolder>
- <projectmakefile>Makefile</projectmakefile>
- <confs>
- <conf name="default" type="2">
- <toolsSet>
- <developmentServer>localhost</developmentServer>
- <targetDevice>PIC24FJ64GA002</targetDevice>
- <targetHeader></targetHeader>
- <targetPluginBoard></targetPluginBoard>
- <platformTool>Simulator</platformTool>
- <languageToolchain>XC16</languageToolchain>
- <languageToolchainVersion>1.41</languageToolchainVersion>
- <platform>3</platform>
- </toolsSet>
- <packs>
- <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.1.74"/>
- </packs>
- <compileType>
- <linkerTool>
- <linkerLibItems>
- </linkerLibItems>
- </linkerTool>
- <archiverTool>
- </archiverTool>
- <loading>
- <useAlternateLoadableFile>false</useAlternateLoadableFile>
- <parseOnProdLoad>false</parseOnProdLoad>
- <alternateLoadableFile></alternateLoadableFile>
- </loading>
- <subordinates>
- </subordinates>
- </compileType>
- <makeCustomizationType>
- <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
- <makeCustomizationPreStep></makeCustomizationPreStep>
- <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
- <makeCustomizationPostStep></makeCustomizationPostStep>
- <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
- <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
- <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
- </makeCustomizationType>
- <C30>
- <property key="code-model" value="default"/>
- <property key="const-model" value="default"/>
- <property key="data-model" value="default"/>
- <property key="disable-instruction-scheduling" value="false"/>
- <property key="enable-all-warnings" value="true"/>
- <property key="enable-ansi-std" value="false"/>
- <property key="enable-ansi-warnings" value="false"/>
- <property key="enable-fatal-warnings" value="false"/>
- <property key="enable-large-arrays" value="false"/>
- <property key="enable-omit-frame-pointer" value="false"/>
- <property key="enable-procedural-abstraction" value="false"/>
- <property key="enable-short-double" value="false"/>
- <property key="enable-symbols" value="true"/>
- <property key="enable-unroll-loops" value="false"/>
- <property key="extra-include-directories" value=""/>
- <property key="isolate-each-function" value="false"/>
- <property key="keep-inline" value="false"/>
- <property key="oXC16gcc-align-arr" value="false"/>
- <property key="oXC16gcc-cnsts-mauxflash" value="false"/>
- <property key="oXC16gcc-data-sects" value="false"/>
- <property key="oXC16gcc-errata" value=""/>
- <property key="oXC16gcc-fillupper" value=""/>
- <property key="oXC16gcc-large-aggregate" value="false"/>
- <property key="oXC16gcc-mauxflash" value="false"/>
- <property key="oXC16gcc-mpa-lvl" value=""/>
- <property key="oXC16gcc-name-text-sec" value=""/>
- <property key="oXC16gcc-near-chars" value="false"/>
- <property key="oXC16gcc-no-isr-warn" value="false"/>
- <property key="oXC16gcc-sfr-warn" value="false"/>
- <property key="oXC16gcc-smar-io-lvl" value="1"/>
- <property key="oXC16gcc-smart-io-fmt" value=""/>
- <property key="optimization-level" value="0"/>
- <property key="post-instruction-scheduling" value="default"/>
- <property key="pre-instruction-scheduling" value="default"/>
- <property key="preprocessor-macros" value=""/>
- <property key="scalar-model" value="default"/>
- <property key="use-cci" value="false"/>
- <property key="use-iar" value="false"/>
- </C30>
- <C30-AR>
- <property key="additional-options-chop-files" value="false"/>
- </C30-AR>
- <C30-AS>
- <property key="assembler-symbols" value=""/>
- <property key="expand-macros" value="false"/>
- <property key="extra-include-directories-for-assembler" value=""/>
- <property key="extra-include-directories-for-preprocessor" value=""/>
- <property key="false-conditionals" value="false"/>
- <property key="keep-locals" value="false"/>
- <property key="list-assembly" value="false"/>
- <property key="list-section-info" value="false"/>
- <property key="list-source" value="false"/>
- <property key="list-symbols" value="false"/>
- <property key="oXC16asm-extra-opts" value=""/>
- <property key="oXC16asm-list-to-file" value="false"/>
- <property key="omit-debug-dirs" value="false"/>
- <property key="omit-forms" value="false"/>
- <property key="preprocessor-macros" value=""/>
- <property key="relax" value="false"/>
- <property key="warning-level" value="emit-warnings"/>
- </C30-AS>
- <C30-CO>
- <property key="coverage-enable" value=""/>
- </C30-CO>
- <C30-LD>
- <property key="additional-options-use-response-files" value="false"/>
- <property key="boot-eeprom" value="no_eeprom"/>
- <property key="boot-flash" value="no_flash"/>
- <property key="boot-ram" value="no_ram"/>
- <property key="boot-write-protect" value="no_write_protect"/>
- <property key="enable-check-sections" value="false"/>
- <property key="enable-data-init" value="true"/>
- <property key="enable-default-isr" value="true"/>
- <property key="enable-handles" value="true"/>
- <property key="enable-pack-data" value="true"/>
- <property key="extra-lib-directories" value=""/>
- <property key="fill-flash-options-addr" value=""/>
- <property key="fill-flash-options-const" value=""/>
- <property key="fill-flash-options-how" value="0"/>
- <property key="fill-flash-options-inc-const" value="1"/>
- <property key="fill-flash-options-increment" value=""/>
- <property key="fill-flash-options-seq" value=""/>
- <property key="fill-flash-options-what" value="0"/>
- <property key="general-code-protect" value="no_code_protect"/>
- <property key="general-write-protect" value="no_write_protect"/>
- <property key="generate-cross-reference-file" value="false"/>
- <property key="heap-size" value=""/>
- <property key="input-libraries" value=""/>
- <property key="linker-stack" value="true"/>
- <property key="linker-symbols" value=""/>
- <property key="map-file" value="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"/>
- <property key="no-ivt" value="false"/>
- <property key="oXC16ld-extra-opts" value=""/>
- <property key="oXC16ld-fill-upper" value="0"/>
- <property key="oXC16ld-force-link" value="false"/>
- <property key="oXC16ld-no-smart-io" value="false"/>
- <property key="oXC16ld-nostdlib" value="false"/>
- <property key="oXC16ld-stackguard" value="16"/>
- <property key="preprocessor-macros" value=""/>
- <property key="remove-unused-sections" value="false"/>
- <property key="report-memory-usage" value="true"/>
- <property key="secure-eeprom" value="no_eeprom"/>
- <property key="secure-flash" value="no_flash"/>
- <property key="secure-ram" value="no_ram"/>
- <property key="secure-write-protect" value="no_write_protect"/>
- <property key="stack-size" value="16"/>
- <property key="symbol-stripping" value=""/>
- <property key="trace-symbols" value=""/>
- <property key="warn-section-align" value="false"/>
- </C30-LD>
- <C30Global>
- <property key="common-include-directories" value=""/>
- <property key="dual-boot-partition" value="0"/>
- <property key="fast-math" value="false"/>
- <property key="generic-16-bit" value="false"/>
- <property key="legacy-libc" value="true"/>
- <property key="mpreserve-all" value="false"/>
- <property key="oXC16glb-macros" value=""/>
- <property key="output-file-format" value="elf"/>
- <property key="preserve-all" value="false"/>
- <property key="preserve-file" value=""/>
- <property key="relaxed-math" value="false"/>
- <property key="save-temps" value="false"/>
- </C30Global>
- </conf>
- </confs>
-</configurationDescriptor>
diff --git a/Lab 2.X/nbproject/private/configurations.xml b/Lab 2.X/nbproject/private/configurations.xml deleted file mode 100644 index 6220849..0000000 --- a/Lab 2.X/nbproject/private/configurations.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="65">
- <projectmakefile>Makefile</projectmakefile>
- <defaultConf>0</defaultConf>
- <confs>
- <conf name="default" type="2">
- <platformToolSN></platformToolSN>
- <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.41\bin</languageToolchainDir>
- <mdbdebugger version="1">
- <placeholder1>place holder 1</placeholder1>
- <placeholder2>place holder 2</placeholder2>
- </mdbdebugger>
- <runprofile version="6">
- <args></args>
- <rundir></rundir>
- <buildfirst>true</buildfirst>
- <console-type>0</console-type>
- <terminal-type>0</terminal-type>
- <remove-instrumentation>0</remove-instrumentation>
- <environment>
- </environment>
- </runprofile>
- </conf>
- </confs>
-</configurationDescriptor>
diff --git a/Lab 2.X/Lab2A.s b/Lab2A.X/Lab2A.s index fa35d55..407def8 100644 --- a/Lab 2.X/Lab2A.s +++ b/Lab2A.X/Lab2A.s @@ -1,123 +1,123 @@ -
-.include "xc.inc" ; required "boiler-plate" (BP)
-
-;the next two lines set up the actual chip for operation - required
-config __CONFIG2, POSCMOD_EC & I2C1SEL_SEC & IOL1WAY_OFF & OSCIOFNC_ON & FCKSM_CSECME & FNOSC_FRCPLL & SOSCSEL_LPSOSC & WUTSEL_FST & IESO_OFF
-config __CONFIG1, WDTPS_PS1 & FWPSA_PR32 & WINDIS_OFF & FWDTEN_OFF & BKBUG_ON & GWRP_ON & GCP_ON & JTAGEN_OFF
-
- .bss ; put the following labels in RAM
-counter:
- .space 2 ; a variable that takes two bytes (we won?t use
- ; it for now, but put here to make this a generic
- ; template to be used later).
-stack:
- .space 32 ; this will be our stack area, needed for func calls
-
-.text ; BP (put the following data in ROM(program memory))
-
-;because we are using the C compiler to assemble our code, we need a "_main" label
-;somewhere. (There's a link step that looks for it.)
-.global _main ;BP
-;your functions go here
-
-_main:
-
- bclr CLKDIV,#8 ;BP
- nop
- ;; --- Begin your main program below here ---
-
-
- mov #0x9fff,w0
- mov w0,AD1PCFG ; Set all pins to digital mode
- mov #0b1111111111111110,w0
- mov w0,TRISA ; set pin RA0 to output
- mov #0x0000,w0
- mov w0,LATA ; set pin RA0 low
- call delay_100us
- call setColor
- call foreverLoop
-
-wait_24cycles:
- ; 2 cycles for function call
- repeat #17 ; 1 cycle to load and prep
- nop ; 17+1 cycles to execute NOP 18 times
- return ; 3 cycles for the return
-
-wait_32cycles: ; 2
- repeat #24 ; 1
- nop ; 25+1 cycles = 26
- return ; 3
-
-delay_100us:
- repeat #1593
- nop
- return
-
-delay_1ms:
- repeat #15993
- nop
- return
-
-write_bit_stream:
- call wait_24cycles ; 24 cycles
- clr LATA ; set pin RA0 low = 1 cycle
- call wait_32cycles ; 32 cycles
- inc LATA ; set pin RA0 high = 1 cycle
- return
-
-write_0: ;2 cycles for function call
- inc LATA ;1
- repeat #3 ;1 for load
- nop ;3+1=4 nop
- clr LATA ;1
- repeat #6 ;1 for load
- nop ;1+6=7 nop
- return ;3 return
-
-
-write_1: ;2 cycle call
- inc LATA ;1
- repeat #10;1 load
- nop ;1+10=11 nop
- clr LATA ;1
- nop ;1
- return ;3 return
-
-setColor:
- ;Set R
- call write_1
- call write_1
- call write_1
- call write_1
- call write_1
- call write_1
- call write_1
- call write_1
- ;Set G
- call write_1
- call write_0
- call write_0
- call write_1
- call write_1
- call write_0
- call write_1
- call write_1
- ;Set B
- call write_0
- call write_0
- call write_0
- call write_0
- call write_0
- call write_0
- call write_0
- call write_0
-
- return
-
-foreverLoop:
-; call write_bit_stream
- nop
- bra foreverLoop
-
-
-.end
+ +.include "xc.inc" ; required "boiler-plate" (BP) + +;the next two lines set up the actual chip for operation - required +config __CONFIG2, POSCMOD_EC & I2C1SEL_SEC & IOL1WAY_OFF & OSCIOFNC_ON & FCKSM_CSECME & FNOSC_FRCPLL & SOSCSEL_LPSOSC & WUTSEL_FST & IESO_OFF +config __CONFIG1, WDTPS_PS1 & FWPSA_PR32 & WINDIS_OFF & FWDTEN_OFF & BKBUG_ON & GWRP_ON & GCP_ON & JTAGEN_OFF + + .bss ; put the following labels in RAM +counter: + .space 2 ; a variable that takes two bytes (we won?t use + ; it for now, but put here to make this a generic + ; template to be used later). +stack: + .space 32 ; this will be our stack area, needed for func calls + +.text ; BP (put the following data in ROM(program memory)) + +;because we are using the C compiler to assemble our code, we need a "_main" label +;somewhere. (There's a link step that looks for it.) +.global _main ;BP +;your functions go here + +_main: + + bclr CLKDIV,#8 ;BP + nop + ;; --- Begin your main program below here --- + + + mov #0x9fff,w0 + mov w0,AD1PCFG ; Set all pins to digital mode + mov #0b1111111111111110,w0 + mov w0,TRISA ; set pin RA0 to output + mov #0x0000,w0 + mov w0,LATA ; set pin RA0 low + call delay_100us + call setColor + call foreverLoop + +wait_24cycles: + ; 2 cycles for function call + repeat #17 ; 1 cycle to load and prep + nop ; 17+1 cycles to execute NOP 18 times + return ; 3 cycles for the return + +wait_32cycles: ; 2 + repeat #24 ; 1 + nop ; 25+1 cycles = 26 + return ; 3 + +delay_100us: + repeat #1593 + nop + return + +delay_1ms: + repeat #15993 + nop + return + +write_bit_stream: + call wait_24cycles ; 24 cycles + clr LATA ; set pin RA0 low = 1 cycle + call wait_32cycles ; 32 cycles + inc LATA ; set pin RA0 high = 1 cycle + return + +write_0: ;2 cycles for function call + inc LATA ;1 + repeat #3 ;1 for load + nop ;3+1=4 nop + clr LATA ;1 + repeat #6 ;1 for load + nop ;1+6=7 nop + return ;3 return + + +write_1: ;2 cycle call + inc LATA ;1 + repeat #10;1 load + nop ;1+10=11 nop + clr LATA ;1 + nop ;1 + return ;3 return + +setColor: + ;Set R + call write_1 + call write_1 + call write_1 + call write_1 + call write_1 + call write_1 + call write_1 + call write_1 + ;Set G + call write_1 + call write_0 + call write_0 + call write_1 + call write_1 + call write_0 + call write_1 + call write_1 + ;Set B + call write_0 + call write_0 + call write_0 + call write_0 + call write_0 + call write_0 + call write_0 + call write_0 + + return + +foreverLoop: +; call write_bit_stream + nop + bra foreverLoop + + +.end diff --git a/Lab 2.X/debug/default/defmplabxtrace.log b/Lab2A.X/debug/default/defmplabxtrace.log index e69de29..e69de29 100644 --- a/Lab 2.X/debug/default/defmplabxtrace.log +++ b/Lab2A.X/debug/default/defmplabxtrace.log diff --git a/Lab 2.X/debug/default/defmplabxtrace.log.inx b/Lab2A.X/debug/default/defmplabxtrace.log.inx Binary files differindex 87765a0..87765a0 100644 --- a/Lab 2.X/debug/default/defmplabxtrace.log.inx +++ b/Lab2A.X/debug/default/defmplabxtrace.log.inx diff --git a/Lab 2.X/nbproject/Makefile-default.mk b/Lab2A.X/nbproject/Makefile-default.mk index 8201bc4..8201bc4 100644 --- a/Lab 2.X/nbproject/Makefile-default.mk +++ b/Lab2A.X/nbproject/Makefile-default.mk diff --git a/Lab 2.X/nbproject/Makefile-genesis.properties b/Lab2A.X/nbproject/Makefile-genesis.properties index 114011e..114011e 100644 --- a/Lab 2.X/nbproject/Makefile-genesis.properties +++ b/Lab2A.X/nbproject/Makefile-genesis.properties diff --git a/Lab 2.X/nbproject/Makefile-impl.mk b/Lab2A.X/nbproject/Makefile-impl.mk index d637c96..d637c96 100644 --- a/Lab 2.X/nbproject/Makefile-impl.mk +++ b/Lab2A.X/nbproject/Makefile-impl.mk diff --git a/Lab 2.X/nbproject/Makefile-local-default.mk b/Lab2A.X/nbproject/Makefile-local-default.mk index 214e7fa..214e7fa 100644 --- a/Lab 2.X/nbproject/Makefile-local-default.mk +++ b/Lab2A.X/nbproject/Makefile-local-default.mk diff --git a/Lab 2.X/nbproject/Makefile-variables.mk b/Lab2A.X/nbproject/Makefile-variables.mk index 358d783..358d783 100644 --- a/Lab 2.X/nbproject/Makefile-variables.mk +++ b/Lab2A.X/nbproject/Makefile-variables.mk diff --git a/Lab 2.X/nbproject/Package-default.bash b/Lab2A.X/nbproject/Package-default.bash index 6270138..6270138 100644 --- a/Lab 2.X/nbproject/Package-default.bash +++ b/Lab2A.X/nbproject/Package-default.bash diff --git a/Lab 2.X/nbproject/private/private.xml b/Lab2A.X/nbproject/private/private.xml index 284eeec..6807a2b 100644 --- a/Lab 2.X/nbproject/private/private.xml +++ b/Lab2A.X/nbproject/private/private.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
- <group/>
- </open-files>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?> +<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> + <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> + <group/> + </open-files> +</project-private> diff --git a/Lab 2.X/nbproject/project.xml b/Lab2A.X/nbproject/project.xml index 3d83cc6..07edd7c 100644 --- a/Lab 2.X/nbproject/project.xml +++ b/Lab2A.X/nbproject/project.xml @@ -1,29 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>com.microchip.mplab.nbide.embedded.makeproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>Lab_2A</name>
- <creation-uuid>a04173f8-bbe6-4995-8b6c-22a146ec3d91</creation-uuid>
- <make-project-type>0</make-project-type>
- <c-extensions/>
- <cpp-extensions/>
- <header-extensions/>
- <asminc-extensions/>
- <sourceEncoding>ISO-8859-1</sourceEncoding>
- <make-dep-projects/>
- <sourceRootList>
- <sourceRootElem>.</sourceRootElem>
- </sourceRootList>
- <confList>
- <confElem>
- <name>default</name>
- <type>2</type>
- </confElem>
- </confList>
- <formatting>
- <project-formatting-style>false</project-formatting-style>
- </formatting>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>com.microchip.mplab.nbide.embedded.makeproject</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/make-project/1"> + <name>Lab 2</name> + <creation-uuid>a04173f8-bbe6-4995-8b6c-22a146ec3d91</creation-uuid> + <make-project-type>0</make-project-type> + <c-extensions/> + <cpp-extensions/> + <header-extensions/> + <asminc-extensions/> + <sourceEncoding>ISO-8859-1</sourceEncoding> + <make-dep-projects/> + <sourceRootList/> + <confList> + <confElem> + <name>default</name> + <type>2</type> + </confElem> + </confList> + <formatting> + <project-formatting-style>false</project-formatting-style> + </formatting> + </data> + </configuration> +</project> diff --git a/Lab 2.X/Makefile b/Lab2B.X/Makefile index fca8e2c..fca8e2c 100644 --- a/Lab 2.X/Makefile +++ b/Lab2B.X/Makefile |