aboutsummaryrefslogtreecommitdiffstats
path: root/Lab_2B.X
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Lab2B.X/lab2b_asm.s (renamed from Lab_2B.X/lab2b_asm.s)78
-rw-r--r--Lab2B.X/nbproject/Makefile-default.mk (renamed from Lab_2B.X/nbproject/Makefile-default.mk)24
-rw-r--r--Lab2B.X/nbproject/Makefile-impl.mk (renamed from Lab_2B.X/nbproject/Makefile-impl.mk)2
-rw-r--r--Lab2B.X/nbproject/Makefile-local-default.mk (renamed from Lab_2B.X/nbproject/Makefile-local-default.mk)25
-rw-r--r--Lab2B.X/nbproject/Makefile-variables.mk (renamed from Lab_2B.X/nbproject/Makefile-variables.mk)4
-rw-r--r--Lab2B.X/nbproject/Package-default.bash (renamed from Lab_2B.X/nbproject/Package-default.bash)4
-rw-r--r--Lab4.X/Makefile (renamed from Lab_2B.X/Makefile)0
7 files changed, 68 insertions, 69 deletions
diff --git a/Lab_2B.X/lab2b_asm.s b/Lab2B.X/lab2b_asm.s
index ddee29b..2dfc361 100644
--- a/Lab_2B.X/lab2b_asm.s
+++ b/Lab2B.X/lab2b_asm.s
@@ -1,40 +1,40 @@
-.include "xc.inc"
-
-.text ;BP (put the following data in ROM(program memory))
-
-; This is a library, thus it can *not* contain a _main function: the C file will
-; define main(). However, we
-; we will need a .global statement to make available ASM functions to C code.
-; All functions utilized outside of this file will need to have a leading
-; underscore (_) and be included in a comment delimited list below.
-.global _write_0, _write_1, _wait_100us, _wait_1ms
-
-_wait_100us:
- repeat #1593
- nop
- return
-
-_wait_1ms:
- repeat #15993
- nop
- return
-
-_write_0: ;2 cycles for function call
- inc LATA ;1
- repeat #2 ;1 for load
- nop ;2+1=3 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 #8 ;1 load
- nop ;1+9=10 nop
- clr LATA ;1
- nop ;1
- nop ;1
- return ;3 return
+.include "xc.inc"
+
+.text ;BP (put the following data in ROM(program memory))
+
+; This is a library, thus it can *not* contain a _main function: the C file will
+; define main(). However, we
+; we will need a .global statement to make available ASM functions to C code.
+; All functions utilized outside of this file will need to have a leading
+; underscore (_) and be included in a comment delimited list below.
+.global _write_0, _write_1, _wait_100us, _wait_1ms
+
+_wait_100us:
+ repeat #1593
+ nop
+ return
+
+_wait_1ms:
+ repeat #15993
+ nop
+ return
+
+_write_0: ;2 cycles for function call
+ inc LATA ;1
+ repeat #2 ;1 for load
+ nop ;2+1=3 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 #8 ;1 load
+ nop ;1+9=10 nop
+ clr LATA ;1
+ nop ;1
+ nop ;1
+ return ;3 return
\ No newline at end of file
diff --git a/Lab_2B.X/nbproject/Makefile-default.mk b/Lab2B.X/nbproject/Makefile-default.mk
index 5ab6334..27dc4d4 100644
--- a/Lab_2B.X/nbproject/Makefile-default.mk
+++ b/Lab2B.X/nbproject/Makefile-default.mk
@@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN)
IMAGE_TYPE=debug
OUTPUT_SUFFIX=elf
DEBUGGABLE_SUFFIX=elf
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
else
IMAGE_TYPE=production
OUTPUT_SUFFIX=hex
DEBUGGABLE_SUFFIX=elf
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
endif
ifeq ($(COMPARE_BUILD), true)
@@ -88,7 +88,7 @@ FIXDEPS=fixDeps
ifneq ($(INFORMATION_MESSAGE), )
@echo $(INFORMATION_MESSAGE)
endif
- ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+ ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
MP_PROCESSOR_OPTION=24FJ64GA002
MP_LINKER_FILE_OPTION=,--script=p24FJ64GA002.gld
@@ -99,7 +99,7 @@ ${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/lab2b_c.o.d
@${RM} ${OBJECTDIR}/lab2b_c.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off
@${FIXDEPS} "${OBJECTDIR}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
else
@@ -107,7 +107,7 @@ ${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/lab2b_c.o.d
@${RM} ${OBJECTDIR}/lab2b_c.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off
@${FIXDEPS} "${OBJECTDIR}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
endif
@@ -119,7 +119,7 @@ ${OBJECTDIR}/lab2b_asm.o: lab2b_asm.s nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/lab2b_asm.o.d
@${RM} ${OBJECTDIR}/lab2b_asm.o
- ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,--defsym=__ICD2RAM=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_PK3=1,-g,--no-relax$(MP_EXTRA_AS_POST) -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,--defsym=__ICD2RAM=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_PK3=1,-g,--no-relax$(MP_EXTRA_AS_POST)
@${FIXDEPS} "${OBJECTDIR}/lab2b_asm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
else
@@ -127,7 +127,7 @@ ${OBJECTDIR}/lab2b_asm.o: lab2b_asm.s nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/lab2b_asm.o.d
@${RM} ${OBJECTDIR}/lab2b_asm.o
- ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,-g,--no-relax$(MP_EXTRA_AS_POST) -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,-g,--no-relax$(MP_EXTRA_AS_POST)
@${FIXDEPS} "${OBJECTDIR}/lab2b_asm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
endif
@@ -141,15 +141,15 @@ endif
# ------------------------------------------------------------------------------------
# Rules for buildStep: link
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
- ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG=__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -mreserve=data@0x800:0x81F -mreserve=data@0x820:0x821 -mreserve=data@0x822:0x823 -mreserve=data@0x824:0x825 -mreserve=data@0x826:0x84F -Wl,,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D__DEBUG=__DEBUG,--defsym=__MPLAB_DEBUGGER_PK3=1,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST) -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG=__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -mreserve=data@0x800:0x81F -mreserve=data@0x820:0x821 -mreserve=data@0x822:0x823 -mreserve=data@0x824:0x825 -mreserve=data@0x826:0x84F -Wl,,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D__DEBUG=__DEBUG,--defsym=__MPLAB_DEBUGGER_PK3=1,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST)
else
-dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
- ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -Wl,,,--defsym=__MPLAB_BUILD=1,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST) -mdfp=${DFP_DIR}/xc16
- ${MP_CC_DIR}\\xc16-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a -omf=elf -mdfp=${DFP_DIR}/xc16
+ ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -Wl,,,--defsym=__MPLAB_BUILD=1,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST)
+ ${MP_CC_DIR}\\xc16-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a -omf=elf
endif
diff --git a/Lab_2B.X/nbproject/Makefile-impl.mk b/Lab2B.X/nbproject/Makefile-impl.mk
index d19ad88..58626eb 100644
--- a/Lab_2B.X/nbproject/Makefile-impl.mk
+++ b/Lab2B.X/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
# Project Name
-PROJECTNAME=Lab_2B.X
+PROJECTNAME=Lab2B.X
# Active Configuration
DEFAULTCONF=default
diff --git a/Lab_2B.X/nbproject/Makefile-local-default.mk b/Lab2B.X/nbproject/Makefile-local-default.mk
index 214e7fa..bb871de 100644
--- a/Lab_2B.X/nbproject/Makefile-local-default.mk
+++ b/Lab2B.X/nbproject/Makefile-local-default.mk
@@ -15,24 +15,23 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
-PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
-PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.30\sys\java\jre1.8.0_181/bin/"
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.35\sys\java\jre1.8.0_181/bin/"
OS_CURRENT="$(shell uname -s)"
-MP_CC="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-gcc.exe"
+MP_CC="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-gcc.exe"
# MP_CPPC is not defined
# MP_BC is not defined
-MP_AS="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-as.exe"
-MP_LD="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-ld.exe"
-MP_AR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-ar.exe"
-DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
-MP_CC_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
+MP_AS="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-as.exe"
+MP_LD="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-ld.exe"
+MP_AR="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-ar.exe"
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
# MP_CPPC_DIR is not defined
# MP_BC_DIR is not defined
-MP_AS_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
-MP_LD_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
-MP_AR_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
+MP_AS_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
+MP_LD_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
+MP_AR_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
# MP_BC_DIR is not defined
-DFP_DIR="C:/Program Files (x86)/Microchip/MPLABX/v5.30/packs/Microchip/PIC24F-GA-GB_DFP/1.1.74"
diff --git a/Lab_2B.X/nbproject/Makefile-variables.mk b/Lab2B.X/nbproject/Makefile-variables.mk
index 739f16b..aaa6f9f 100644
--- a/Lab_2B.X/nbproject/Makefile-variables.mk
+++ b/Lab2B.X/nbproject/Makefile-variables.mk
@@ -6,8 +6,8 @@
CND_BASEDIR=`pwd`
# default configuration
CND_ARTIFACT_DIR_default=dist/default/production
-CND_ARTIFACT_NAME_default=Lab_2B.X.production.hex
-CND_ARTIFACT_PATH_default=dist/default/production/Lab_2B.X.production.hex
+CND_ARTIFACT_NAME_default=Lab2B.X.production.hex
+CND_ARTIFACT_PATH_default=dist/default/production/Lab2B.X.production.hex
CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package
CND_PACKAGE_NAME_default=lab2b.x.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/lab2b.x.tar
diff --git a/Lab_2B.X/nbproject/Package-default.bash b/Lab2B.X/nbproject/Package-default.bash
index c137317..ab6b25e 100644
--- a/Lab_2B.X/nbproject/Package-default.bash
+++ b/Lab2B.X/nbproject/Package-default.bash
@@ -10,8 +10,8 @@ CND_CONF=default
CND_DISTDIR=dist
TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-OUTPUT_BASENAME=Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_BASENAME=Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
PACKAGE_TOP_DIR=lab2b.x/
# Functions
diff --git a/Lab_2B.X/Makefile b/Lab4.X/Makefile
index fca8e2c..fca8e2c 100644
--- a/Lab_2B.X/Makefile
+++ b/Lab4.X/Makefile
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 00:54:11 +0000