diff --git a/NOTES.md b/NOTES.md deleted file mode 100644 index 60374e1..0000000 --- a/NOTES.md +++ /dev/null @@ -1,3 +0,0 @@ -- сделать программу, которая будет сохранять уставку температуры, гистерезис и режим работы в EEPROM - (перед инициализации МК необходимо чтобы данные брались из EEPROM и записывались в соответствующие ячейки) -- убрать отображение разряда индикатора в режиме программирования устройства на 3 этапе \ No newline at end of file diff --git a/Makefile b/firmware/Makefile similarity index 100% rename from Makefile rename to firmware/Makefile diff --git a/definitions.asm b/firmware/definitions.asm similarity index 100% rename from definitions.asm rename to firmware/definitions.asm diff --git a/dist/default/production/attiny2313a_thermostat.X.production.hex b/firmware/dist/default/production/firmware.production.hex similarity index 100% rename from dist/default/production/attiny2313a_thermostat.X.production.hex rename to firmware/dist/default/production/firmware.production.hex diff --git a/dist/default/production/attiny2313a_thermostat.X.production.lss b/firmware/dist/default/production/firmware.production.lss similarity index 98% rename from dist/default/production/attiny2313a_thermostat.X.production.lss rename to firmware/dist/default/production/firmware.production.lss index 06dfaef..f8e6417 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.lss +++ b/firmware/dist/default/production/firmware.production.lss @@ -1,5 +1,5 @@ -AVRASM ver. 2.2.7 main.asm Sat Jul 01 13:22:52 2023 +AVRASM ver. 2.2.7 main.asm Sat Jul 01 18:14:26 2023 [builtin](2): Including file '/home/sergeyyarkov/.mchp_packs/Microchip/ATtiny_DFP/3.0.151/avrasm/inc\tn2313Adef.inc' main.asm(15): Including file 'definitions.asm' @@ -763,7 +763,7 @@ main.asm(314): Including file 'mpy16u.asm' ; Clock frequency: 8 MHz External Crystal Oscillator ; Fuses: lfuse: 0xCF, hfuse: 0xDF, efuse: 0xFF, lock: 0xFF ; - ; Written by Sergey Yarkov 05.07.2023 + ; Written by Sergey Yarkov 01.07.2023 .LIST diff --git a/dist/default/production/attiny2313a_thermostat.X.production.map b/firmware/dist/default/production/firmware.production.map similarity index 96% rename from dist/default/production/attiny2313a_thermostat.X.production.map rename to firmware/dist/default/production/firmware.production.map index 039d96f..bbe76bd 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.map +++ b/firmware/dist/default/production/firmware.production.map @@ -1,5 +1,5 @@ -AVRASM ver. 2.2.7 main.asm Sat Jul 01 13:22:52 2023 +AVRASM ver. 2.2.7 main.asm Sat Jul 01 18:14:26 2023 EQU SIGNATURE_000 0000001e diff --git a/dist/default/production/attiny2313a_thermostat.X.production.obj b/firmware/dist/default/production/firmware.production.obj similarity index 100% rename from dist/default/production/attiny2313a_thermostat.X.production.obj rename to firmware/dist/default/production/firmware.production.obj diff --git a/dist/default/production/attiny2313a_thermostat.X.production.tmp b/firmware/dist/default/production/firmware.production.tmp similarity index 95% rename from dist/default/production/attiny2313a_thermostat.X.production.tmp rename to firmware/dist/default/production/firmware.production.tmp index b8c3bfa..cb76b5b 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.tmp +++ b/firmware/dist/default/production/firmware.production.tmp @@ -1,7 +1,7 @@ 2.2.7 "ATtiny2313A" - Z:\home\sergeyyarkov\Documents\Projects\Firmwares\AVR\attiny2313a_thermostat.X + Z:\home\sergeyyarkov\Documents\Projects\Firmwares\AVR\attiny2313a_thermostat\firmware /home/sergeyyarkov/.mchp_packs/Microchip/ATtiny_DFP/3.0.151/avrasm/inc @@ -16,14 +16,14 @@ mpy16u.asm - dist/default/production/attiny2313a_thermostat.X.production.obj + dist/default/production/firmware.production.obj - dist/default/production/attiny2313a_thermostat.X.production.hex + dist/default/production/firmware.production.hex - dist/default/production/attiny2313a_thermostat.X.production.map - dist/default/production/attiny2313a_thermostat.X.production.lss + dist/default/production/firmware.production.map + dist/default/production/firmware.production.lss main.asm23 diff --git a/div16u.asm b/firmware/div16u.asm similarity index 100% rename from div16u.asm rename to firmware/div16u.asm diff --git a/div8u.asm b/firmware/div8u.asm similarity index 100% rename from div8u.asm rename to firmware/div8u.asm diff --git a/macros.asm b/firmware/macros.asm similarity index 100% rename from macros.asm rename to firmware/macros.asm diff --git a/main.asm b/firmware/main.asm similarity index 100% rename from main.asm rename to firmware/main.asm diff --git a/main.hex b/firmware/main.hex similarity index 100% rename from main.hex rename to firmware/main.hex diff --git a/mpy16u.asm b/firmware/mpy16u.asm similarity index 100% rename from mpy16u.asm rename to firmware/mpy16u.asm diff --git a/nbproject/Makefile-default.mk b/firmware/nbproject/Makefile-default.mk similarity index 73% rename from nbproject/Makefile-default.mk rename to firmware/nbproject/Makefile-default.mk index e6dfd97..c851eaf 100644 --- a/nbproject/Makefile-default.mk +++ b/firmware/nbproject/Makefile-default.mk @@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN) IMAGE_TYPE=debug OUTPUT_SUFFIX=obj DEBUGGABLE_SUFFIX=obj -FINAL_IMAGE=${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} else IMAGE_TYPE=production OUTPUT_SUFFIX=obj DEBUGGABLE_SUFFIX=obj -FINAL_IMAGE=${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} endif ifeq ($(COMPARE_BUILD), true) @@ -91,7 +91,7 @@ FIXDEPS=fixDeps ifneq ($(INFORMATION_MESSAGE), ) @echo $(INFORMATION_MESSAGE) endif - ${MAKE} -f nbproject/Makefile-default.mk ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} + ${MAKE} -f nbproject/Makefile-default.mk ${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} # ------------------------------------------------------------------------------------ # Rules for buildStep: assemble @@ -100,22 +100,22 @@ ${OBJECTDIR}/main.obj: main.asm nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${DISTDIR} @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.obj - ${MP_AS} -fI -W+ie ${PACK_ASSEMBLER_OPTIONS} -d ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -m ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.map -S ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.tmp main.asm + ${MP_AS} -fI -W+ie ${PACK_ASSEMBLER_OPTIONS} -d ${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -m ${DISTDIR}/firmware.${IMAGE_TYPE}.map -S ${DISTDIR}/firmware.${IMAGE_TYPE}.tmp main.asm else ${OBJECTDIR}/main.obj: main.asm nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${DISTDIR} @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.obj - ${MP_AS} -fI -W+ie ${PACK_ASSEMBLER_OPTIONS} -d ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -S ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.tmp -o ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.hex -m ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.map -l ${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.lss main.asm + ${MP_AS} -fI -W+ie ${PACK_ASSEMBLER_OPTIONS} -d ${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -S ${DISTDIR}/firmware.${IMAGE_TYPE}.tmp -o ${DISTDIR}/firmware.${IMAGE_TYPE}.hex -m ${DISTDIR}/firmware.${IMAGE_TYPE}.map -l ${DISTDIR}/firmware.${IMAGE_TYPE}.lss main.asm endif # ------------------------------------------------------------------------------------ # Rules for buildStep: link ifeq ($(TYPE_IMAGE), DEBUG_RUN) -${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk else -${DISTDIR}/attiny2313a_thermostat.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk endif diff --git a/nbproject/Makefile-genesis.properties b/firmware/nbproject/Makefile-genesis.properties similarity index 91% rename from nbproject/Makefile-genesis.properties rename to firmware/nbproject/Makefile-genesis.properties index 3c13d27..4a1aa30 100644 --- a/nbproject/Makefile-genesis.properties +++ b/firmware/nbproject/Makefile-genesis.properties @@ -1,5 +1,5 @@ # -#Sat Jul 01 12:39:06 MSK 2023 +#Sat Jul 01 18:10:06 MSK 2023 default.languagetoolchain.version=2.2.7 default.Pack.dfplocation=/home/sergeyyarkov/.mchp_packs/Microchip/ATtiny_DFP/3.0.151 conf.ids=default @@ -10,5 +10,5 @@ default.com-microchip-mplab-nbide-toolchain-avrasm-AVRASMLanguageToolchain.md5=0 default.com-microchip-mplab-mdbcore-snap-SnapToolImpl.md5=eaa336cefb7fc46db8b50b7b2b6e54ca com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=6e02ca5e9f5042ffd365b42ab82d3a9b user-defined-mime-resolver-xml=none -proj.dir=/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X +proj.dir=/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat/firmware host.platform=linux diff --git a/nbproject/Makefile-impl.mk b/firmware/nbproject/Makefile-impl.mk similarity index 98% rename from nbproject/Makefile-impl.mk rename to firmware/nbproject/Makefile-impl.mk index 101db18..99d42f3 100644 --- a/nbproject/Makefile-impl.mk +++ b/firmware/nbproject/Makefile-impl.mk @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} # Project Name -PROJECTNAME=attiny2313a_thermostat.X +PROJECTNAME=firmware # Active Configuration DEFAULTCONF=default diff --git a/nbproject/Makefile-local-default.mk b/firmware/nbproject/Makefile-local-default.mk similarity index 100% rename from nbproject/Makefile-local-default.mk rename to firmware/nbproject/Makefile-local-default.mk diff --git a/firmware/nbproject/Makefile-variables.mk b/firmware/nbproject/Makefile-variables.mk new file mode 100644 index 0000000..a73a685 --- /dev/null +++ b/firmware/nbproject/Makefile-variables.mk @@ -0,0 +1,10 @@ +# +# Generated - do not edit! +# +# NOCDDL +# +CND_BASEDIR=`pwd` +# default configuration +CND_ARTIFACT_DIR_default=dist/default/production +CND_ARTIFACT_NAME_default=firmware.production.obj +CND_ARTIFACT_PATH_default=dist/default/production/firmware.production.obj diff --git a/nbproject/configurations.xml b/firmware/nbproject/configurations.xml similarity index 100% rename from nbproject/configurations.xml rename to firmware/nbproject/configurations.xml diff --git a/nbproject/private/configurations.xml b/firmware/nbproject/private/configurations.xml similarity index 100% rename from nbproject/private/configurations.xml rename to firmware/nbproject/private/configurations.xml diff --git a/nbproject/private/private.xml b/firmware/nbproject/private/private.xml similarity index 70% rename from nbproject/private/private.xml rename to firmware/nbproject/private/private.xml index 680ae85..f8e95b0 100644 --- a/nbproject/private/private.xml +++ b/firmware/nbproject/private/private.xml @@ -4,12 +4,9 @@ file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/main.asm - file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/macros.asm - file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/README.md - file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/NOTES.md - file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/mpy16u.asm - file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/div16u.asm file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/definitions.asm + file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/div16u.asm + file:/home/sergeyyarkov/Documents/Projects/Firmwares/AVR/attiny2313a_thermostat.X/macros.asm diff --git a/nbproject/project.xml b/firmware/nbproject/project.xml similarity index 100% rename from nbproject/project.xml rename to firmware/nbproject/project.xml diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk deleted file mode 100644 index d800016..0000000 --- a/nbproject/Makefile-variables.mk +++ /dev/null @@ -1,10 +0,0 @@ -# -# Generated - do not edit! -# -# NOCDDL -# -CND_BASEDIR=`pwd` -# default configuration -CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=attiny2313a_thermostat.X.production.obj -CND_ARTIFACT_PATH_default=dist/default/production/attiny2313a_thermostat.X.production.obj