jakob пре 5 година
родитељ
комит
265777e19c
4 измењених фајлова са 34 додато и 32 уклоњено
  1. 4 3
      Source/ASM_Source/main.s
  2. 29 28
      Source/ASM_Source/prog.hex
  3. BIN
      Source/ASM_Source/prog.o
  4. 1 1
      Source/C_Source/prog.c

+ 4 - 3
Source/ASM_Source/main.s

@@ -79,7 +79,7 @@ timeout_1:
 	sbrc  	mode, prog_enable
 	call	mode_prog_enable
 	sbrc  	mode, page_read
-	call	mode_page_read
+	jmp		mode_page_read
 	sbrc	mode, page_write
 	rjmp	mode_select
 	sbrc  	mode, prog_check
@@ -87,6 +87,7 @@ timeout_1:
 
 ;Send Frame-------------------------------------------------------------
 
+send_fin:
 	ldi		X_l, lo8(cmd_ptr)						;set Command-Ptr
 	ldi		X_h, hi8(cmd_ptr)
 	lds		usart_r, UCSR0B							;enable UDRI
@@ -158,7 +159,7 @@ mode_prog_enable:
 
 	sts		cmd_mode, option 						;signal Prog enable
 
-	ret
+	jmp		send_fin
 
 ;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ;Read Page
@@ -251,6 +252,6 @@ page_rebuild:
 	ldi		main_r, frame_mask						;signal Page rec
 	sts		cmd_mode, main_r 						;by sending mask
 
-	ret
+	jmp		send_fin
 
 

+ 29 - 28
Source/ASM_Source/prog.hex

@@ -1,18 +1,18 @@
 :100000000C9434000C9400000C9400000C9400003C
 :100010000C9400000C9400000C9400000C94000060
-:100020000C9400000C945F010C9400000C940000F0
+:100020000C9400000C9463010C9400000C940000EC
 :100030000C9400000C9400000C9400000C94000040
-:100040000C9400000C9400000C942B010C943A01C9
-:100050000C944B010C9400000C9400000C940000D4
+:100040000C9400000C9400000C942F010C943E01C1
+:100050000C944F010C9400000C9400000C940000D0
 :100060000C9400000C9400000FEF0DBF08E00EBFD1
-:1000700099278FEF0E9417010FE307B998B9789479
+:1000700099278FEF0E941B010FE307B998B9789475
 :1000800002C0FFCFF89401E008B937E03093B10027
 :100090009093110136E03093120131E030937000FB
 :1000A000A0E0B1E01091C10010691093C10000916F
 :1000B0001101081304C0A0E0B1E090930301109176
 :1000C00003011330A1F7909370001091C1001F76C7
 :1000D0001093C1009093C600909303010E94910079
-:1000E00060FDD1CF61FD0E94A80062FD0E94BE00AC
+:1000E00060FDD1CF61FD0E94A80062FD0C94BF00AD
 :1000F00063FDC9CF64FDC7CFA0E0B1E01091C1009E
 :1001000010621093C100109103011230E1F71091B9
 :10011000C10017791093C1009093C600909303011A
@@ -21,27 +21,28 @@
 :1001400002010F700295702B11F40C944300089576
 :1001500002E008B934E03093B100909311013AEF16
 :100160003093120131E030937000009111010813B7
-:10017000FCCF9093700070930001089504E008B9DB
-:1001800070930001A0E0B1E01091C10010621093E3
-:10019000C100109103011230E1F71091C1001779ED
-:1001A0001093C1009093C6009093030137E0309301
-:1001B000B100909311013CE33093120131E0309390
-:1001C0007000A0E0B2E01091C10010691093C1006E
-:1001D00000911101081304C0A0E0B1E09093030165
-:1001E00010910301072F000F101791F790937000E3
-:1001F0001091C1001F761093C1009093C600909398
-:100200000301A0E0B2E0C0E0C395D2E0E0E0F2E09C
-:100210000C911296188122960F701F701295012B67
-:1002200001937A95A9F700E900930001089590934E
-:10023000C6009093C0009093C1009093C20010E05C
-:100240001093C50013E31093C40016E01093C2008E
-:100250009093030108951F935091C600152F107FAE
-:10026000103931F45D93109103011395109303013C
-:100270001F9118951F935D915093C6001091030133
-:100280001395109303011091C1001F7D1864109302
-:10029000C1001F9118951F931091C100177B106228
-:1002A0001093C1001F9118959093B0009093B100E6
-:1002B0009093B200909370009093100108953F9333
-:1002C0000F9330911001339520911201321719F4D8
-:1002D000809311013327309310010F913F911895AE
+:10017000FCCF90937000709300010C947C0004E01D
+:1001800008B970930001A0E0B1E01091C1001062C5
+:100190001093C100109103011230E1F71091C100DA
+:1001A00017791093C1009093C6009093030137E034
+:1001B0003093B100909311013CE33093120131E090
+:1001C00030937000A0E0B2E01091C100106910936C
+:1001D000C10000911101081306C01091C1001F76E3
+:1001E0001093C100CCCF10910301072F000F1017FF
+:1001F00081F7909370001091C1001F761093C10099
+:100200009093C60090930301A0E0B2E0C0E0C395D4
+:10021000D2E0E0E0F2E00C911296188122960F7085
+:100220001F701295012B01937A95A9F700E90093AD
+:1002300000010C947C009093C6009093C0009093B2
+:10024000C1009093C20010E01093C50013E3109317
+:10025000C40016E01093C2009093030108951F9309
+:100260005091C600152F107F103931F45D93109115
+:1002700003011395109303011F9118951F935D912E
+:100280005093C60010910301139510930301109130
+:10029000C1001F7D18641093C1001F9118951F9312
+:1002A0001091C100177B10621093C1001F91189527
+:1002B0009093B0009093B1009093B200909370002F
+:1002C0009093100108953F930F933091100133954F
+:1002D00020911201321719F48093110133273093C2
+:0802E00010010F913F911895E8
 :00000001FF

BIN
Source/ASM_Source/prog.o


+ 1 - 1
Source/C_Source/prog.c

@@ -171,7 +171,7 @@ reset_1:
 												malloc(sizeof(char));
 		while(true){
 			read(USB, page_rec_ptr, sizeof(char));
-			if(*page_rec_ptr==frame_mask){					//Framemask
+			if(*page_rec_ptr==frame_mask){				//Framemask
 				break;
 			}
 			if(!timer_state){