diff --git a/__history/__history/contador.c.~3~.~1~ b/__history/__history/contador.c.~3~.~1~
new file mode 100644
index 0000000..222cb24
--- /dev/null
+++ b/__history/__history/contador.c.~3~.~1~
@@ -0,0 +1,33 @@
+#include <18F4620.h>
+#fuses hs,nowdt
+#USE DELAY (clock=16000000)
+
+void main(void) {
+ set_tris_d(0x00);
+ output_d(0x00);
+ int16 conteo;
+ while (TRUE) {
+ /*output_d(0x01);
+ delay_ms(500);
+ output_d(0x02);
+ delay_ms(500);
+ output_d(0x04);
+ delay_ms(500);
+ output_d(0x08);
+ delay_ms(500);
+ output_d(0x10);
+ delay_ms(500);
+ output_d(0x20);
+ delay_ms(500);
+ output_d(0x40);
+ delay_ms(500);
+ output_d(0x80);
+ delay_ms(500);*/
+ for(conteo=1;conteo<=128;conteo/=2)
+ {
+ output_d(conteo);
+ delay_ms(500);
+ }
+
+ }
+}
diff --git a/__history/contador.c.~1~ b/__history/contador.c.~1~
new file mode 100644
index 0000000..c91ff84
--- /dev/null
+++ b/__history/contador.c.~1~
@@ -0,0 +1,33 @@
+#include <18F4620.h>
+#fuses hs,nowdt
+#USE DELAY (clock=16000000)
+
+void main(void) {
+ set_tris_d(0x00);
+ output_d(0x00);
+ int16 conteo;
+ while (1) {
+ /*output_d(0x01);
+ delay_ms(500);
+ output_d(0x02);
+ delay_ms(500);
+ output_d(0x04);
+ delay_ms(500);
+ output_d(0x08);
+ delay_ms(500);
+ output_d(0x10);
+ delay_ms(500);
+ output_d(0x20);
+ delay_ms(500);
+ output_d(0x40);
+ delay_ms(500);
+ output_d(0x80);
+ delay_ms(500);*/
+ for(conteo=1;conteo<=128;conteo/=2)
+ {
+ output_d(conteo);
+ delay_ms(500);
+ }
+
+ }
+}
diff --git a/__history/contador.c.~2~ b/__history/contador.c.~2~
new file mode 100644
index 0000000..c91ff84
--- /dev/null
+++ b/__history/contador.c.~2~
@@ -0,0 +1,33 @@
+#include <18F4620.h>
+#fuses hs,nowdt
+#USE DELAY (clock=16000000)
+
+void main(void) {
+ set_tris_d(0x00);
+ output_d(0x00);
+ int16 conteo;
+ while (1) {
+ /*output_d(0x01);
+ delay_ms(500);
+ output_d(0x02);
+ delay_ms(500);
+ output_d(0x04);
+ delay_ms(500);
+ output_d(0x08);
+ delay_ms(500);
+ output_d(0x10);
+ delay_ms(500);
+ output_d(0x20);
+ delay_ms(500);
+ output_d(0x40);
+ delay_ms(500);
+ output_d(0x80);
+ delay_ms(500);*/
+ for(conteo=1;conteo<=128;conteo/=2)
+ {
+ output_d(conteo);
+ delay_ms(500);
+ }
+
+ }
+}
diff --git a/__history/contador.c.~3~ b/__history/contador.c.~3~
new file mode 100644
index 0000000..61aefda
--- /dev/null
+++ b/__history/contador.c.~3~
@@ -0,0 +1,33 @@
+#include <18F4620.h>
+#fuses hs,nowdt
+#USE DELAY (clock=16000000)
+
+void main(void) {
+ set_tris_d(0x00);
+ output_d(0x00);
+ int16 conteo;
+ while (TRUE) {
+ /*output_d(0x01);
+ delay_ms(500);
+ output_d(0x02);
+ delay_ms(500);
+ output_d(0x04);
+ delay_ms(500);
+ output_d(0x08);
+ delay_ms(500);
+ output_d(0x10);
+ delay_ms(500);
+ output_d(0x20);
+ delay_ms(500);
+ output_d(0x40);
+ delay_ms(500);
+ output_d(0x80);
+ delay_ms(500);*/
+ for(conteo=128;conteo>=1;conteo/=2)
+ {
+ output_d(conteo);
+ delay_ms(500);
+ }
+
+ }
+}
diff --git a/__history/contador.c.~3~.err b/__history/contador.c.~3~.err
new file mode 100644
index 0000000..07f2123
--- /dev/null
+++ b/__history/contador.c.~3~.err
@@ -0,0 +1 @@
+Error: Not found "C:\Users\L-L-Z\Downloads\Sistemas Embebidos Alumnos\Proyectos\ContadorAnillo\__history\contador.c.~3~.c"
diff --git a/build/default/production/contador.STA b/build/default/production/contador.STA
index f23bdb7..2297320 100644
--- a/build/default/production/contador.STA
+++ b/build/default/production/contador.STA
@@ -1,9 +1,9 @@
-ROM used: 116/65536 (0%)
- 116/65536 (0%) including unused fragments
+ROM used: 118/65536 (0%)
+ 118/65536 (0%) including unused fragments
0.1 Average locations per line
- 12.9 Average locations per statement
+ 13.1 Average locations per statement
RAM used: 5/3968 (0%) at main() level
8/3968 (0%) worst case
@@ -13,14 +13,14 @@ Stack size: 31
Lines Stmts % Files
----- ----- --- -----
- 34 9 100 contador.c
+ 35 9 100 contador.c
834 0 0 ..\..\..\..\..\..\Program Files (x86)\PICC\devices\18F4620.h
----- -----
- 868 9 Total
+ 869 9 Total
Page ROM % RAM Vol Diff Functions:
---- --- --- --- --- ---- ----------
-0 40 17 1 @delay_ms1
+0 42 18 1 @delay_ms1
0 72 31 1 192 3.6 main
Inline 0 @cinit1
@@ -39,7 +39,7 @@ Program metrics:
Segment Used Free
----------- ---- ----
00000-00002 4 0
-00004-0FFFE 112 65420
+00004-0FFFE 114 65418
diff --git a/build/default/production/contador.err b/build/default/production/contador.err
index ab53d56..0dae5d0 100644
--- a/build/default/production/contador.err
+++ b/build/default/production/contador.err
@@ -1,4 +1,3 @@
-D:\Docs\UNIVERSIDAD\sistemasembebidos\proyectos\contador\contadoranillo.X\contador.c:9:1: Warning#203 Condition always TRUE
- Memory usage: ROM=0% RAM=0% - 0%
- 0 Errors, 1 Warnings.
-Build Successful.
+ Memory usage: ROM=0% RAM=0% - 0%
+ 0 Errors, 0 Warnings.
+Build Successful.
diff --git a/build/default/production/contador.esym b/build/default/production/contador.esym
index a83acb3..9506da6 100644
--- a/build/default/production/contador.esym
+++ b/build/default/production/contador.esym
@@ -1,7 +1,7 @@
D G "__PCH__" 0 0 ""5.012""
D G "__DEVICE__" 0 0 ""
-D G "__DATE__" 0 0 ""25-feb.-19""
-D G "__TIME__" 0 0 ""16:40:20""
+D G "__DATE__" 0 0 ""02-mar.-19""
+D G "__TIME__" 0 0 ""13:09:27""
D G "__18F4620" 0 0 "1" "Standard Header file for the PIC18F4620 device ////////////////"
c L "set_tris_a" 1 3 6 "FUNCTION"
v L "value" 1 43 "int8" `54
@@ -909,9 +909,9 @@ d G "INT_LOWVOLT" 1 828 "0x00A004"
d G "INT_COMP" 1 829 "0x00A040"
d G "INT_EEPROM" 1 830 "0x00A010"
d G "INT_OSCF" 1 831 "0x00A080"
-F G "main" 0 5 "void()" `638
-V L "conteo" 0 8 "int16" `641
-C L "main" 0 10 16 "FUNCTION"
+F G "main" 0 6 "void()" `638
+V L "conteo" 0 9 "int16" `641
+C L "main" 0 11 16 "FUNCTION"
F B "reset_cpu" 0 0
F B "abs" 1 0
F B "sleep" 0 1
diff --git a/build/default/production/contador.lst b/build/default/production/contador.lst
index 725ff1a..4a38737 100644
--- a/build/default/production/contador.lst
+++ b/build/default/production/contador.lst
@@ -1,16 +1,16 @@
-CCS PCH C Compiler, Version 5.012, 22068 25-feb.-19 16:40
+CCS PCH C Compiler, Version 5.012, 22068 02-mar.-19 13:09
- Filename: D:\Docs\UNIVERSIDAD\sistemasembebidos\proyectos\contador\contadoranillo.X\build\default\production\contador.lst
+ Filename: D:\Docs\UNIVERSIDAD\sistemasembebidos\proyectos\ContadorAnillo\ContadorAnillo\build\default\production\contador.lst
- ROM used: 116 bytes (0%)
- Largest free fragment is 65420
+ ROM used: 118 bytes (0%)
+ Largest free fragment is 65418
RAM used: 5 (0%) at main() level
8 (0%) worst case
Stack used: 1 locations
Stack size: 31
*
-00000: GOTO 002C
+00000: GOTO 002E
.................... #include <18F4620.h>
.................... ///////////// Standard Header file for the PIC18F4620 device ////////////////
.................... ///////////////////////////////////////////////////////////////////////////
@@ -26,45 +26,47 @@ CCS PCH C Compiler, Version 5.012, 22068 25-feb.-19 16:40
....................
.................... #list
....................
-.................... #fuses hs,nowdt
-.................... #USE DELAY (clock=20M)
+.................... #fuses HS, NOFCMEN, NOIESO, PUT, NOBROWNOUT, NOWDT
+.................... #fuses NOPBADEN, MCLR, STVREN, NOLVP, NODEBUG
+.................... #USE DELAY (clock=16000000)
00004: CLRF FEA
00006: MOVLW 08
00008: MOVWF FE9
0000A: MOVF FEF,W
-0000C: BZ 0028
-0000E: MOVLW 06
+0000C: BZ 002A
+0000E: MOVLW 05
00010: MOVWF 01
00012: CLRF 00
00014: DECFSZ 00,F
00016: BRA 0014
00018: DECFSZ 01,F
0001A: BRA 0012
-0001C: MOVLW 7B
+0001C: MOVLW 2E
0001E: MOVWF 00
00020: DECFSZ 00,F
00022: BRA 0020
-00024: DECFSZ FEF,F
-00026: BRA 000E
-00028: GOTO 0064 (RETURN)
+00024: BRA 0026
+00026: DECFSZ FEF,F
+00028: BRA 000E
+0002A: GOTO 0066 (RETURN)
....................
.................... void main(void) {
-0002C: CLRF FF8
-0002E: BCF FD0.7
-00030: MOVF FC1,W
-00032: ANDLW C0
-00034: IORLW 0F
-00036: MOVWF FC1
-00038: MOVLW 07
-0003A: MOVWF FB4
+0002E: CLRF FF8
+00030: BCF FD0.7
+00032: MOVF FC1,W
+00034: ANDLW C0
+00036: IORLW 0F
+00038: MOVWF FC1
+0003A: MOVLW 07
+0003C: MOVWF FB4
.................... set_tris_d(0x00);
-0003C: MOVLW 00
-0003E: MOVWF F95
+0003E: MOVLW 00
+00040: MOVWF F95
.................... output_d(0x00);
-00040: CLRF F95
-00042: CLRF F8C
+00042: CLRF F95
+00044: CLRF F8C
.................... int16 conteo;
-.................... while (1) {
+.................... while (TRUE) {
.................... /*output_d(0x01);
.................... delay_ms(500);
.................... output_d(0x02);
@@ -81,42 +83,42 @@ CCS PCH C Compiler, Version 5.012, 22068 25-feb.-19 16:40
.................... delay_ms(500);
.................... output_d(0x80);
.................... delay_ms(500);*/
-.................... for(conteo=1;conteo<=128;conteo*=2)
-00044: CLRF 06
-00046: MOVLW 01
-00048: MOVWF 05
-0004A: MOVF 06,F
-0004C: BNZ 0070
-0004E: MOVF 05,W
-00050: SUBLW 80
-00052: BNC 0070
+.................... for(conteo=128;conteo>=1;conteo/=2)
+00046: CLRF 06
+00048: MOVLW 80
+0004A: MOVWF 05
+0004C: MOVF 06,F
+0004E: BNZ 0056
+00050: MOVF 05,W
+00052: SUBLW 00
+00054: BC 0072
.................... {
.................... output_d(conteo);
-00054: CLRF F95
-00056: MOVFF 05,F8C
+00056: CLRF F95
+00058: MOVFF 05,F8C
.................... delay_ms(500);
-0005A: MOVLW 02
-0005C: MOVWF 07
-0005E: MOVLW FA
-00060: MOVWF 08
-00062: BRA 0004
-00064: DECFSZ 07,F
-00066: BRA 005E
-00068: BCF FD8.0
-0006A: RLCF 05,F
-0006C: RLCF 06,F
-0006E: BRA 004A
+0005C: MOVLW 02
+0005E: MOVWF 07
+00060: MOVLW FA
+00062: MOVWF 08
+00064: BRA 0004
+00066: DECFSZ 07,F
+00068: BRA 0060
+0006A: BCF FD8.0
+0006C: RRCF 06,F
+0006E: RRCF 05,F
+00070: BRA 004C
.................... }
-00070: BRA 0044
+00072: BRA 0046
....................
.................... }
.................... }
-00072: SLEEP
+00074: SLEEP
Configuration Fuses:
- Word 1: C200 HS FCMEN IESO
- Word 2: 1E1E PUT BROWNOUT BORV21 NOWDT WDT32768
- Word 3: 8700 CCP2C1 PBADEN LPT1OSC MCLR
+ Word 1: 0200 HS NOFCMEN NOIESO
+ Word 2: 1E18 PUT NOBROWNOUT BORV21 NOWDT WDT32768
+ Word 3: 8500 CCP2C1 NOPBADEN LPT1OSC MCLR
Word 4: 0081 STVREN NOLVP NOXINST NODEBUG
Word 5: C00F NOPROTECT NOCPB NOCPD
Word 6: E00F NOWRT NOWRTC NOWRTB NOWRTD
diff --git a/build/default/production/contador.sym b/build/default/production/contador.sym
index 6652d45..1aa58e2 100644
--- a/build/default/production/contador.sym
+++ b/build/default/production/contador.sym
@@ -26,18 +26,18 @@ FF6-FF8 @READ_PROGRAM_MEMORY.P2
ROM Allocation:
000004 @delay_ms1
-00002C @cinit1
-00002C main
-00003C @cinit2
+00002E @cinit1
+00002E main
+00003E @cinit2
Project Directory:
- D:\Docs\UNIVERSIDAD\sistemasembebidos\proyectos\contador\contadoranillo.X\
+ D:\Docs\UNIVERSIDAD\sistemasembebidos\proyectos\ContadorAnillo\ContadorAnillo\
Project Files:
- contador.c [25-feb.-19 16:40 CRC=C31C27BB]
+ contador.c [02-mar.-19 13:09 CRC=FB6A65F7]
..\..\..\..\..\..\Program Files (x86)\PICC\devices\18F4620.h [10-sep.-13 16:34 CRC=044A57BA]
-Source signature=CBB0D72F
+Source signature=03FF156B
Units:
contador (main)
diff --git a/build/default/production/contador.tre b/build/default/production/contador.tre
index 178ba94..99f5309 100644
--- a/build/default/production/contador.tre
+++ b/build/default/production/contador.tre
@@ -1,4 +1,4 @@
-青contadoranillo
+青contador
青main 0/72 Ram=1
団@cinit1 (Inline) Ram=0
- 青@delay_ms1 0/40 Ram=1
+ 青@delay_ms1 0/42 Ram=1
diff --git a/build/default/production/contador.xsym b/build/default/production/contador.xsym
index 6c90355..a935629 100644
Binary files a/build/default/production/contador.xsym and b/build/default/production/contador.xsym differ
diff --git a/contador.c b/contador.c
index b3f2421..21233fd 100644
--- a/contador.c
+++ b/contador.c
@@ -1,12 +1,13 @@
#include <18F4620.h>
-#fuses hs,nowdt
-#USE DELAY (clock=20M)
+#fuses HS, NOFCMEN, NOIESO, PUT, NOBROWNOUT, NOWDT
+#fuses NOPBADEN, MCLR, STVREN, NOLVP, NODEBUG
+#USE DELAY (clock=16000000)
void main(void) {
set_tris_d(0x00);
output_d(0x00);
int16 conteo;
- while (1) {
+ while (TRUE) {
/*output_d(0x01);
delay_ms(500);
output_d(0x02);
@@ -23,7 +24,7 @@ void main(void) {
delay_ms(500);
output_d(0x80);
delay_ms(500);*/
- for(conteo=1;conteo<=128;conteo*=2)
+ for(conteo=128;conteo>=1;conteo/=2)
{
output_d(conteo);
delay_ms(500);
diff --git a/contador.ccspjt b/contador.ccspjt
index 79ab6fd..b7adbb4 100644
--- a/contador.ccspjt
+++ b/contador.ccspjt
@@ -6,13 +6,16 @@ Compiler=PCH
[Target Data]
FileList=build\default\production\contador.c
[Directories]
-Include=D:\Program Files (x86)\PICC\devices\;D:\Program Files (x86)\PICC\drivers\
+Include=D:\Program Files (x86)\PICC\devices\;D:\Program Files (x86)\PICC\drivers\;C:\Program Files (x86)\PICC\devices\;C:\Program Files (x86)\PICC\drivers\
[build\default\debug\contador.c]
Type=4
[mru-list]
1=build\default\production\contador.c
[build\default\production\contador.c]
Type=4
+[Opened Files]
+1=contador.c
+2=
[Units]
Count=1
1=contador (main)
diff --git a/contador.err b/contador.err
new file mode 100644
index 0000000..047a796
--- /dev/null
+++ b/contador.err
@@ -0,0 +1 @@
+*** Error 24 "C:\Program Files (x86)\PICC\devices\18F4620.h" Line 11(9,19): Unknown device type -- Try PCH
diff --git a/dist/default/production/ContadorAnillo.production.cof b/dist/default/production/ContadorAnillo.production.cof
new file mode 100644
index 0000000..b85a46d
Binary files /dev/null and b/dist/default/production/ContadorAnillo.production.cof differ
diff --git a/dist/default/production/ContadorAnillo.production.hex b/dist/default/production/ContadorAnillo.production.hex
new file mode 100644
index 0000000..efcd1cf
--- /dev/null
+++ b/dist/default/production/ContadorAnillo.production.hex
@@ -0,0 +1,13 @@
+:1000000017EF00F0EA6A080EE96EEF500EE0050EF9
+:10001000016E006A002EFED7012EFBD72E0E006E59
+:10002000002EFED700D0EF2EF2D733EF00F0F86AA3
+:10003000D09EC150C00B0F09C16E070EB46E000EEA
+:10004000956E956A8C6A066A800E056E065203E10B
+:10005000055000080EE2956A05C08CFF020E076E7F
+:10006000FA0E086ECFD7072EFBD7D890063205328E
+:06007000EDD7E9D7030003
+:020000040030CA
+:0E0000000002181E008581000FC00FE00F40A7
+:00000001FF
+;PIC18F4620
+;CRC=21A7 CREATED="02-mar.-19 13:09"
diff --git a/dist/default/production/contadoranillo.X.production.cof b/dist/default/production/contadoranillo.X.production.cof
index 3486e89..58b9ff5 100644
Binary files a/dist/default/production/contadoranillo.X.production.cof and b/dist/default/production/contadoranillo.X.production.cof differ
diff --git a/dist/default/production/contadoranillo.X.production.hex b/dist/default/production/contadoranillo.X.production.hex
index 05e119d..4bd135a 100644
--- a/dist/default/production/contadoranillo.X.production.hex
+++ b/dist/default/production/contadoranillo.X.production.hex
@@ -1,13 +1,13 @@
-:1000000016EF00F0EA6A080EE96EEF500DE0060EFA
-:10001000016E006A002EFED7012EFBD77B0E006E0C
-:10002000002EFED7EF2EF3D732EF00F0F86AD09E05
-:10003000C150C00B0F09C16E070EB46E000E956E55
-:10004000956A8C6A066A010E056E065211E105502A
-:1000500080080EE3956A05C08CFF020E076EFA0E4B
-:10006000086ED0D7072EFBD7D89005360636EDD7C9
-:04007000E9D70300C9
+:1000000017EF00F0EA6A080EE96EEF500EE0050EF9
+:10001000016E006A002EFED7012EFBD72E0E006E59
+:10002000002EFED700D0EF2EF2D733EF00F0F86AA3
+:10003000D09EC150C00B0F09C16E070EB46E000EEA
+:10004000956E956A8C6A066A010E056E065211E17C
+:10005000055080080EE3956A05C08CFF020E076EFE
+:10006000FA0E086ECFD7072EFBD7D8900536063686
+:06007000EDD7E9D7030003
:020000040030CA
-:0E00000000C21E1E008781000FC00FE00F40DF
+:0E0000000002181E008581000FC00FE00F40A7
:00000001FF
;PIC18F4620
-;CRC=4A53 CREATED="25-feb.-19 16:40"
+;CRC=B613 CREATED="02-mar.-19 12:45"
diff --git a/nayeli}.txt b/nayeli}.txt
new file mode 100644
index 0000000..8666a88
--- /dev/null
+++ b/nayeli}.txt
@@ -0,0 +1 @@
+xd
\ No newline at end of file
diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index 7415900..14de479 100644
--- a/nbproject/Makefile-default.mk
+++ b/nbproject/Makefile-default.mk
@@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN)
IMAGE_TYPE=debug
OUTPUT_SUFFIX=cof
DEBUGGABLE_SUFFIX=cof
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
else
IMAGE_TYPE=production
OUTPUT_SUFFIX=hex
DEBUGGABLE_SUFFIX=cof
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
endif
ifeq ($(COMPARE_BUILD), true)
@@ -87,7 +87,7 @@ FIXDEPS=fixDeps
ifneq ($(INFORMATION_MESSAGE), )
@echo $(INFORMATION_MESSAGE)
endif
- ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+ ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
MP_CC="D:\Program Files (x86)\PICC\CCSCON.exe"
MP_LD="D:\Program Files (x86)\PICC\CCSCON.exe"
@@ -99,8 +99,8 @@ ${OBJECTDIR}/contador.o: contador.c nbproject/Makefile-${CND_CONF}.mk
ifeq (1,1)
${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
${MP_CC} out="${OBJECTDIR}" contador.c +FH +DF +CC +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P #__18F4620=1
- @mv ${OBJECTDIR}/contador.cof "dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.cof"
- @mv ${OBJECTDIR}/contador.hex "dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.hex"
+ @mv ${OBJECTDIR}/contador.cof "dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.cof"
+ @mv ${OBJECTDIR}/contador.hex "dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.hex"
else
${MP_CC} out=""${OBJECTDIR}"" contador.c +EXPORT +FH +DF +CC +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P #__18F4620=1 +EXPORTD="${OBJECTDIR}"
@@ -112,8 +112,8 @@ ${OBJECTDIR}/contador.o: contador.c nbproject/Makefile-${CND_CONF}.mk
ifeq (1,1)
${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
${MP_CC} out="${OBJECTDIR}" contador.c +FH +DF +CC +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P #__18F4620=1
- @mv ${OBJECTDIR}/contador.cof "dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.cof"
- @mv ${OBJECTDIR}/contador.hex "dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.hex"
+ @mv ${OBJECTDIR}/contador.cof "dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.cof"
+ @mv ${OBJECTDIR}/contador.hex "dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.hex"
else
${MP_CC} out=""${OBJECTDIR}"" contador.c +EXPORT +FH +DF +CC +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P #__18F4620=1 +EXPORTD="${OBJECTDIR}"
@@ -124,22 +124,22 @@ endif
# ------------------------------------------------------------------------------------
# Rules for buildStep: link
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
ifeq (1,1)
else
- ${MP_LD} out="dist/${CND_CONF}/${IMAGE_TYPE}" +FH +DF +CC LINK=contadoranillo.X.${IMAGE_TYPE}.hex=${OBJECTDIR}/contador.o +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P
+ ${MP_LD} out="dist/${CND_CONF}/${IMAGE_TYPE}" +FH +DF +CC LINK=ContadorAnillo.${IMAGE_TYPE}.hex=${OBJECTDIR}/contador.o +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P
endif
else
-dist/${CND_CONF}/${IMAGE_TYPE}/contadoranillo.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/ContadorAnillo.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
ifeq (1,1)
else
- ${MP_LD} out="dist/${CND_CONF}/${IMAGE_TYPE}" +FH +DF +CC LINK=contadoranillo.X.${IMAGE_TYPE}.hex=${OBJECTDIR}/contador.o +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P
+ ${MP_LD} out="dist/${CND_CONF}/${IMAGE_TYPE}" +FH +DF +CC LINK=ContadorAnillo.${IMAGE_TYPE}.hex=${OBJECTDIR}/contador.o +Y=9 +EA +DF +LN +T +A +M +J +EA +Z -P
endif
diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index fda899f..f58a9c0 100644
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
#
-#Sun Feb 24 17:11:09 CST 2019
+#Sat Mar 02 13:08:12 CST 2019
default.org-ccs-MPLABXplug-CCSLanguageToolchain.md5=10a75dc6a7ceada6c6eee4a17c650d3b
default.languagetoolchain.dir=D\:\\Program Files (x86)\\PICC
configurations-xml=7273719a29ce2ca19c7183511a77dfa6
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index b701cac..620ad0a 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -3,7 +3,7 @@
- file:/D:/Docs/UNIVERSIDAD/sistemasembebidos/proyectos/contador/contadoranillo.X/contador.c
+ file:/D:/Docs/UNIVERSIDAD/sistemasembebidos/proyectos/ContadorAnillo/ContadorAnillo/contador.c