diff --git a/ESP8266/Debug/ESP8266.eep b/ESP8266/Debug/ESP8266.eep new file mode 100644 index 0000000..7c166a1 --- /dev/null +++ b/ESP8266/Debug/ESP8266.eep @@ -0,0 +1 @@ +:00000001FF diff --git a/ESP8266/Debug/ESP8266.lss b/ESP8266/Debug/ESP8266.lss new file mode 100644 index 0000000..c56b5ea --- /dev/null +++ b/ESP8266/Debug/ESP8266.lss @@ -0,0 +1,671 @@ + +ESP8266.elf: file format elf32-avr + +Sections: +Idx Name Size VMA LMA File off Algn + 0 .data 0000000a 00800100 00000338 000003ac 2**0 + CONTENTS, ALLOC, LOAD, DATA + 1 .text 00000338 00000000 00000000 00000074 2**1 + CONTENTS, ALLOC, LOAD, READONLY, CODE + 2 .comment 00000030 00000000 00000000 000003b6 2**0 + CONTENTS, READONLY + 3 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000003e8 2**2 + CONTENTS, READONLY + 4 .debug_aranges 000000e0 00000000 00000000 00000424 2**0 + CONTENTS, READONLY, DEBUGGING + 5 .debug_info 00000b9d 00000000 00000000 00000504 2**0 + CONTENTS, READONLY, DEBUGGING + 6 .debug_abbrev 0000055f 00000000 00000000 000010a1 2**0 + CONTENTS, READONLY, DEBUGGING + 7 .debug_line 00000651 00000000 00000000 00001600 2**0 + CONTENTS, READONLY, DEBUGGING + 8 .debug_frame 000001a0 00000000 00000000 00001c54 2**2 + CONTENTS, READONLY, DEBUGGING + 9 .debug_str 00000286 00000000 00000000 00001df4 2**0 + CONTENTS, READONLY, DEBUGGING + 10 .debug_loc 00000590 00000000 00000000 0000207a 2**0 + CONTENTS, READONLY, DEBUGGING + 11 .debug_ranges 000000a0 00000000 00000000 0000260a 2**0 + CONTENTS, READONLY, DEBUGGING + +Disassembly of section .text: + +00000000 <__vectors>: + 0: 45 c0 rjmp .+138 ; 0x8c <__ctors_end> + 2: 00 00 nop + 4: 58 c0 rjmp .+176 ; 0xb6 <__bad_interrupt> + 6: 00 00 nop + 8: 56 c0 rjmp .+172 ; 0xb6 <__bad_interrupt> + a: 00 00 nop + c: 54 c0 rjmp .+168 ; 0xb6 <__bad_interrupt> + e: 00 00 nop + 10: 52 c0 rjmp .+164 ; 0xb6 <__bad_interrupt> + 12: 00 00 nop + 14: 50 c0 rjmp .+160 ; 0xb6 <__bad_interrupt> + 16: 00 00 nop + 18: 4e c0 rjmp .+156 ; 0xb6 <__bad_interrupt> + 1a: 00 00 nop + 1c: 4c c0 rjmp .+152 ; 0xb6 <__bad_interrupt> + 1e: 00 00 nop + 20: 4a c0 rjmp .+148 ; 0xb6 <__bad_interrupt> + 22: 00 00 nop + 24: 48 c0 rjmp .+144 ; 0xb6 <__bad_interrupt> + 26: 00 00 nop + 28: 46 c0 rjmp .+140 ; 0xb6 <__bad_interrupt> + 2a: 00 00 nop + 2c: 44 c0 rjmp .+136 ; 0xb6 <__bad_interrupt> + 2e: 00 00 nop + 30: 42 c0 rjmp .+132 ; 0xb6 <__bad_interrupt> + 32: 00 00 nop + 34: 40 c0 rjmp .+128 ; 0xb6 <__bad_interrupt> + 36: 00 00 nop + 38: 3e c0 rjmp .+124 ; 0xb6 <__bad_interrupt> + 3a: 00 00 nop + 3c: 3c c0 rjmp .+120 ; 0xb6 <__bad_interrupt> + 3e: 00 00 nop + 40: 3a c0 rjmp .+116 ; 0xb6 <__bad_interrupt> + 42: 00 00 nop + 44: 38 c0 rjmp .+112 ; 0xb6 <__bad_interrupt> + 46: 00 00 nop + 48: 36 c0 rjmp .+108 ; 0xb6 <__bad_interrupt> + 4a: 00 00 nop + 4c: 34 c0 rjmp .+104 ; 0xb6 <__bad_interrupt> + 4e: 00 00 nop + 50: 32 c0 rjmp .+100 ; 0xb6 <__bad_interrupt> + 52: 00 00 nop + 54: 30 c0 rjmp .+96 ; 0xb6 <__bad_interrupt> + 56: 00 00 nop + 58: 2e c0 rjmp .+92 ; 0xb6 <__bad_interrupt> + 5a: 00 00 nop + 5c: 2c c0 rjmp .+88 ; 0xb6 <__bad_interrupt> + 5e: 00 00 nop + 60: 2a c0 rjmp .+84 ; 0xb6 <__bad_interrupt> + 62: 00 00 nop + 64: 28 c0 rjmp .+80 ; 0xb6 <__bad_interrupt> + 66: 00 00 nop + 68: 26 c0 rjmp .+76 ; 0xb6 <__bad_interrupt> + 6a: 00 00 nop + 6c: 24 c0 rjmp .+72 ; 0xb6 <__bad_interrupt> + 6e: 00 00 nop + 70: 22 c0 rjmp .+68 ; 0xb6 <__bad_interrupt> + 72: 00 00 nop + 74: 20 c0 rjmp .+64 ; 0xb6 <__bad_interrupt> + 76: 00 00 nop + 78: 1e c0 rjmp .+60 ; 0xb6 <__bad_interrupt> + 7a: 00 00 nop + 7c: 1c c0 rjmp .+56 ; 0xb6 <__bad_interrupt> + 7e: 00 00 nop + 80: 1a c0 rjmp .+52 ; 0xb6 <__bad_interrupt> + 82: 00 00 nop + 84: 18 c0 rjmp .+48 ; 0xb6 <__bad_interrupt> + 86: 00 00 nop + 88: 16 c0 rjmp .+44 ; 0xb6 <__bad_interrupt> + ... + +0000008c <__ctors_end>: + 8c: 11 24 eor r1, r1 + 8e: 1f be out 0x3f, r1 ; 63 + 90: cf ef ldi r28, 0xFF ; 255 + 92: d0 e1 ldi r29, 0x10 ; 16 + 94: de bf out 0x3e, r29 ; 62 + 96: cd bf out 0x3d, r28 ; 61 + +00000098 <__do_copy_data>: + 98: 11 e0 ldi r17, 0x01 ; 1 + 9a: a0 e0 ldi r26, 0x00 ; 0 + 9c: b1 e0 ldi r27, 0x01 ; 1 + 9e: e8 e3 ldi r30, 0x38 ; 56 + a0: f3 e0 ldi r31, 0x03 ; 3 + a2: 00 e0 ldi r16, 0x00 ; 0 + a4: 0b bf out 0x3b, r16 ; 59 + a6: 02 c0 rjmp .+4 ; 0xac <__do_copy_data+0x14> + a8: 07 90 elpm r0, Z+ + aa: 0d 92 st X+, r0 + ac: aa 30 cpi r26, 0x0A ; 10 + ae: b1 07 cpc r27, r17 + b0: d9 f7 brne .-10 ; 0xa8 <__do_copy_data+0x10> + b2: d0 d0 rcall .+416 ; 0x254
+ b4: 3f c1 rjmp .+638 ; 0x334 <_exit> + +000000b6 <__bad_interrupt>: + b6: a4 cf rjmp .-184 ; 0x0 <__vectors> + +000000b8 : + + #include "uart.h" + + void esp_init() + { + uart_init(9600); + b8: 80 e8 ldi r24, 0x80 ; 128 + ba: 95 e2 ldi r25, 0x25 ; 37 + bc: e4 d0 rcall .+456 ; 0x286 + + wait(50); + be: 82 e3 ldi r24, 0x32 ; 50 + c0: 90 e0 ldi r25, 0x00 ; 0 + c2: b7 d0 rcall .+366 ; 0x232 + + uart_start(); + c4: f3 d0 rcall .+486 ; 0x2ac + + wait(10); + c6: 8a e0 ldi r24, 0x0A ; 10 + c8: 90 e0 ldi r25, 0x00 ; 0 + ca: b3 c0 rjmp .+358 ; 0x232 + cc: 08 95 ret + +000000ce : + } + } + + void display_char( unsigned char dat ) + { + PORTC = dat & 0xF0; // hoge nibble + ce: 98 2f mov r25, r24 + d0: 90 7f andi r25, 0xF0 ; 240 + d2: 95 bb out 0x15, r25 ; 21 + PORTC = PORTC | 0x0C; // Enable on (EN = 1, RS=1), + d4: 95 b3 in r25, 0x15 ; 21 + d6: 9c 60 ori r25, 0x0C ; 12 + d8: 95 bb out 0x15, r25 ; 21 + #else + //round up by default + __ticks_dc = (uint32_t)(ceil(fabs(__tmp))); + #endif + + __builtin_avr_delay_cycles(__ticks_dc); + da: ef ec ldi r30, 0xCF ; 207 + dc: f7 e0 ldi r31, 0x07 ; 7 + de: 31 97 sbiw r30, 0x01 ; 1 + e0: f1 f7 brne .-4 ; 0xde + e2: 00 c0 rjmp .+0 ; 0xe4 + e4: 00 00 nop + _delay_ms(1); // wait 1 ms + PORTC = 0x04; // Enable off (EN = 0, RS = 1) + e6: 94 e0 ldi r25, 0x04 ; 4 + e8: 95 bb out 0x15, r25 ; 21 + ea: ef ec ldi r30, 0xCF ; 207 + ec: f7 e0 ldi r31, 0x07 ; 7 + ee: 31 97 sbiw r30, 0x01 ; 1 + f0: f1 f7 brne .-4 ; 0xee + f2: 00 c0 rjmp .+0 ; 0xf4 + f4: 00 00 nop + + _delay_ms(1); // wait 1 ms + + PORTC = (dat & 0x0F) << 4; // lage nibble + f6: f0 e1 ldi r31, 0x10 ; 16 + f8: 8f 9f mul r24, r31 + fa: c0 01 movw r24, r0 + fc: 11 24 eor r1, r1 + fe: 85 bb out 0x15, r24 ; 21 + PORTC = PORTC | 0x0C; // Enable on (RS=1), + 100: 85 b3 in r24, 0x15 ; 21 + 102: 8c 60 ori r24, 0x0C ; 12 + 104: 85 bb out 0x15, r24 ; 21 + 106: 8f ec ldi r24, 0xCF ; 207 + 108: 97 e0 ldi r25, 0x07 ; 7 + 10a: 01 97 sbiw r24, 0x01 ; 1 + 10c: f1 f7 brne .-4 ; 0x10a + 10e: 00 c0 rjmp .+0 ; 0x110 + 110: 00 00 nop + // start (EN=1) + _delay_ms(1); // wait 1 ms + PORTC = 0x00; // stop + 112: 15 ba out 0x15, r1 ; 21 + 114: 08 95 ret + +00000116 : + // (EN=0 RS=0) + } + + void lcd_command ( unsigned char dat ) + { + PORTC = dat & 0xF0; // hoge nibble + 116: 98 2f mov r25, r24 + 118: 90 7f andi r25, 0xF0 ; 240 + 11a: 95 bb out 0x15, r25 ; 21 + PORTC = PORTC | 0x08; // data (RS=0), + 11c: ab 9a sbi 0x15, 3 ; 21 + 11e: ef e9 ldi r30, 0x9F ; 159 + 120: ff e0 ldi r31, 0x0F ; 15 + 122: 31 97 sbiw r30, 0x01 ; 1 + 124: f1 f7 brne .-4 ; 0x122 + 126: 00 c0 rjmp .+0 ; 0x128 + 128: 00 00 nop + // start (EN=1) + _delay_ms(2); // wait 1 ms + PORTC = 0x04; // stop (EN = 0) + 12a: 94 e0 ldi r25, 0x04 ; 4 + 12c: 95 bb out 0x15, r25 ; 21 + 12e: ef e9 ldi r30, 0x9F ; 159 + 130: ff e0 ldi r31, 0x0F ; 15 + 132: 31 97 sbiw r30, 0x01 ; 1 + 134: f1 f7 brne .-4 ; 0x132 + 136: 00 c0 rjmp .+0 ; 0x138 + 138: 00 00 nop + + _delay_ms(2); // wait 1 ms + + PORTC = (dat & 0x0F) << 4; // lage nibble + 13a: f0 e1 ldi r31, 0x10 ; 16 + 13c: 8f 9f mul r24, r31 + 13e: c0 01 movw r24, r0 + 140: 11 24 eor r1, r1 + 142: 85 bb out 0x15, r24 ; 21 + PORTC = PORTC | 0x08; // data (RS=0), + 144: ab 9a sbi 0x15, 3 ; 21 + 146: 8f e9 ldi r24, 0x9F ; 159 + 148: 9f e0 ldi r25, 0x0F ; 15 + 14a: 01 97 sbiw r24, 0x01 ; 1 + 14c: f1 f7 brne .-4 ; 0x14a + 14e: 00 c0 rjmp .+0 ; 0x150 + 150: 00 00 nop + // start (EN=1) + _delay_ms(2); // wait 1 ms + PORTC = 0x00; // stop + 152: 15 ba out 0x15, r1 ; 21 + 154: 08 95 ret + +00000156 : + + _delay_ms(100); + } + +void display_text( int line, char *text, int start ) +{ + 156: 0f 93 push r16 + 158: 1f 93 push r17 + 15a: cf 93 push r28 + 15c: df 93 push r29 + 15e: eb 01 movw r28, r22 + 160: 8a 01 movw r16, r20 + // eerst de eerste 8 karakters = regel 1 + + if(line) + 162: 89 2b or r24, r25 + 164: 49 f0 breq .+18 ; 0x178 + { + // eerste pos regel 1 + lcd_command(0xC0); + 166: 80 ec ldi r24, 0xC0 ; 192 + 168: d6 df rcall .-84 ; 0x116 + lcd_command(0x80); + } + + int count = start; + + while (text[count] != '\0') { + 16a: fe 01 movw r30, r28 + 16c: e0 0f add r30, r16 + 16e: f1 1f adc r31, r17 + 170: 80 81 ld r24, Z + 172: 81 11 cpse r24, r1 + 174: 04 c0 rjmp .+8 ; 0x17e + 176: 11 c0 rjmp .+34 ; 0x19a + lcd_command(0xC0); + } + else + { + // regel 0 + lcd_command(0x80); + 178: 80 e8 ldi r24, 0x80 ; 128 + 17a: cd df rcall .-102 ; 0x116 + 17c: f6 cf rjmp .-20 ; 0x16a + 17e: 0f 5f subi r16, 0xFF ; 255 + 180: 1f 4f sbci r17, 0xFF ; 255 + 182: c0 0f add r28, r16 + 184: d1 1f adc r29, r17 + } + + int count = start; + + while (text[count] != '\0') { + display_char( text[count] ); + 186: a3 df rcall .-186 ; 0xce + 188: 8f ec ldi r24, 0xCF ; 207 + 18a: 97 e0 ldi r25, 0x07 ; 7 + 18c: 01 97 sbiw r24, 0x01 ; 1 + 18e: f1 f7 brne .-4 ; 0x18c + 190: 00 c0 rjmp .+0 ; 0x192 + 192: 00 00 nop + lcd_command(0x80); + } + + int count = start; + + while (text[count] != '\0') { + 194: 89 91 ld r24, Y+ + 196: 81 11 cpse r24, r1 + 198: f6 cf rjmp .-20 ; 0x186 + display_char( text[count] ); + count++; + + _delay_ms(1); + } +} + 19a: df 91 pop r29 + 19c: cf 91 pop r28 + 19e: 1f 91 pop r17 + 1a0: 0f 91 pop r16 + 1a2: 08 95 ret + +000001a4 : + +void clear_display() +{ + lcd_command(0b00000001); + 1a4: 81 e0 ldi r24, 0x01 ; 1 + 1a6: b7 df rcall .-146 ; 0x116 + lcd_command(0b10000000); + 1a8: 80 e8 ldi r24, 0x80 ; 128 + 1aa: b5 cf rjmp .-150 ; 0x116 + 1ac: 08 95 ret + +000001ae : + void display_char(unsigned char dat); + void lcd_command(unsigned char dat); + + void lcd_init() + { + DDRC = 0b11111111; + 1ae: 8f ef ldi r24, 0xFF ; 255 + 1b0: 84 bb out 0x14, r24 ; 20 + 1b2: 2f ef ldi r18, 0xFF ; 255 + 1b4: 80 e7 ldi r24, 0x70 ; 112 + 1b6: 92 e0 ldi r25, 0x02 ; 2 + 1b8: 21 50 subi r18, 0x01 ; 1 + 1ba: 80 40 sbci r24, 0x00 ; 0 + 1bc: 90 40 sbci r25, 0x00 ; 0 + 1be: e1 f7 brne .-8 ; 0x1b8 + 1c0: 00 c0 rjmp .+0 ; 0x1c2 + 1c2: 00 00 nop + + _delay_ms(100); + + // return home + lcd_command( 0x02 ); + 1c4: 82 e0 ldi r24, 0x02 ; 2 + 1c6: a7 df rcall .-178 ; 0x116 + 1c8: 2f e7 ldi r18, 0x7F ; 127 + 1ca: 88 e3 ldi r24, 0x38 ; 56 + 1cc: 91 e0 ldi r25, 0x01 ; 1 + 1ce: 21 50 subi r18, 0x01 ; 1 + 1d0: 80 40 sbci r24, 0x00 ; 0 + 1d2: 90 40 sbci r25, 0x00 ; 0 + 1d4: e1 f7 brne .-8 ; 0x1ce + 1d6: 00 c0 rjmp .+0 ; 0x1d8 + 1d8: 00 00 nop + // mode: 4 bits interface data, 2 lines, 5x8 dots + _delay_ms(50); + lcd_command( 0x28 ); + 1da: 88 e2 ldi r24, 0x28 ; 40 + 1dc: 9c df rcall .-200 ; 0x116 + 1de: 2f e7 ldi r18, 0x7F ; 127 + 1e0: 88 e3 ldi r24, 0x38 ; 56 + 1e2: 91 e0 ldi r25, 0x01 ; 1 + 1e4: 21 50 subi r18, 0x01 ; 1 + 1e6: 80 40 sbci r24, 0x00 ; 0 + 1e8: 90 40 sbci r25, 0x00 ; 0 + 1ea: e1 f7 brne .-8 ; 0x1e4 + 1ec: 00 c0 rjmp .+0 ; 0x1ee + 1ee: 00 00 nop + // display: on, cursor off, blinking off + _delay_ms(50); + lcd_command( 0x0C ); + 1f0: 8c e0 ldi r24, 0x0C ; 12 + 1f2: 91 df rcall .-222 ; 0x116 + 1f4: 2f e7 ldi r18, 0x7F ; 127 + 1f6: 88 e3 ldi r24, 0x38 ; 56 + 1f8: 91 e0 ldi r25, 0x01 ; 1 + 1fa: 21 50 subi r18, 0x01 ; 1 + 1fc: 80 40 sbci r24, 0x00 ; 0 + 1fe: 90 40 sbci r25, 0x00 ; 0 + 200: e1 f7 brne .-8 ; 0x1fa + 202: 00 c0 rjmp .+0 ; 0x204 + 204: 00 00 nop + // entry mode: cursor to right, no shift + _delay_ms(50); + lcd_command( 0x06 ); + 206: 86 e0 ldi r24, 0x06 ; 6 + 208: 86 df rcall .-244 ; 0x116 + 20a: 2f e7 ldi r18, 0x7F ; 127 + 20c: 88 e3 ldi r24, 0x38 ; 56 + 20e: 91 e0 ldi r25, 0x01 ; 1 + 210: 21 50 subi r18, 0x01 ; 1 + 212: 80 40 sbci r24, 0x00 ; 0 + 214: 90 40 sbci r25, 0x00 ; 0 + 216: e1 f7 brne .-8 ; 0x210 + 218: 00 c0 rjmp .+0 ; 0x21a + 21a: 00 00 nop + // RAM address: 0, first position, line 1 + _delay_ms(50); + clear_display(); + 21c: c3 df rcall .-122 ; 0x1a4 + 21e: 2f ef ldi r18, 0xFF ; 255 + 220: 80 e7 ldi r24, 0x70 ; 112 + 222: 92 e0 ldi r25, 0x02 ; 2 + 224: 21 50 subi r18, 0x01 ; 1 + 226: 80 40 sbci r24, 0x00 ; 0 + 228: 90 40 sbci r25, 0x00 ; 0 + 22a: e1 f7 brne .-8 ; 0x224 + 22c: 00 c0 rjmp .+0 ; 0x22e + 22e: 00 00 nop + 230: 08 95 ret + +00000232 : +#include "esp.h" + + +void wait( int ms ) +{ + for (int tms=0; tms + 238: 20 e0 ldi r18, 0x00 ; 0 + 23a: 30 e0 ldi r19, 0x00 ; 0 + 23c: ef ec ldi r30, 0xCF ; 207 + 23e: f7 e0 ldi r31, 0x07 ; 7 + 240: 31 97 sbiw r30, 0x01 ; 1 + 242: f1 f7 brne .-4 ; 0x240 + 244: 00 c0 rjmp .+0 ; 0x246 + 246: 00 00 nop + 248: 2f 5f subi r18, 0xFF ; 255 + 24a: 3f 4f sbci r19, 0xFF ; 255 + 24c: 28 17 cp r18, r24 + 24e: 39 07 cpc r19, r25 + 250: a9 f7 brne .-22 ; 0x23c + 252: 08 95 ret + +00000254
: + } +} + +int main(void) +{ + esp_init(); + 254: 31 df rcall .-414 ; 0xb8 + + wait(50); + 256: 82 e3 ldi r24, 0x32 ; 50 + 258: 90 e0 ldi r25, 0x00 ; 0 + 25a: eb df rcall .-42 ; 0x232 + + lcd_init(); + 25c: a8 df rcall .-176 ; 0x1ae + + display_text(0,"Ready", 0); + 25e: 40 e0 ldi r20, 0x00 ; 0 + 260: 50 e0 ldi r21, 0x00 ; 0 + 262: 64 e0 ldi r22, 0x04 ; 4 + 264: 71 e0 ldi r23, 0x01 ; 1 + 266: 80 e0 ldi r24, 0x00 ; 0 + 268: 90 e0 ldi r25, 0x00 ; 0 + 26a: 75 df rcall .-278 ; 0x156 + + wait(150); + 26c: 86 e9 ldi r24, 0x96 ; 150 + 26e: 90 e0 ldi r25, 0x00 ; 0 + 270: e0 df rcall .-64 ; 0x232 + + clear_display(); + 272: 98 df rcall .-208 ; 0x1a4 + + /* Replace with your application code */ + while (1) + { + wait(1000); // every 50 ms (busy waiting) + 274: 88 ee ldi r24, 0xE8 ; 232 + 276: 93 e0 ldi r25, 0x03 ; 3 + 278: dc df rcall .-72 ; 0x232 + + uart_sendString("AT\0"); + 27a: 80 e0 ldi r24, 0x00 ; 0 + 27c: 91 e0 ldi r25, 0x01 ; 1 + 27e: 24 d0 rcall .+72 ; 0x2c8 + + char c = uart_receiveChar(); // receive string from uart + 280: 1f d0 rcall .+62 ; 0x2c0 + + display_char(c); + 282: 25 df rcall .-438 ; 0xce + } + 284: f7 cf rjmp .-18 ; 0x274 + +00000286 : + else + *string++ = ch; // else fill buffer + } + *string = '\0'; // string terminator + return 0; +} + 286: 9c 01 movw r18, r24 + 288: 99 0f add r25, r25 + 28a: 44 0b sbc r20, r20 + 28c: 55 0b sbc r21, r21 + 28e: 60 e2 ldi r22, 0x20 ; 32 + 290: 71 ea ldi r23, 0xA1 ; 161 + 292: 87 e0 ldi r24, 0x07 ; 7 + 294: 90 e0 ldi r25, 0x00 ; 0 + 296: 2c d0 rcall .+88 ; 0x2f0 <__udivmodsi4> + 298: 21 50 subi r18, 0x01 ; 1 + 29a: 31 09 sbc r19, r1 + 29c: 30 93 90 00 sts 0x0090, r19 + 2a0: 29 b9 out 0x09, r18 ; 9 + 2a2: 86 e0 ldi r24, 0x06 ; 6 + 2a4: 80 93 95 00 sts 0x0095, r24 + 2a8: 1a b8 out 0x0a, r1 ; 10 + 2aa: 08 95 ret + +000002ac : + 2ac: 8a b1 in r24, 0x0a ; 10 + 2ae: 88 61 ori r24, 0x18 ; 24 + 2b0: 8a b9 out 0x0a, r24 ; 10 + 2b2: 08 95 ret + +000002b4 : + 2b4: 5d 9b sbis 0x0b, 5 ; 11 + 2b6: fe cf rjmp .-4 ; 0x2b4 + 2b8: 8c b9 out 0x0c, r24 ; 12 + 2ba: 80 e0 ldi r24, 0x00 ; 0 + 2bc: 90 e0 ldi r25, 0x00 ; 0 + 2be: 08 95 ret + +000002c0 : + 2c0: 5f 9b sbis 0x0b, 7 ; 11 + 2c2: fe cf rjmp .-4 ; 0x2c0 + 2c4: 8c b1 in r24, 0x0c ; 12 + 2c6: 08 95 ret + +000002c8 : + +int uart_sendString( char* string) +{ + 2c8: cf 93 push r28 + 2ca: df 93 push r29 + 2cc: ec 01 movw r28, r24 + int count = 0; + + while (string[count] != '\0') // while contunie + 2ce: 88 81 ld r24, Y + 2d0: 88 23 and r24, r24 + 2d2: 29 f0 breq .+10 ; 0x2de + 2d4: 21 96 adiw r28, 0x01 ; 1 + { + uart_sendChar(string[count]); + 2d6: ee df rcall .-36 ; 0x2b4 + +int uart_sendString( char* string) +{ + int count = 0; + + while (string[count] != '\0') // while contunie + 2d8: 89 91 ld r24, Y+ + 2da: 81 11 cpse r24, r1 + 2dc: fc cf rjmp .-8 ; 0x2d6 + { + uart_sendChar(string[count]); + count++; + } + + uart_sendChar(CR); + 2de: 8d e0 ldi r24, 0x0D ; 13 + 2e0: e9 df rcall .-46 ; 0x2b4 + uart_sendChar(LF); + 2e2: 8a e0 ldi r24, 0x0A ; 10 + 2e4: e7 df rcall .-50 ; 0x2b4 + + return 0; + 2e6: 80 e0 ldi r24, 0x00 ; 0 + 2e8: 90 e0 ldi r25, 0x00 ; 0 + 2ea: df 91 pop r29 + 2ec: cf 91 pop r28 + 2ee: 08 95 ret + +000002f0 <__udivmodsi4>: + 2f0: a1 e2 ldi r26, 0x21 ; 33 + 2f2: 1a 2e mov r1, r26 + 2f4: aa 1b sub r26, r26 + 2f6: bb 1b sub r27, r27 + 2f8: fd 01 movw r30, r26 + 2fa: 0d c0 rjmp .+26 ; 0x316 <__udivmodsi4_ep> + +000002fc <__udivmodsi4_loop>: + 2fc: aa 1f adc r26, r26 + 2fe: bb 1f adc r27, r27 + 300: ee 1f adc r30, r30 + 302: ff 1f adc r31, r31 + 304: a2 17 cp r26, r18 + 306: b3 07 cpc r27, r19 + 308: e4 07 cpc r30, r20 + 30a: f5 07 cpc r31, r21 + 30c: 20 f0 brcs .+8 ; 0x316 <__udivmodsi4_ep> + 30e: a2 1b sub r26, r18 + 310: b3 0b sbc r27, r19 + 312: e4 0b sbc r30, r20 + 314: f5 0b sbc r31, r21 + +00000316 <__udivmodsi4_ep>: + 316: 66 1f adc r22, r22 + 318: 77 1f adc r23, r23 + 31a: 88 1f adc r24, r24 + 31c: 99 1f adc r25, r25 + 31e: 1a 94 dec r1 + 320: 69 f7 brne .-38 ; 0x2fc <__udivmodsi4_loop> + 322: 60 95 com r22 + 324: 70 95 com r23 + 326: 80 95 com r24 + 328: 90 95 com r25 + 32a: 9b 01 movw r18, r22 + 32c: ac 01 movw r20, r24 + 32e: bd 01 movw r22, r26 + 330: cf 01 movw r24, r30 + 332: 08 95 ret + +00000334 <_exit>: + 334: f8 94 cli + +00000336 <__stop_program>: + 336: ff cf rjmp .-2 ; 0x336 <__stop_program> diff --git a/ESP8266/Debug/ESP8266.map b/ESP8266/Debug/ESP8266.map new file mode 100644 index 0000000..f94cdd4 --- /dev/null +++ b/ESP8266/Debug/ESP8266.map @@ -0,0 +1,540 @@ +Archive member included to satisfy reference by file (symbol) + +c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + uart.o (__udivmodsi4) +c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o (exit) +c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + main.o (__do_copy_data) + +Discarded input sections + + .data 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + .bss 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + .text 0x00000000 0x0 esp.o + .data 0x00000000 0x0 esp.o + .bss 0x00000000 0x0 esp.o + .text 0x00000000 0x0 lcd.o + .data 0x00000000 0x0 lcd.o + .bss 0x00000000 0x0 lcd.o + .text.set_cursor + 0x00000000 0x8 lcd.o + .text.shift_display + 0x00000000 0x52 lcd.o + .text 0x00000000 0x0 main.o + .data 0x00000000 0x0 main.o + .bss 0x00000000 0x0 main.o + .text 0x00000000 0x0 uart.o + .data 0x00000000 0x0 uart.o + .bss 0x00000000 0x0 uart.o + .text.uart_receiveString + 0x00000000 0x26 uart.o + .text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc.mul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc.prologue + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc.builtins + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc.fmul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text.libgcc.fixed + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + .text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.mul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.div + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.prologue + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.builtins + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.fmul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text.libgcc.fixed + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.mul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.div + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.prologue + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.builtins + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.fmul + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + .text.libgcc.fixed + 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + +Memory Configuration + +Name Origin Length Attributes +text 0x00000000 0x00020000 xr +data 0x00800100 0x0000ff00 rw !x +eeprom 0x00810000 0x00010000 rw !x +fuse 0x00820000 0x00000400 rw !x +lock 0x00830000 0x00000400 rw !x +signature 0x00840000 0x00000400 rw !x +user_signatures 0x00850000 0x00000400 rw !x +*default* 0x00000000 0xffffffff + +Linker script and memory map + +Address of section .data set to 0x800100 +LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o +LOAD esp.o +LOAD lcd.o +LOAD main.o +LOAD uart.o +START GROUP +LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/../../../../avr/lib/avr51\libm.a +END GROUP +START GROUP +LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a +LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/../../../../avr/lib/avr51\libm.a +LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/../../../../avr/lib/avr51\libc.a +LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51\libatmega128.a +END GROUP + +.hash + *(.hash) + +.dynsym + *(.dynsym) + +.dynstr + *(.dynstr) + +.gnu.version + *(.gnu.version) + +.gnu.version_d + *(.gnu.version_d) + +.gnu.version_r + *(.gnu.version_r) + +.rel.init + *(.rel.init) + +.rela.init + *(.rela.init) + +.rel.text + *(.rel.text) + *(.rel.text.*) + *(.rel.gnu.linkonce.t*) + +.rela.text + *(.rela.text) + *(.rela.text.*) + *(.rela.gnu.linkonce.t*) + +.rel.fini + *(.rel.fini) + +.rela.fini + *(.rela.fini) + +.rel.rodata + *(.rel.rodata) + *(.rel.rodata.*) + *(.rel.gnu.linkonce.r*) + +.rela.rodata + *(.rela.rodata) + *(.rela.rodata.*) + *(.rela.gnu.linkonce.r*) + +.rel.data + *(.rel.data) + *(.rel.data.*) + *(.rel.gnu.linkonce.d*) + +.rela.data + *(.rela.data) + *(.rela.data.*) + *(.rela.gnu.linkonce.d*) + +.rel.ctors + *(.rel.ctors) + +.rela.ctors + *(.rela.ctors) + +.rel.dtors + *(.rel.dtors) + +.rela.dtors + *(.rela.dtors) + +.rel.got + *(.rel.got) + +.rela.got + *(.rela.got) + +.rel.bss + *(.rel.bss) + +.rela.bss + *(.rela.bss) + +.rel.plt + *(.rel.plt) + +.rela.plt + *(.rela.plt) + +.text 0x00000000 0x338 + *(.vectors) + .vectors 0x00000000 0x8c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + 0x00000000 __vector_default + 0x00000000 __vectors + *(.vectors) + *(.progmem.gcc*) + 0x0000008c . = ALIGN (0x2) + 0x0000008c __trampolines_start = . + *(.trampolines) + .trampolines 0x0000008c 0x0 linker stubs + *(.trampolines*) + 0x0000008c __trampolines_end = . + *(.progmem*) + 0x0000008c . = ALIGN (0x2) + *(.jumptables) + *(.jumptables*) + *(.lowtext) + *(.lowtext*) + 0x0000008c __ctors_start = . + *(.ctors) + 0x0000008c __ctors_end = . + 0x0000008c __dtors_start = . + *(.dtors) + 0x0000008c __dtors_end = . + SORT(*)(.ctors) + SORT(*)(.dtors) + *(.init0) + .init0 0x0000008c 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + 0x0000008c __init + *(.init0) + *(.init1) + *(.init1) + *(.init2) + .init2 0x0000008c 0xc C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + *(.init2) + *(.init3) + *(.init3) + *(.init4) + .init4 0x00000098 0x1a c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_copy_data.o) + 0x00000098 __do_copy_data + *(.init4) + *(.init5) + *(.init5) + *(.init6) + *(.init6) + *(.init7) + *(.init7) + *(.init8) + *(.init8) + *(.init9) + .init9 0x000000b2 0x4 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + *(.init9) + *(.text) + .text 0x000000b6 0x2 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + 0x000000b6 __vector_22 + 0x000000b6 __vector_28 + 0x000000b6 __vector_1 + 0x000000b6 __vector_32 + 0x000000b6 __vector_34 + 0x000000b6 __vector_24 + 0x000000b6 __vector_12 + 0x000000b6 __bad_interrupt + 0x000000b6 __vector_6 + 0x000000b6 __vector_31 + 0x000000b6 __vector_3 + 0x000000b6 __vector_23 + 0x000000b6 __vector_30 + 0x000000b6 __vector_25 + 0x000000b6 __vector_11 + 0x000000b6 __vector_13 + 0x000000b6 __vector_17 + 0x000000b6 __vector_19 + 0x000000b6 __vector_7 + 0x000000b6 __vector_27 + 0x000000b6 __vector_5 + 0x000000b6 __vector_33 + 0x000000b6 __vector_4 + 0x000000b6 __vector_9 + 0x000000b6 __vector_2 + 0x000000b6 __vector_21 + 0x000000b6 __vector_15 + 0x000000b6 __vector_29 + 0x000000b6 __vector_8 + 0x000000b6 __vector_26 + 0x000000b6 __vector_14 + 0x000000b6 __vector_10 + 0x000000b6 __vector_16 + 0x000000b6 __vector_18 + 0x000000b6 __vector_20 + 0x000000b8 . = ALIGN (0x2) + *(.text.*) + .text.esp_init + 0x000000b8 0x16 esp.o + 0x000000b8 esp_init + .text.display_char + 0x000000ce 0x48 lcd.o + 0x000000ce display_char + .text.lcd_command + 0x00000116 0x40 lcd.o + 0x00000116 lcd_command + .text.display_text + 0x00000156 0x4e lcd.o + 0x00000156 display_text + .text.clear_display + 0x000001a4 0xa lcd.o + 0x000001a4 clear_display + .text.lcd_init + 0x000001ae 0x84 lcd.o + 0x000001ae lcd_init + .text.wait 0x00000232 0x22 main.o + 0x00000232 wait + .text.main 0x00000254 0x32 main.o + 0x00000254 main + .text.uart_init + 0x00000286 0x26 uart.o + 0x00000286 uart_init + .text.uart_start + 0x000002ac 0x8 uart.o + 0x000002ac uart_start + .text.uart_sendChar + 0x000002b4 0xc uart.o + 0x000002b4 uart_sendChar + .text.uart_receiveChar + 0x000002c0 0x8 uart.o + 0x000002c0 uart_receiveChar + .text.uart_sendString + 0x000002c8 0x28 uart.o + 0x000002c8 uart_sendString + .text.libgcc.div + 0x000002f0 0x44 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodsi4.o) + 0x000002f0 __udivmodsi4 + 0x00000334 . = ALIGN (0x2) + *(.fini9) + .fini9 0x00000334 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + 0x00000334 _exit + 0x00000334 exit + *(.fini9) + *(.fini8) + *(.fini8) + *(.fini7) + *(.fini7) + *(.fini6) + *(.fini6) + *(.fini5) + *(.fini5) + *(.fini4) + *(.fini4) + *(.fini3) + *(.fini3) + *(.fini2) + *(.fini2) + *(.fini1) + *(.fini1) + *(.fini0) + .fini0 0x00000334 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + *(.fini0) + 0x00000338 _etext = . + +.data 0x00800100 0xa load address 0x00000338 + 0x00800100 PROVIDE (__data_start, .) + *(.data) + *(.data*) + *(.rodata) + .rodata 0x00800100 0x4 main.o + *(.rodata*) + .rodata.str1.1 + 0x00800104 0x6 main.o + *(.gnu.linkonce.d*) + 0x0080010a . = ALIGN (0x2) + 0x0080010a _edata = . + 0x0080010a PROVIDE (__data_end, .) + +.bss 0x0080010a 0x0 + 0x0080010a PROVIDE (__bss_start, .) + *(.bss) + *(.bss*) + *(COMMON) + 0x0080010a PROVIDE (__bss_end, .) + 0x00000338 __data_load_start = LOADADDR (.data) + 0x00000342 __data_load_end = (__data_load_start + SIZEOF (.data)) + +.noinit 0x0080010a 0x0 + 0x0080010a PROVIDE (__noinit_start, .) + *(.noinit*) + 0x0080010a PROVIDE (__noinit_end, .) + 0x0080010a _end = . + 0x0080010a PROVIDE (__heap_start, .) + +.eeprom 0x00810000 0x0 + *(.eeprom*) + 0x00810000 __eeprom_end = . + +.fuse + *(.fuse) + *(.lfuse) + *(.hfuse) + *(.efuse) + +.lock + *(.lock*) + +.signature + *(.signature*) + +.user_signatures + *(.user_signatures*) + +.stab + *(.stab) + +.stabstr + *(.stabstr) + +.stab.excl + *(.stab.excl) + +.stab.exclstr + *(.stab.exclstr) + +.stab.index + *(.stab.index) + +.stab.indexstr + *(.stab.indexstr) + +.comment 0x00000000 0x30 + *(.comment) + .comment 0x00000000 0x30 esp.o + 0x31 (size before relaxing) + .comment 0x00000030 0x31 lcd.o + .comment 0x00000030 0x31 main.o + .comment 0x00000030 0x31 uart.o + +.note.gnu.avr.deviceinfo + 0x00000000 0x3c + .note.gnu.avr.deviceinfo + 0x00000000 0x3c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + +.note.gnu.build-id + *(.note.gnu.build-id) + +.debug + *(.debug) + +.line + *(.line) + +.debug_srcinfo + *(.debug_srcinfo) + +.debug_sfnames + *(.debug_sfnames) + +.debug_aranges 0x00000000 0xe0 + *(.debug_aranges) + .debug_aranges + 0x00000000 0x20 esp.o + .debug_aranges + 0x00000020 0x50 lcd.o + .debug_aranges + 0x00000070 0x28 main.o + .debug_aranges + 0x00000098 0x48 uart.o + +.debug_pubnames + *(.debug_pubnames) + +.debug_info 0x00000000 0xb9d + *(.debug_info .gnu.linkonce.wi.*) + .debug_info 0x00000000 0x110 esp.o + .debug_info 0x00000110 0x60e lcd.o + .debug_info 0x0000071e 0x2b4 main.o + .debug_info 0x000009d2 0x1cb uart.o + +.debug_abbrev 0x00000000 0x55f + *(.debug_abbrev) + .debug_abbrev 0x00000000 0xb6 esp.o + .debug_abbrev 0x000000b6 0x1ac lcd.o + .debug_abbrev 0x00000262 0x1a3 main.o + .debug_abbrev 0x00000405 0x15a uart.o + +.debug_line 0x00000000 0x651 + *(.debug_line .debug_line.* .debug_line_end) + .debug_line 0x00000000 0x5a esp.o + .debug_line 0x0000005a 0x2df lcd.o + .debug_line 0x00000339 0x19b main.o + .debug_line 0x000004d4 0x17d uart.o + +.debug_frame 0x00000000 0x1a0 + *(.debug_frame) + .debug_frame 0x00000000 0x24 esp.o + .debug_frame 0x00000024 0xb4 lcd.o + .debug_frame 0x000000d8 0x34 main.o + .debug_frame 0x0000010c 0x94 uart.o + +.debug_str 0x00000000 0x286 + *(.debug_str) + .debug_str 0x00000000 0x13f esp.o + 0x173 (size before relaxing) + .debug_str 0x0000013f 0xd2 lcd.o + 0x227 (size before relaxing) + .debug_str 0x00000211 0x32 main.o + 0x206 (size before relaxing) + .debug_str 0x00000243 0x43 uart.o + 0x1d1 (size before relaxing) + +.debug_loc 0x00000000 0x590 + *(.debug_loc) + .debug_loc 0x00000000 0x35f lcd.o + .debug_loc 0x0000035f 0x7d main.o + .debug_loc 0x000003dc 0x1b4 uart.o + +.debug_macinfo + *(.debug_macinfo) + +.debug_weaknames + *(.debug_weaknames) + +.debug_funcnames + *(.debug_funcnames) + +.debug_typenames + *(.debug_typenames) + +.debug_varnames + *(.debug_varnames) + +.debug_pubtypes + *(.debug_pubtypes) + +.debug_ranges 0x00000000 0xa0 + *(.debug_ranges) + .debug_ranges 0x00000000 0x10 esp.o + .debug_ranges 0x00000010 0x40 lcd.o + .debug_ranges 0x00000050 0x18 main.o + .debug_ranges 0x00000068 0x38 uart.o + +.debug_macro + *(.debug_macro) +OUTPUT(ESP8266.elf elf32-avr) +LOAD linker stubs diff --git a/ESP8266/Debug/ESP8266.srec b/ESP8266/Debug/ESP8266.srec new file mode 100644 index 0000000..3d8959b --- /dev/null +++ b/ESP8266/Debug/ESP8266.srec @@ -0,0 +1,55 @@ +S00F0000455350383236362E7372656357 +S113000045C0000058C0000056C0000054C00000A5 +S113001052C0000050C000004EC000004CC00000A0 +S11300204AC0000048C0000046C0000044C00000B0 +S113003042C0000040C000003EC000003CC00000C0 +S11300403AC0000038C0000036C0000034C00000D0 +S113005032C0000030C000002EC000002CC00000E0 +S11300602AC0000028C0000026C0000024C00000F0 +S113007022C0000020C000001EC000001CC0000000 +S11300801AC0000018C0000016C0000011241FBED2 +S1130090CFEFD0E1DEBFCDBF11E0A0E0B1E0E8E3F7 +S11300A0F3E000E00BBF02C007900D92AA30B10745 +S11300B0D9F7D0D03FC1A4CF80E895E2E4D082E361 +S11300C090E0B7D0F3D08AE090E0B3C00895982FC1 +S11300D0907F95BB95B39C6095BBEFECF7E03197AF +S11300E0F1F700C0000094E095BBEFECF7E0319726 +S11300F0F1F700C00000F0E18F9FC001112485BB1F +S113010085B38C6085BB8FEC97E00197F1F700C055 +S1130110000015BA0895982F907F95BBAB9AEFE92C +S1130120FFE03197F1F700C0000094E095BBEFE9E0 +S1130130FFE03197F1F700C00000F0E18F9FC001AC +S1130140112485BBAB9A8FE99FE00197F1F700C0BA +S1130150000015BA08950F931F93CF93DF93EB011B +S11301608A01892B49F080ECD6DFFE01E00FF11FF4 +S11301708081811104C011C080E8CDDFF6CF0F5F0C +S11301801F4FC00FD11FA3DF8FEC97E00197F1F74A +S113019000C0000089918111F6CFDF91CF911F91AA +S11301A00F91089581E0B7DF80E8B5CF08958FEF10 +S11301B084BB2FEF80E792E0215080409040E1F72C +S11301C000C0000082E0A7DF2FE788E391E0215020 +S11301D080409040E1F700C0000088E29CDF2FE7F8 +S11301E088E391E0215080409040E1F700C0000096 +S11301F08CE091DF2FE788E391E02150804090402C +S1130200E1F700C0000086E086DF2FE788E391E095 +S1130210215080409040E1F700C00000C3DF2FEF81 +S113022080E792E0215080409040E1F700C0000058 +S11302300895181619066CF420E030E0EFECF7E0AE +S11302403197F1F700C000002F5F3F4F281739079F +S1130250A9F7089531DF82E390E0EBDFA8DF40E007 +S113026050E064E071E080E090E075DF86E990E0C2 +S1130270E0DF98DF88EE93E0DCDF80E091E024D0DB +S11302801FD025DFF7CF9C01990F440B550B60E27B +S113029071EA87E090E02CD021503109309390002E +S11302A029B986E0809395001AB808958AB18861C7 +S11302B08AB908955D9BFECF8CB980E090E00895E3 +S11302C05F9BFECF8CB10895CF93DF93EC018881BF +S11302D0882329F02196EEDF89918111FCCF8DE0EE +S11302E0E9DF8AE0E7DF80E090E0DF91CF910895D5 +S11302F0A1E21A2EAA1BBB1BFD010DC0AA1FBB1F26 +S1130300EE1FFF1FA217B307E407F50720F0A21B97 +S1130310B30BE40BF50B661F771F881F991F1A9404 +S113032069F760957095809590959B01AC01BD012E +S10B0330CF010895F894FFCFFA +S10D0338415400005265616479002D +S9030000FC diff --git a/ESP8266/Debug/Makefile b/ESP8266/Debug/Makefile new file mode 100644 index 0000000..6d1a652 --- /dev/null +++ b/ESP8266/Debug/Makefile @@ -0,0 +1,150 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +SHELL := cmd.exe +RM := rm -rf + +USER_OBJS := + +LIBS := +PROJ := + +O_SRCS := +C_SRCS := +S_SRCS := +S_UPPER_SRCS := +OBJ_SRCS := +ASM_SRCS := +PREPROCESSING_SRCS := +OBJS := +OBJS_AS_ARGS := +C_DEPS := +C_DEPS_AS_ARGS := +EXECUTABLES := +OUTPUT_FILE_PATH := +OUTPUT_FILE_PATH_AS_ARGS := +AVR_APP_PATH :=$$$AVR_APP_PATH$$$ +QUOTE := " +ADDITIONAL_DEPENDENCIES:= +OUTPUT_FILE_DEP:= +LIB_DEP:= +LINKER_SCRIPT_DEP:= + +# Every subdirectory with source files must be described here +SUBDIRS := + + +# Add inputs and outputs from these tool invocations to the build variables +C_SRCS += \ +../esp.c \ +../lcd.c \ +../main.c \ +../uart.c + + +PREPROCESSING_SRCS += + + +ASM_SRCS += + + +OBJS += \ +esp.o \ +lcd.o \ +main.o \ +uart.o + +OBJS_AS_ARGS += \ +esp.o \ +lcd.o \ +main.o \ +uart.o + +C_DEPS += \ +esp.d \ +lcd.d \ +main.d \ +uart.d + +C_DEPS_AS_ARGS += \ +esp.d \ +lcd.d \ +main.d \ +uart.d + +OUTPUT_FILE_PATH +=ESP8266.elf + +OUTPUT_FILE_PATH_AS_ARGS +=ESP8266.elf + +ADDITIONAL_DEPENDENCIES:= + +OUTPUT_FILE_DEP:= ./makedep.mk + +LIB_DEP+= + +LINKER_SCRIPT_DEP+= + + +# AVR32/GNU C Compiler + + + + + + + + + +./%.o: .././%.c + @echo Building file: $< + @echo Invoking: AVR/GNU C Compiler : 4.9.2 + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + @echo Finished building: $< + + + + +# AVR32/GNU Preprocessing Assembler + + + +# AVR32/GNU Assembler + + + + +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif +endif + +# Add inputs and outputs from these tool invocations to the build variables + +# All Target +all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) + +$(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) + @echo Building target: $@ + @echo Invoking: AVR/GNU Linker : 4.9.2 + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="ESP8266.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" + @echo Finished building target: $@ + "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "ESP8266.elf" "ESP8266.hex" + "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "ESP8266.elf" "ESP8266.eep" || exit 0 + "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objdump.exe" -h -S "ESP8266.elf" > "ESP8266.lss" + "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O srec -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "ESP8266.elf" "ESP8266.srec" + "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-size.exe" "ESP8266.elf" + + + + + + + +# Other Targets +clean: + -$(RM) $(OBJS_AS_ARGS) $(EXECUTABLES) + -$(RM) $(C_DEPS_AS_ARGS) + rm -rf "ESP8266.elf" "ESP8266.a" "ESP8266.hex" "ESP8266.lss" "ESP8266.eep" "ESP8266.map" "ESP8266.srec" "ESP8266.usersignatures" + \ No newline at end of file diff --git a/ESP8266/Debug/esp.d b/ESP8266/Debug/esp.d new file mode 100644 index 0000000..4e9ff3f --- /dev/null +++ b/ESP8266/Debug/esp.d @@ -0,0 +1,48 @@ +esp.d esp.o: .././esp.c .././uart.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h + +.././uart.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: diff --git a/ESP8266/Debug/lcd.d b/ESP8266/Debug/lcd.d new file mode 100644 index 0000000..10d8e1d --- /dev/null +++ b/ESP8266/Debug/lcd.d @@ -0,0 +1,52 @@ +lcd.d lcd.o: .././lcd.c \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stddef.h \ + .././lcd.h + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stddef.h: + +.././lcd.h: diff --git a/ESP8266/Debug/main.d b/ESP8266/Debug/main.d new file mode 100644 index 0000000..f9c15d8 --- /dev/null +++ b/ESP8266/Debug/main.d @@ -0,0 +1,54 @@ +main.d main.o: .././main.c \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + .././lcd.h .././uart.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ + .././esp.h + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +.././lcd.h: + +.././uart.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +.././esp.h: diff --git a/ESP8266/Debug/makedep.mk b/ESP8266/Debug/makedep.mk new file mode 100644 index 0000000..2ce8b47 --- /dev/null +++ b/ESP8266/Debug/makedep.mk @@ -0,0 +1,12 @@ +################################################################################ +# Automatically-generated file. Do not edit or delete the file +################################################################################ + +esp.c + +lcd.c + +main.c + +uart.c + diff --git a/ESP8266/Debug/uart.d b/ESP8266/Debug/uart.d new file mode 100644 index 0000000..e649c36 --- /dev/null +++ b/ESP8266/Debug/uart.d @@ -0,0 +1,48 @@ +uart.d uart.o: .././uart.c .././uart.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h + +.././uart.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: diff --git a/ESP8266/ESP8266.componentinfo.xml b/ESP8266/ESP8266.componentinfo.xml new file mode 100644 index 0000000..e4d19fe --- /dev/null +++ b/ESP8266/ESP8266.componentinfo.xml @@ -0,0 +1,86 @@ + + + + + + + Device + Startup + + + Atmel + 1.0.0 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs + + + + + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include + + include + C + + + include + + + + + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h + + header + C + w6TcdtnSFTUbj2H2rTwkDQ== + + include/avr/iom128.h + + + + + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c + template + source + C Exe + xcW77LNmpJWc5mbdKemG4g== + + templates/main.c + Main file (.c) + + + + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp + template + source + C Exe + YXFphlh0CtZJU+ebktABgQ== + + templates/main.cpp + Main file (.cpp) + + + + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 + + libraryPrefix + GCC + + + gcc/dev/atmega128 + + + + + ATmega_DFP + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 + true + ATmega128 + + + + Resolved + Fixed + true + + + \ No newline at end of file diff --git a/ESP8266/ESP8266.cproj b/ESP8266/ESP8266.cproj new file mode 100644 index 0000000..6636217 --- /dev/null +++ b/ESP8266/ESP8266.cproj @@ -0,0 +1,136 @@ + + + + 2.0 + 7.0 + com.Atmel.AVRGCC8.C + {481ea0cf-f80c-407f-b02c-90d282175a00} + ATmega128 + none + Executable + C + $(MSBuildProjectName) + .elf + $(MSBuildProjectDirectory)\$(Configuration) + ESP8266 + ESP8266 + ESP8266 + Native + true + false + true + true + + + true + + 2 + 1 + + + + + + + + + + + + + + + + + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" + True + True + True + True + True + False + True + True + + + NDEBUG + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include + + + Optimize for size (-Os) + True + True + True + + + libm + + + + + + + + + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" + True + True + True + True + True + False + True + True + + + DEBUG + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include + + + Optimize (-O1) + True + True + Default (-g2) + True + + + libm + + + Default (-Wa,-g) + + + + + + compile + + + compile + + + compile + + + compile + + + compile + + + compile + + + compile + + + + \ No newline at end of file diff --git a/ESP8266/esp.c b/ESP8266/esp.c new file mode 100644 index 0000000..da69944 --- /dev/null +++ b/ESP8266/esp.c @@ -0,0 +1,20 @@ +/* + * esp.c + * + * Created: 6-4-2016 12:33:10 + * Author: kenny + */ + + #include "uart.h" + + void esp_init() + { + uart_init(9600); + + wait(50); + + uart_start(); + + wait(10); + } + \ No newline at end of file diff --git a/ESP8266/esp.h b/ESP8266/esp.h new file mode 100644 index 0000000..0cabc6e --- /dev/null +++ b/ESP8266/esp.h @@ -0,0 +1,16 @@ +/* + * esp.h + * + * Created: 6-4-2016 12:33:21 + * Author: kenny + */ + + +#ifndef ESP_H_ +#define ESP_H_ + +void esp_init(void); + + + +#endif /* ESP_H_ */ \ No newline at end of file diff --git a/ESP8266/lcd.c b/ESP8266/lcd.c new file mode 100644 index 0000000..69d35fd --- /dev/null +++ b/ESP8266/lcd.c @@ -0,0 +1,124 @@ +/* + * lcd.c + * + * Created: 23-2-2016 14:06:31 + * Author: kenny + */ + #define F_CPU 8000000UL //CPU op 8MHz + + #include + #include + #include + + #include "lcd.h" + + //LOCAL + void display_char(unsigned char dat); + void lcd_command(unsigned char dat); + + void lcd_init() + { + DDRC = 0b11111111; + + _delay_ms(100); + + // return home + lcd_command( 0x02 ); + // mode: 4 bits interface data, 2 lines, 5x8 dots + _delay_ms(50); + lcd_command( 0x28 ); + // display: on, cursor off, blinking off + _delay_ms(50); + lcd_command( 0x0C ); + // entry mode: cursor to right, no shift + _delay_ms(50); + lcd_command( 0x06 ); + // RAM address: 0, first position, line 1 + _delay_ms(50); + clear_display(); + + _delay_ms(100); + } + +void display_text( int line, char *text, int start ) +{ + // eerst de eerste 8 karakters = regel 1 + + if(line) + { + // eerste pos regel 1 + lcd_command(0xC0); + } + else + { + // regel 0 + lcd_command(0x80); + } + + int count = start; + + while (text[count] != '\0') { + display_char( text[count] ); + count++; + + _delay_ms(1); + } +} + +void clear_display() +{ + lcd_command(0b00000001); + lcd_command(0b10000000); +} + + void set_cursor(int position) + { + position = position | (1<<7); + + lcd_command(position); + } + + void shift_display(int left, int count) + { + unsigned char data = left ? 0b00011100 : 0b00011000; + + for (int i=0; i +#include + +#include "lcd.h" +#include "uart.h" +#include "esp.h" + + +void wait( int ms ) +{ + for (int tms=0; tms +#include +#include + +#define BIT(x) (1 << (x)) + + +void uart_init( int baud ) // initialize USART0 - receive/transmit +{ + int ubrr = MYUBRR(baud); + UBRR0H = ubrr>>8; // baudrate register, hoge byte + UBRR0L = ubrr; // baudrate register, lage byte + UCSR0C = 0b00000110; // asynchroon, 8 data - 1 stop - no parity + UCSR0B = 0b00000000; // receiver & transmitter enable +} + +void uart_start( void ) // receiver & transmitter enable +{ + UCSR0B |= BIT(RXEN)|BIT(TXEN); // set bit RXEN = Receiver enable and TXEN = Transmitter enable +} + +int uart_sendChar( char ch ) +{ + while (!(UCSR0A & BIT(UDRE0))) ; // wait until UDRE0 is set: transmit buffer is ready + UDR0 = ch; // send ch + return 0; // OK +} + +char uart_receiveChar( void ) +{ + while (!(UCSR0A & BIT(RXC0))) ; // if RX0 is set: unread data present in buffer + return UDR0; // read ch +} + +int uart_receiveString( char* string) +{ + int stop = 0; // boolean for stop value + char ch; + while (!stop) + { + ch = uart_receiveChar(); // read ch + if ( ch == CR ) // stop at LF + stop = 1; + else + *string++ = ch; // else fill buffer + } + *string = '\0'; // string terminator + return 0; +} + +int uart_sendString( char* string) +{ + int count = 0; + + while (string[count] != '\0') // while contunie + { + uart_sendChar(string[count]); + count++; + } + + uart_sendChar(CR); + uart_sendChar(LF); + + return 0; +} \ No newline at end of file diff --git a/ESP8266/uart.h b/ESP8266/uart.h new file mode 100644 index 0000000..afe2db0 --- /dev/null +++ b/ESP8266/uart.h @@ -0,0 +1,42 @@ +/* + * Project name : uart0 : UART - send / receive characters with waiting + * Author : Avans-TI, JW + * Revision History : 20110227: - initial release; + * Description : This program receive a character, and sends it back + * Test configuration: + MCU: ATmega128 + Dev.Board: BIGAVR6 + Oscillator: External Clock 08.0000 MHz + Ext. Modules: - + SW: AVR-GCC + * NOTES: + - Turn ON switch 12, PEO/PE1 tot RX/TX +*/ + +#ifndef _UART +#define _UART + +#define F_CPU 8000000UL + +#include +#include +#include + +#define LF 0x0a // ascii code for Line Feed +#define CR 0x0d // ascii code for Carriage Return +#define BIT(x) (1 << (x)) +#define MYUBRR(x) F_CPU/16/(x) - 1 // My USART Baud Rate Register + +void uart_init( int ) ; // initialize USART0 - receive/transmit + +void uart_start( void ) ; // UART0 receiver & transmitter enable + +char uart_receiveChar() ; // UART0: receive ch + +int uart_sendChar( char ch ) ; // UART0: send ch + +int uart_receiveString( char* string); // UART0: receive string until LF + +int uart_sendString( char* string); + +#endif \ No newline at end of file diff --git a/MIC-Week1/.vs/MIC-Week1/v14/.atsuo b/MIC-Week1/.vs/MIC-Week1/v14/.atsuo index afddd36..b64cf17 100644 Binary files a/MIC-Week1/.vs/MIC-Week1/v14/.atsuo and b/MIC-Week1/.vs/MIC-Week1/v14/.atsuo differ diff --git a/MIC-Week1/Debug/Makefile b/MIC-Week1/Debug/Makefile index afdcae5..84f1fec 100644 --- a/MIC-Week1/Debug/Makefile +++ b/MIC-Week1/Debug/Makefile @@ -78,7 +78,7 @@ LINKER_SCRIPT_DEP+= ./%.o: .././%.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -107,7 +107,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week1.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week1.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "MIC-Week1.elf" "MIC-Week1.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "MIC-Week1.elf" "MIC-Week1.eep" || exit 0 diff --git a/MIC-Week1/MIC-Week1.atsln b/MIC-Week1/MIC-Week1.atsln index 5017ee3..9e3b9de 100644 --- a/MIC-Week1/MIC-Week1.atsln +++ b/MIC-Week1/MIC-Week1.atsln @@ -15,6 +15,8 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "MIC-Week5", "..\MIC-Week5\M EndProject Project("{18226A42-8477-4023-8AD2-40C49DA407C9}") = "MIC-Week6", "..\MIC-Week6\MIC-Week6.asmproj", "{59B1D629-9DCC-43ED-A0FD-8AB0E4D622AB}" EndProject +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "ESP8266", "..\ESP8266\ESP8266.cproj", "{481EA0CF-F80C-407F-B02C-90D282175A00}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|AVR = Debug|AVR @@ -45,6 +47,10 @@ Global {59B1D629-9DCC-43ED-A0FD-8AB0E4D622AB}.Debug|AVR.Build.0 = Debug|AVR {59B1D629-9DCC-43ED-A0FD-8AB0E4D622AB}.Release|AVR.ActiveCfg = Release|AVR {59B1D629-9DCC-43ED-A0FD-8AB0E4D622AB}.Release|AVR.Build.0 = Release|AVR + {481EA0CF-F80C-407F-B02C-90D282175A00}.Debug|AVR.ActiveCfg = Debug|AVR + {481EA0CF-F80C-407F-B02C-90D282175A00}.Debug|AVR.Build.0 = Debug|AVR + {481EA0CF-F80C-407F-B02C-90D282175A00}.Release|AVR.ActiveCfg = Release|AVR + {481EA0CF-F80C-407F-B02C-90D282175A00}.Release|AVR.Build.0 = Release|AVR EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MIC-Week1/MIC-Week1.componentinfo.xml b/MIC-Week1/MIC-Week1.componentinfo.xml index 5ceaf94..5b64613 100644 --- a/MIC-Week1/MIC-Week1.componentinfo.xml +++ b/MIC-Week1/MIC-Week1.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include\avr\iom128.h + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.c + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.cpp + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128 diff --git a/MIC-Week1/MIC-Week1.cproj b/MIC-Week1/MIC-Week1.cproj index a5fd715..40e05fa 100644 --- a/MIC-Week1/MIC-Week1.cproj +++ b/MIC-Week1/MIC-Week1.cproj @@ -55,7 +55,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -71,7 +71,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize for size (-Os) @@ -89,7 +89,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -105,7 +105,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize (-O1) diff --git a/MIC-Week2/Debug/Makefile b/MIC-Week2/Debug/Makefile index a37d0d6..7639310 100644 --- a/MIC-Week2/Debug/Makefile +++ b/MIC-Week2/Debug/Makefile @@ -78,7 +78,7 @@ LINKER_SCRIPT_DEP+= ./%.o: .././%.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -107,7 +107,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week2.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week2.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "MIC-Week2.elf" "MIC-Week2.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "MIC-Week2.elf" "MIC-Week2.eep" || exit 0 diff --git a/MIC-Week2/MIC-Week2.componentinfo.xml b/MIC-Week2/MIC-Week2.componentinfo.xml index 5ceaf94..5b64613 100644 --- a/MIC-Week2/MIC-Week2.componentinfo.xml +++ b/MIC-Week2/MIC-Week2.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include\avr\iom128.h + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.c + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.cpp + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128 diff --git a/MIC-Week2/MIC-Week2.cproj b/MIC-Week2/MIC-Week2.cproj index 5d48a58..c34381a 100644 --- a/MIC-Week2/MIC-Week2.cproj +++ b/MIC-Week2/MIC-Week2.cproj @@ -42,7 +42,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -58,7 +58,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize for size (-Os) @@ -76,7 +76,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -92,7 +92,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize (-O1) diff --git a/MIC-Week3/Debug/Makefile b/MIC-Week3/Debug/Makefile index 2e06c23..5e3743e 100644 --- a/MIC-Week3/Debug/Makefile +++ b/MIC-Week3/Debug/Makefile @@ -85,7 +85,7 @@ LINKER_SCRIPT_DEP+= ./%.o: .././%.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -114,7 +114,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week3.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week3.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "MIC-Week3.elf" "MIC-Week3.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "MIC-Week3.elf" "MIC-Week3.eep" || exit 0 diff --git a/MIC-Week3/MIC-Week3.componentinfo.xml b/MIC-Week3/MIC-Week3.componentinfo.xml index 5ceaf94..5b64613 100644 --- a/MIC-Week3/MIC-Week3.componentinfo.xml +++ b/MIC-Week3/MIC-Week3.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include\avr\iom128.h + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.c + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.cpp + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128 diff --git a/MIC-Week3/MIC-Week3.cproj b/MIC-Week3/MIC-Week3.cproj index ba43ee4..b2a296b 100644 --- a/MIC-Week3/MIC-Week3.cproj +++ b/MIC-Week3/MIC-Week3.cproj @@ -42,7 +42,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -58,7 +58,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize for size (-Os) @@ -76,7 +76,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -92,7 +92,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize (-O1) diff --git a/MIC-Week4/Debug/Makefile b/MIC-Week4/Debug/Makefile index 7c37b11..c84d839 100644 --- a/MIC-Week4/Debug/Makefile +++ b/MIC-Week4/Debug/Makefile @@ -85,7 +85,7 @@ LINKER_SCRIPT_DEP+= ./%.o: .././%.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -114,7 +114,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week4.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week4.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "MIC-Week4.elf" "MIC-Week4.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "MIC-Week4.elf" "MIC-Week4.eep" || exit 0 diff --git a/MIC-Week4/MIC-Week4.componentinfo.xml b/MIC-Week4/MIC-Week4.componentinfo.xml index 5ceaf94..5b64613 100644 --- a/MIC-Week4/MIC-Week4.componentinfo.xml +++ b/MIC-Week4/MIC-Week4.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include\avr\iom128.h + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.c + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.cpp + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128 diff --git a/MIC-Week4/MIC-Week4.cproj b/MIC-Week4/MIC-Week4.cproj index d68f06a..f0841bc 100644 --- a/MIC-Week4/MIC-Week4.cproj +++ b/MIC-Week4/MIC-Week4.cproj @@ -42,7 +42,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -58,7 +58,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize for size (-Os) @@ -76,7 +76,7 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" True True True @@ -92,7 +92,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include Optimize (-O1) diff --git a/MIC-Week5/Debug/MIC-Week5.lss b/MIC-Week5/Debug/MIC-Week5.lss index 74c0407..2305298 100644 --- a/MIC-Week5/Debug/MIC-Week5.lss +++ b/MIC-Week5/Debug/MIC-Week5.lss @@ -3,29 +3,29 @@ MIC-Week5.elf: file format elf32-avr Sections: Idx Name Size VMA LMA File off Algn - 0 .data 00000000 00800100 00800100 0000037c 2**0 + 0 .data 00000000 00800100 00800100 0000015a 2**0 CONTENTS, ALLOC, LOAD, DATA - 1 .text 00000328 00000000 00000000 00000054 2**1 + 1 .text 00000106 00000000 00000000 00000054 2**1 CONTENTS, ALLOC, LOAD, READONLY, CODE - 2 .comment 00000030 00000000 00000000 0000037c 2**0 + 2 .comment 00000030 00000000 00000000 0000015a 2**0 CONTENTS, READONLY - 3 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000003ac 2**2 + 3 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 0000018c 2**2 CONTENTS, READONLY - 4 .debug_aranges 000000c8 00000000 00000000 000003e8 2**0 + 4 .debug_aranges 00000098 00000000 00000000 000001c8 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_info 00000d78 00000000 00000000 000004b0 2**0 + 5 .debug_info 000009aa 00000000 00000000 00000260 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_abbrev 00000359 00000000 00000000 00001228 2**0 + 6 .debug_abbrev 00000330 00000000 00000000 00000c0a 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_line 00000702 00000000 00000000 00001581 2**0 + 7 .debug_line 000005a1 00000000 00000000 00000f3a 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_frame 000001e8 00000000 00000000 00001c84 2**2 + 8 .debug_frame 00000178 00000000 00000000 000014dc 2**2 CONTENTS, READONLY, DEBUGGING - 9 .debug_str 00000309 00000000 00000000 00001e6c 2**0 + 9 .debug_str 000002c3 00000000 00000000 00001654 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_loc 000005d2 00000000 00000000 00002175 2**0 + 10 .debug_loc 00000436 00000000 00000000 00001917 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_ranges 000000c0 00000000 00000000 00002747 2**0 + 11 .debug_ranges 00000090 00000000 00000000 00001d4d 2**0 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -109,24 +109,30 @@ Disassembly of section .text: 92: d0 e1 ldi r29, 0x10 ; 16 94: de bf out 0x3e, r29 ; 62 96: cd bf out 0x3d, r28 ; 61 - 98: 86 d0 rcall .+268 ; 0x1a6
- 9a: 44 c1 rjmp .+648 ; 0x324 <_exit> + 98: 20 d0 rcall .+64 ; 0xda
+ 9a: 33 c0 rjmp .+102 ; 0x102 <_exit> 0000009c <__bad_interrupt>: 9c: b1 cf rjmp .-158 ; 0x0 <__vectors> 0000009e : - spi_write(i); // digit value: i (= digit place) - spi_slaveDeSelect(0); // Deselect display chip - wait(500); - } -} +// wait(): busy waiting for 'ms' millisecond +// Used library: util/delay.h +void wait( int ms ) +{ + for (int tms=0; tms a4: 20 e0 ldi r18, 0x00 ; 0 a6: 30 e0 ldi r19, 0x00 ; 0 + #else + //round up by default + __ticks_dc = (uint32_t)(ceil(fabs(__tmp))); + #endif + + __builtin_avr_delay_cycles(__ticks_dc); a8: ef ec ldi r30, 0xCF ; 207 aa: f7 e0 ldi r31, 0x07 ; 7 ac: 31 97 sbiw r30, 0x01 ; 1 @@ -140,522 +146,101 @@ Disassembly of section .text: bc: a9 f7 brne .-22 ; 0xa8 be: 08 95 ret -000000c0 : +000000c0 : -int test2(void) + +// send/receive uart - dB-meter +int opgaveb1( void ) { - c0: 6f 92 push r6 - c2: 7f 92 push r7 - c4: 8f 92 push r8 - c6: 9f 92 push r9 - c8: af 92 push r10 - ca: bf 92 push r11 - cc: cf 92 push r12 - ce: df 92 push r13 - d0: ef 92 push r14 - d2: ff 92 push r15 - d4: 0f 93 push r16 - d6: 1f 93 push r17 - d8: cf 93 push r28 - da: df 93 push r29 - DDRB=0x01; // Set PB0 pin as output for display select - dc: 81 e0 ldi r24, 0x01 ; 1 - de: 87 bb out 0x17, r24 ; 23 + DDRD = 0xFF; + c0: 8f ef ldi r24, 0xFF ; 255 + c2: 81 bb out 0x11, r24 ; 17 - spi_masterInit(); // Initialize spi module - e0: 66 d0 rcall .+204 ; 0x1ae - displayDriverInit(); // Initialize display chip - e2: 87 d0 rcall .+270 ; 0x1f2 - int dir = 0; - int factor = 0; + usart0_init(); // initialize USART0 + c4: 0b d0 rcall .+22 ; 0xdc + usart0_start(); + c6: 13 d0 rcall .+38 ; 0xee - for(int i=-999; i<=9999; i++) + while (1) { - writeLedDisplay(i); - e4: 89 e1 ldi r24, 0x19 ; 25 - e6: 9c ef ldi r25, 0xFC ; 252 - e8: ca d0 rcall .+404 ; 0x27e - wait(5); - ea: 85 e0 ldi r24, 0x05 ; 5 - ec: 90 e0 ldi r25, 0x00 ; 0 - ee: d7 df rcall .-82 ; 0x9e + wait(50); // every 50 ms (busy waiting) + c8: 82 e3 ldi r24, 0x32 ; 50 + ca: 90 e0 ldi r25, 0x00 ; 0 + cc: e8 df rcall .-48 ; 0x9e - int intsy = 0; - int dir = 0; - int factor = 0; + //if(c >= 'a' && c <= 'z'){ + // c = ('A' + c - 'a'); + //} - for(int i=-999; i<=9999; i++) - f0: 09 e1 ldi r16, 0x19 ; 25 - f2: 1c ef ldi r17, 0xFC ; 252 + PORTD ^= 0x80; + ce: 82 b3 in r24, 0x12 ; 18 + d0: 80 58 subi r24, 0x80 ; 128 + d2: 82 bb out 0x12, r24 ; 18 - spi_masterInit(); // Initialize spi module - displayDriverInit(); // Initialize display chip + uart0_sendChar('*'); + d4: 8a e2 ldi r24, 0x2A ; 42 + d6: 0f d0 rcall .+30 ; 0xf6 - int intsy = 0; - int dir = 0; - f4: e1 2c mov r14, r1 - f6: f1 2c mov r15, r1 - DDRB=0x01; // Set PB0 pin as output for display select - - spi_masterInit(); // Initialize spi module - displayDriverInit(); // Initialize display chip - - int intsy = 0; - f8: c0 e0 ldi r28, 0x00 ; 0 - fa: d0 e0 ldi r29, 0x00 ; 0 - intsy--; - - if(intsy < 0x06) - { - intsy = 0x06; - dir = 1; - fc: aa 24 eor r10, r10 - fe: a3 94 inc r10 - 100: b1 2c mov r11, r1 - else - intsy--; - - if(intsy < 0x06) - { - intsy = 0x06; - 102: 0f 2e mov r0, r31 - 104: f6 e0 ldi r31, 0x06 ; 6 - 106: cf 2e mov r12, r31 - 108: f0 2d mov r31, r0 - 10a: d1 2c mov r13, r1 - dir = 1; - } - else if(intsy > 0x0F) - { - intsy = 0x0F; - dir = 0; - 10c: 61 2c mov r6, r1 - 10e: 71 2c mov r7, r1 - intsy = 0x06; - dir = 1; - } - else if(intsy > 0x0F) - { - intsy = 0x0F; - 110: 0f 2e mov r0, r31 - 112: ff e0 ldi r31, 0x0F ; 15 - 114: 8f 2e mov r8, r31 - 116: f0 2d mov r31, r0 - 118: 91 2c mov r9, r1 - 11a: 0e c0 rjmp .+28 ; 0x138 - int dir = 0; - int factor = 0; - - for(int i=-999; i<=9999; i++) - { - writeLedDisplay(i); - 11c: c8 01 movw r24, r16 - 11e: af d0 rcall .+350 ; 0x27e - wait(5); - 120: 85 e0 ldi r24, 0x05 ; 5 - 122: 90 e0 ldi r25, 0x00 ; 0 - 124: bc df rcall .-136 ; 0x9e - 126: c8 01 movw r24, r16 - 128: 87 50 subi r24, 0x07 ; 7 - 12a: 9f 4f sbci r25, 0xFF ; 255 - - if(i < -150 && i > -250) - 12c: 83 36 cpi r24, 0x63 ; 99 - 12e: 91 05 cpc r25, r1 - 130: 18 f4 brcc .+6 ; 0x138 - wait(75); - 132: 8b e4 ldi r24, 0x4B ; 75 - 134: 90 e0 ldi r25, 0x00 ; 0 - 136: b3 df rcall .-154 ; 0x9e - 138: c8 01 movw r24, r16 - 13a: 87 59 subi r24, 0x97 ; 151 - 13c: 91 09 sbc r25, r1 - - if(i > 150 && i < 250) - 13e: 83 36 cpi r24, 0x63 ; 99 - 140: 91 05 cpc r25, r1 - 142: 18 f4 brcc .+6 ; 0x14a - wait(75); - 144: 8b e4 ldi r24, 0x4B ; 75 - 146: 90 e0 ldi r25, 0x00 ; 0 - 148: aa df rcall .-172 ; 0x9e - - if(dir) - 14a: e1 14 cp r14, r1 - 14c: f1 04 cpc r15, r1 - 14e: 11 f0 breq .+4 ; 0x154 - intsy++; - 150: 21 96 adiw r28, 0x01 ; 1 - 152: 01 c0 rjmp .+2 ; 0x156 - else - intsy--; - 154: 21 97 sbiw r28, 0x01 ; 1 - - if(intsy < 0x06) - 156: c6 30 cpi r28, 0x06 ; 6 - 158: d1 05 cpc r29, r1 - 15a: 44 f0 brlt .+16 ; 0x16c - { - intsy = 0x06; - dir = 1; - } - else if(intsy > 0x0F) - 15c: c0 31 cpi r28, 0x10 ; 16 - 15e: d1 05 cpc r29, r1 - 160: 4c f0 brlt .+18 ; 0x174 - { - intsy = 0x0F; - dir = 0; - 162: e6 2c mov r14, r6 - 164: f7 2c mov r15, r7 - intsy = 0x06; - dir = 1; - } - else if(intsy > 0x0F) - { - intsy = 0x0F; - 166: c8 2d mov r28, r8 - 168: d9 2d mov r29, r9 - 16a: 04 c0 rjmp .+8 ; 0x174 - intsy--; - - if(intsy < 0x06) - { - intsy = 0x06; - dir = 1; - 16c: ea 2c mov r14, r10 - 16e: fb 2c mov r15, r11 - else - intsy--; - - if(intsy < 0x06) - { - intsy = 0x06; - 170: cc 2d mov r28, r12 - 172: dd 2d mov r29, r13 - { - intsy = 0x0F; - dir = 0; - } - - spi_intensity(intsy); - 174: ce 01 movw r24, r28 - 176: 5e d0 rcall .+188 ; 0x234 - - int intsy = 0; - int dir = 0; - int factor = 0; - - for(int i=-999; i<=9999; i++) - 178: 0f 5f subi r16, 0xFF ; 255 - 17a: 1f 4f sbci r17, 0xFF ; 255 - 17c: 00 31 cpi r16, 0x10 ; 16 - 17e: 87 e2 ldi r24, 0x27 ; 39 - 180: 18 07 cpc r17, r24 - 182: 61 f6 brne .-104 ; 0x11c - - spi_intensity(intsy); + //uart0_sendChar('*'); } + d8: f7 cf rjmp .-18 ; 0xc8 - return 1; - 184: 81 e0 ldi r24, 0x01 ; 1 - 186: 90 e0 ldi r25, 0x00 ; 0 - 188: df 91 pop r29 - 18a: cf 91 pop r28 - 18c: 1f 91 pop r17 - 18e: 0f 91 pop r16 - 190: ff 90 pop r15 - 192: ef 90 pop r14 - 194: df 90 pop r13 - 196: cf 90 pop r12 - 198: bf 90 pop r11 - 19a: af 90 pop r10 - 19c: 9f 90 pop r9 - 19e: 8f 90 pop r8 - 1a0: 7f 90 pop r7 - 1a2: 6f 90 pop r6 - 1a4: 08 95 ret - -000001a6
: - - //opgaveb3(); - //opgaveb4(); - - //test(); - test2(); - 1a6: 8c df rcall .-232 ; 0xc0 - return 0; -} - 1a8: 80 e0 ldi r24, 0x00 ; 0 - 1aa: 90 e0 ldi r25, 0x00 ; 0 - 1ac: 08 95 ret - -000001ae : -void displayOff() -{ - spi_slaveSelect(0); // Select display chip - spi_write(0x0C); // Register 0B: Shutdown register - spi_write(0x00); // -> 1 = Normal operation - spi_slaveDeSelect(0); // Deselect display chip - 1ae: 8f ef ldi r24, 0xFF ; 255 - 1b0: 87 bb out 0x17, r24 ; 23 - 1b2: bb 98 cbi 0x17, 3 ; 23 - 1b4: c0 9a sbi 0x18, 0 ; 24 - 1b6: 82 e5 ldi r24, 0x52 ; 82 - 1b8: 8d b9 out 0x0d, r24 ; 13 - 1ba: 08 95 ret - -000001bc : - 1bc: 8f b9 out 0x0f, r24 ; 15 - 1be: 77 9b sbis 0x0e, 7 ; 14 - 1c0: fe cf rjmp .-4 ; 0x1be - 1c2: 08 95 ret - -000001c4 : - 1c4: 98 b3 in r25, 0x18 ; 24 - 1c6: 21 e0 ldi r18, 0x01 ; 1 - 1c8: 30 e0 ldi r19, 0x00 ; 0 - 1ca: 02 c0 rjmp .+4 ; 0x1d0 - 1cc: 22 0f add r18, r18 - 1ce: 33 1f adc r19, r19 - 1d0: 8a 95 dec r24 - 1d2: e2 f7 brpl .-8 ; 0x1cc - 1d4: 20 95 com r18 - 1d6: 29 23 and r18, r25 - 1d8: 28 bb out 0x18, r18 ; 24 - 1da: 08 95 ret - -000001dc : - 1dc: 98 b3 in r25, 0x18 ; 24 - 1de: 21 e0 ldi r18, 0x01 ; 1 - 1e0: 30 e0 ldi r19, 0x00 ; 0 - 1e2: 02 c0 rjmp .+4 ; 0x1e8 - 1e4: 22 0f add r18, r18 - 1e6: 33 1f adc r19, r19 - 1e8: 8a 95 dec r24 - 1ea: e2 f7 brpl .-8 ; 0x1e4 - 1ec: 29 2b or r18, r25 - 1ee: 28 bb out 0x18, r18 ; 24 - 1f0: 08 95 ret - -000001f2 : - 1f2: 80 e0 ldi r24, 0x00 ; 0 - 1f4: e7 df rcall .-50 ; 0x1c4 - 1f6: 89 e0 ldi r24, 0x09 ; 9 - 1f8: e1 df rcall .-62 ; 0x1bc - 1fa: 8f ef ldi r24, 0xFF ; 255 - 1fc: df df rcall .-66 ; 0x1bc - 1fe: 80 e0 ldi r24, 0x00 ; 0 - 200: ed df rcall .-38 ; 0x1dc - 202: 80 e0 ldi r24, 0x00 ; 0 - 204: df df rcall .-66 ; 0x1c4 - 206: 8a e0 ldi r24, 0x0A ; 10 - 208: d9 df rcall .-78 ; 0x1bc - 20a: 8f e0 ldi r24, 0x0F ; 15 - 20c: d7 df rcall .-82 ; 0x1bc - 20e: 80 e0 ldi r24, 0x00 ; 0 - 210: e5 df rcall .-54 ; 0x1dc - 212: 80 e0 ldi r24, 0x00 ; 0 - 214: d7 df rcall .-82 ; 0x1c4 - 216: 8b e0 ldi r24, 0x0B ; 11 - 218: d1 df rcall .-94 ; 0x1bc - 21a: 83 e0 ldi r24, 0x03 ; 3 - 21c: cf df rcall .-98 ; 0x1bc - 21e: 80 e0 ldi r24, 0x00 ; 0 - 220: dd df rcall .-70 ; 0x1dc - 222: 80 e0 ldi r24, 0x00 ; 0 - 224: cf df rcall .-98 ; 0x1c4 - 226: 8c e0 ldi r24, 0x0C ; 12 - 228: c9 df rcall .-110 ; 0x1bc - 22a: 81 e0 ldi r24, 0x01 ; 1 - 22c: c7 df rcall .-114 ; 0x1bc - 22e: 80 e0 ldi r24, 0x00 ; 0 - 230: d5 cf rjmp .-86 ; 0x1dc - 232: 08 95 ret - -00000234 : - 234: cf 93 push r28 - 236: df 93 push r29 - 238: ec 01 movw r28, r24 - 23a: 99 23 and r25, r25 - 23c: 14 f4 brge .+4 ; 0x242 - 23e: c0 e0 ldi r28, 0x00 ; 0 - 240: d0 e0 ldi r29, 0x00 ; 0 - 242: 80 e0 ldi r24, 0x00 ; 0 - 244: bf df rcall .-130 ; 0x1c4 - 246: 8a e0 ldi r24, 0x0A ; 10 - 248: b9 df rcall .-142 ; 0x1bc - 24a: ce 01 movw r24, r28 - 24c: 60 97 sbiw r28, 0x10 ; 16 - 24e: 14 f0 brlt .+4 ; 0x254 - 250: 8f e0 ldi r24, 0x0F ; 15 - 252: 90 e0 ldi r25, 0x00 ; 0 - 254: b3 df rcall .-154 ; 0x1bc - 256: 80 e0 ldi r24, 0x00 ; 0 - 258: c1 df rcall .-126 ; 0x1dc - 25a: df 91 pop r29 - 25c: cf 91 pop r28 - 25e: 08 95 ret - -00000260 : +000000da
: + } } -void spi_writeWord( unsigned char adress, unsigned char data ) +int main( void ) { - 260: cf 93 push r28 - 262: df 93 push r29 - 264: d8 2f mov r29, r24 - 266: c6 2f mov r28, r22 - spi_slaveSelect(0); // Select display chip - 268: 80 e0 ldi r24, 0x00 ; 0 - 26a: ac df rcall .-168 ; 0x1c4 - spi_write(adress); // Write address - 26c: 8d 2f mov r24, r29 - 26e: a6 df rcall .-180 ; 0x1bc - spi_write(data); // Write data - 270: 8c 2f mov r24, r28 - 272: a4 df rcall .-184 ; 0x1bc - spi_slaveDeSelect(0); // Deselect display chip - 274: 80 e0 ldi r24, 0x00 ; 0 - 276: b2 df rcall .-156 ; 0x1dc + opgaveb1(); + da: f2 df rcall .-28 ; 0xc0 + +000000dc : + + +void usart0_init( void ) // initialize USART0 - receive/transmit +{ + int ubrr = MYUBRR; + UBRR0H = ubrr>>8; // baudrate register, hoge byte + dc: 10 92 90 00 sts 0x0090, r1 + UBRR0L = ubrr; // baudrate register, lage byte + e0: 8f ec ldi r24, 0xCF ; 207 + e2: 89 b9 out 0x09, r24 ; 9 + UCSR0C = 0b00000110; // asynchroon, 8 data - 1 stop - no parity + e4: 86 e0 ldi r24, 0x06 ; 6 + e6: 80 93 95 00 sts 0x0095, r24 + UCSR0B = 0b00000000; // receiver & transmitter enable + ea: 1a b8 out 0x0a, r1 ; 10 + ec: 08 95 ret + +000000ee : } - 278: df 91 pop r29 - 27a: cf 91 pop r28 - 27c: 08 95 ret -0000027e : - -void writeLedDisplay( int value ) +void usart0_start( void ) // receiver & transmitter enable { - 27e: cf 93 push r28 - 280: df 93 push r29 - if(value > 9999 || value < -999) - 282: 9c 01 movw r18, r24 - 284: 29 51 subi r18, 0x19 ; 25 - 286: 3c 4f sbci r19, 0xFC ; 252 - 288: 27 3f cpi r18, 0xF7 ; 247 - 28a: 3a 42 sbci r19, 0x2A ; 42 - 28c: 08 f5 brcc .+66 ; 0x2d0 - return; + UCSR0B |= BIT(RXEN)|BIT(TXEN); // set bit RXEN = Receiver enable and TXEN = Transmitter enable + ee: 8a b1 in r24, 0x0a ; 10 + f0: 88 61 ori r24, 0x18 ; 24 + f2: 8a b9 out 0x0a, r24 ; 10 + f4: 08 95 ret - if(value < 0) - 28e: 99 23 and r25, r25 - 290: 44 f4 brge .+16 ; 0x2a2 - { - value = value - (value + value); - 292: cc 27 eor r28, r28 - 294: dd 27 eor r29, r29 - 296: c8 1b sub r28, r24 - 298: d9 0b sbc r29, r25 - spi_writeWord(4, 10); - 29a: 6a e0 ldi r22, 0x0A ; 10 - 29c: 84 e0 ldi r24, 0x04 ; 4 - 29e: e0 df rcall .-64 ; 0x260 - 2a0: 06 c0 rjmp .+12 ; 0x2ae - } - else - { - //Display 4 - int d4 = value / 1000; - value = value % 1000; - 2a2: 68 ee ldi r22, 0xE8 ; 232 - 2a4: 73 e0 ldi r23, 0x03 ; 3 - 2a6: 17 d0 rcall .+46 ; 0x2d6 <__divmodhi4> - 2a8: ec 01 movw r28, r24 - spi_writeWord(4, d4); - 2aa: 84 e0 ldi r24, 0x04 ; 4 - 2ac: d9 df rcall .-78 ; 0x260 - } +000000f6 : +} - //Display 3 - int d3 = value / 100; - value = value % 100; - 2ae: ce 01 movw r24, r28 - 2b0: 64 e6 ldi r22, 0x64 ; 100 - 2b2: 70 e0 ldi r23, 0x00 ; 0 - 2b4: 10 d0 rcall .+32 ; 0x2d6 <__divmodhi4> - 2b6: ec 01 movw r28, r24 - spi_writeWord(3, d3); - 2b8: 83 e0 ldi r24, 0x03 ; 3 - 2ba: d2 df rcall .-92 ; 0x260 +int uart0_sendChar( char ch ) +{ + while (!(UCSR0A & BIT(UDRE0))) ; // wait until UDRE0 is set: transmit buffer is ready + f6: 5d 9b sbis 0x0b, 5 ; 11 + f8: fe cf rjmp .-4 ; 0xf6 + UDR0 = ch; // send ch + fa: 8c b9 out 0x0c, r24 ; 12 + return 0; // OK +} + fc: 80 e0 ldi r24, 0x00 ; 0 + fe: 90 e0 ldi r25, 0x00 ; 0 + 100: 08 95 ret - //Display 2 - int d2 = value / 10; - 2bc: ce 01 movw r24, r28 - 2be: 6a e0 ldi r22, 0x0A ; 10 - 2c0: 70 e0 ldi r23, 0x00 ; 0 - 2c2: 09 d0 rcall .+18 ; 0x2d6 <__divmodhi4> - 2c4: c8 2f mov r28, r24 - value = value % 10; - spi_writeWord(2, d2); - 2c6: 82 e0 ldi r24, 0x02 ; 2 - 2c8: cb df rcall .-106 ; 0x260 +00000102 <_exit>: + 102: f8 94 cli - //Display 1 - int d1 = value; - spi_writeWord(1, d1); - 2ca: 6c 2f mov r22, r28 - 2cc: 81 e0 ldi r24, 0x01 ; 1 - 2ce: c8 df rcall .-112 ; 0x260 - 2d0: df 91 pop r29 - 2d2: cf 91 pop r28 - 2d4: 08 95 ret - -000002d6 <__divmodhi4>: - 2d6: 97 fb bst r25, 7 - 2d8: 07 2e mov r0, r23 - 2da: 16 f4 brtc .+4 ; 0x2e0 <__divmodhi4+0xa> - 2dc: 00 94 com r0 - 2de: 06 d0 rcall .+12 ; 0x2ec <__divmodhi4_neg1> - 2e0: 77 fd sbrc r23, 7 - 2e2: 08 d0 rcall .+16 ; 0x2f4 <__divmodhi4_neg2> - 2e4: 0b d0 rcall .+22 ; 0x2fc <__udivmodhi4> - 2e6: 07 fc sbrc r0, 7 - 2e8: 05 d0 rcall .+10 ; 0x2f4 <__divmodhi4_neg2> - 2ea: 3e f4 brtc .+14 ; 0x2fa <__divmodhi4_exit> - -000002ec <__divmodhi4_neg1>: - 2ec: 90 95 com r25 - 2ee: 81 95 neg r24 - 2f0: 9f 4f sbci r25, 0xFF ; 255 - 2f2: 08 95 ret - -000002f4 <__divmodhi4_neg2>: - 2f4: 70 95 com r23 - 2f6: 61 95 neg r22 - 2f8: 7f 4f sbci r23, 0xFF ; 255 - -000002fa <__divmodhi4_exit>: - 2fa: 08 95 ret - -000002fc <__udivmodhi4>: - 2fc: aa 1b sub r26, r26 - 2fe: bb 1b sub r27, r27 - 300: 51 e1 ldi r21, 0x11 ; 17 - 302: 07 c0 rjmp .+14 ; 0x312 <__udivmodhi4_ep> - -00000304 <__udivmodhi4_loop>: - 304: aa 1f adc r26, r26 - 306: bb 1f adc r27, r27 - 308: a6 17 cp r26, r22 - 30a: b7 07 cpc r27, r23 - 30c: 10 f0 brcs .+4 ; 0x312 <__udivmodhi4_ep> - 30e: a6 1b sub r26, r22 - 310: b7 0b sbc r27, r23 - -00000312 <__udivmodhi4_ep>: - 312: 88 1f adc r24, r24 - 314: 99 1f adc r25, r25 - 316: 5a 95 dec r21 - 318: a9 f7 brne .-22 ; 0x304 <__udivmodhi4_loop> - 31a: 80 95 com r24 - 31c: 90 95 com r25 - 31e: bc 01 movw r22, r24 - 320: cd 01 movw r24, r26 - 322: 08 95 ret - -00000324 <_exit>: - 324: f8 94 cli - -00000326 <__stop_program>: - 326: ff cf rjmp .-2 ; 0x326 <__stop_program> +00000104 <__stop_program>: + 104: ff cf rjmp .-2 ; 0x104 <__stop_program> diff --git a/MIC-Week5/Debug/MIC-Week5.map b/MIC-Week5/Debug/MIC-Week5.map index 28a0f8d..453aab5 100644 --- a/MIC-Week5/Debug/MIC-Week5.map +++ b/MIC-Week5/Debug/MIC-Week5.map @@ -3,14 +3,14 @@ Archive member included to satisfy reference by file (symbol) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) spi.o (__divmodhi4) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o (exit) + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o (exit) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) (__udivmodhi4) Discarded input sections - .data 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o - .bss 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .data 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o + .bss 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o .text 0x00000000 0x0 lcd.o .data 0x00000000 0x0 lcd.o .bss 0x00000000 0x0 lcd.o @@ -35,14 +35,12 @@ Discarded input sections 0x00000000 0x50 lcd.o .debug_ranges 0x00000000 0x40 lcd.o .debug_line 0x00000000 0x2df lcd.o - .debug_str 0x00000000 0x234 lcd.o + .debug_str 0x00000000 0x229 lcd.o .comment 0x00000000 0x31 lcd.o .debug_frame 0x00000000 0xb4 lcd.o .text 0x00000000 0x0 main.o .data 0x00000000 0x0 main.o .bss 0x00000000 0x0 main.o - .text.opgaveb1 - 0x00000000 0x24 main.o .text.opgaveb2 0x00000000 0x50 main.o .text.opgaveb3 @@ -50,43 +48,56 @@ Discarded input sections .text.opgaveb4 0x00000000 0x72 main.o .text.test 0x00000000 0x50 main.o + .text.test2 0x00000000 0xf8 main.o .text 0x00000000 0x0 spi.o .data 0x00000000 0x0 spi.o .bss 0x00000000 0x0 spi.o + .text.spi_masterInit + 0x00000000 0xe spi.o + .text.spi_write + 0x00000000 0x8 spi.o .text.spi_writeRead 0x00000000 0xa spi.o + .text.spi_slaveSelect + 0x00000000 0x18 spi.o + .text.spi_slaveDeSelect + 0x00000000 0x16 spi.o + .text.displayDriverInit + 0x00000000 0x62 spi.o .text.displayOn 0x00000000 0x1a spi.o + .text.spi_intensity + 0x00000000 0x34 spi.o .text.displayOff 0x00000000 0x1a spi.o + .text.spi_writeWord + 0x00000000 0x26 spi.o + .text.writeLedDisplay + 0x00000000 0x68 spi.o + .debug_info 0x00000000 0x4f0 spi.o + .debug_abbrev 0x00000000 0x145 spi.o + .debug_loc 0x00000000 0x269 spi.o + .debug_aranges + 0x00000000 0x70 spi.o + .debug_ranges 0x00000000 0x60 spi.o + .debug_line 0x00000000 0x2a9 spi.o + .debug_str 0x00000000 0x222 spi.o + .comment 0x00000000 0x31 spi.o + .debug_frame 0x00000000 0xe8 spi.o .text 0x00000000 0x0 uart0.o .data 0x00000000 0x0 uart0.o .bss 0x00000000 0x0 uart0.o - .text.usart0_init - 0x00000000 0x12 uart0.o - .text.usart0_start - 0x00000000 0x8 uart0.o - .text.uart0_sendChar - 0x00000000 0xc uart0.o .text.uart0_receiveChar 0x00000000 0x8 uart0.o .text.uart0_receiveString 0x00000000 0x26 uart0.o - .debug_info 0x00000000 0x152 uart0.o - .debug_abbrev 0x00000000 0x11c uart0.o - .debug_loc 0x00000000 0xe0 uart0.o - .debug_aranges - 0x00000000 0x40 uart0.o - .debug_ranges 0x00000000 0x30 uart0.o - .debug_line 0x00000000 0x144 uart0.o - .debug_str 0x00000000 0x1cb uart0.o - .comment 0x00000000 0x31 uart0.o - .debug_frame 0x00000000 0x78 uart0.o .text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) .data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) .text.libgcc.mul 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) + .text.libgcc.div + 0x00000000 0x28 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) .text.libgcc 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) .text.libgcc.prologue 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) @@ -117,6 +128,8 @@ Discarded input sections .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) .text.libgcc.mul 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) + .text.libgcc.div + 0x00000000 0x28 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) .text.libgcc 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) .text.libgcc.prologue 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) @@ -142,7 +155,7 @@ user_signatures 0x00850000 0x00000400 rw !x Linker script and memory map Address of section .data set to 0x800100 -LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o +LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o LOAD lcd.o LOAD main.o LOAD spi.o @@ -154,7 +167,7 @@ START GROUP LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/../../../../avr/lib/avr51\libm.a LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/../../../../avr/lib/avr51\libc.a -LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51\libatmega128.a +LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51\libatmega128.a END GROUP .hash @@ -247,9 +260,9 @@ END GROUP .rela.plt *(.rela.plt) -.text 0x00000000 0x328 +.text 0x00000000 0x106 *(.vectors) - .vectors 0x00000000 0x8c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .vectors 0x00000000 0x8c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o 0x00000000 __vector_default 0x00000000 __vectors *(.vectors) @@ -275,13 +288,13 @@ END GROUP SORT(*)(.ctors) SORT(*)(.dtors) *(.init0) - .init0 0x0000008c 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .init0 0x0000008c 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o 0x0000008c __init *(.init0) *(.init1) *(.init1) *(.init2) - .init2 0x0000008c 0xc C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .init2 0x0000008c 0xc C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o *(.init2) *(.init3) *(.init3) @@ -296,10 +309,10 @@ END GROUP *(.init8) *(.init8) *(.init9) - .init9 0x00000098 0x4 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .init9 0x00000098 0x4 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o *(.init9) *(.text) - .text 0x0000009c 0x2 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + .text 0x0000009c 0x2 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o 0x0000009c __vector_22 0x0000009c __vector_28 0x0000009c __vector_1 @@ -339,46 +352,25 @@ END GROUP *(.text.*) .text.wait 0x0000009e 0x22 main.o 0x0000009e wait - .text.test2 0x000000c0 0xe6 main.o - 0x000000c0 test2 - .text.main 0x000001a6 0x8 main.o - 0x000001a6 main - .text.spi_masterInit - 0x000001ae 0xe spi.o - 0x000001ae spi_masterInit - .text.spi_write - 0x000001bc 0x8 spi.o - 0x000001bc spi_write - .text.spi_slaveSelect - 0x000001c4 0x18 spi.o - 0x000001c4 spi_slaveSelect - .text.spi_slaveDeSelect - 0x000001dc 0x16 spi.o - 0x000001dc spi_slaveDeSelect - .text.displayDriverInit - 0x000001f2 0x42 spi.o - 0x000001f2 displayDriverInit - .text.spi_intensity - 0x00000234 0x2c spi.o - 0x00000234 spi_intensity - .text.spi_writeWord - 0x00000260 0x1e spi.o - 0x00000260 spi_writeWord - .text.writeLedDisplay - 0x0000027e 0x58 spi.o - 0x0000027e writeLedDisplay - .text.libgcc.div - 0x000002d6 0x26 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_divmodhi4.o) - 0x000002d6 _div - 0x000002d6 __divmodhi4 - .text.libgcc.div - 0x000002fc 0x28 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_udivmodhi4.o) - 0x000002fc __udivmodhi4 - 0x00000324 . = ALIGN (0x2) + .text.opgaveb1 + 0x000000c0 0x1a main.o + 0x000000c0 opgaveb1 + .text.main 0x000000da 0x2 main.o + 0x000000da main + .text.usart0_init + 0x000000dc 0x12 uart0.o + 0x000000dc usart0_init + .text.usart0_start + 0x000000ee 0x8 uart0.o + 0x000000ee usart0_start + .text.uart0_sendChar + 0x000000f6 0xc uart0.o + 0x000000f6 uart0_sendChar + 0x00000102 . = ALIGN (0x2) *(.fini9) - .fini9 0x00000324 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) - 0x00000324 _exit - 0x00000324 exit + .fini9 0x00000102 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + 0x00000102 _exit + 0x00000102 exit *(.fini9) *(.fini8) *(.fini8) @@ -397,11 +389,11 @@ END GROUP *(.fini1) *(.fini1) *(.fini0) - .fini0 0x00000324 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) + .fini0 0x00000102 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o) *(.fini0) - 0x00000328 _etext = . + 0x00000106 _etext = . -.data 0x00800100 0x0 load address 0x00000328 +.data 0x00800100 0x0 load address 0x00000106 0x00800100 PROVIDE (__data_start, .) *(.data) *(.data*) @@ -418,8 +410,8 @@ END GROUP *(.bss*) *(COMMON) 0x00800100 PROVIDE (__bss_end, .) - 0x00000328 __data_load_start = LOADADDR (.data) - 0x00000328 __data_load_end = (__data_load_start + SIZEOF (.data)) + 0x00000106 __data_load_start = LOADADDR (.data) + 0x00000106 __data_load_end = (__data_load_start + SIZEOF (.data)) .noinit 0x00800100 0x0 0x00800100 PROVIDE (__noinit_start, .) @@ -469,12 +461,12 @@ END GROUP *(.comment) .comment 0x00000000 0x30 main.o 0x31 (size before relaxing) - .comment 0x00000030 0x31 spi.o + .comment 0x00000030 0x31 uart0.o .note.gnu.avr.deviceinfo 0x00000000 0x3c .note.gnu.avr.deviceinfo - 0x00000000 0x3c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/gcc/dev/atmega128/avr51/crtatmega128.o + 0x00000000 0x3c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o .note.gnu.build-id *(.note.gnu.build-id) @@ -491,47 +483,47 @@ END GROUP .debug_sfnames *(.debug_sfnames) -.debug_aranges 0x00000000 0xc8 +.debug_aranges 0x00000000 0x98 *(.debug_aranges) .debug_aranges 0x00000000 0x58 main.o .debug_aranges - 0x00000058 0x70 spi.o + 0x00000058 0x40 uart0.o .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0xd78 +.debug_info 0x00000000 0x9aa *(.debug_info .gnu.linkonce.wi.*) - .debug_info 0x00000000 0x888 main.o - .debug_info 0x00000888 0x4f0 spi.o + .debug_info 0x00000000 0x858 main.o + .debug_info 0x00000858 0x152 uart0.o -.debug_abbrev 0x00000000 0x359 +.debug_abbrev 0x00000000 0x330 *(.debug_abbrev) .debug_abbrev 0x00000000 0x214 main.o - .debug_abbrev 0x00000214 0x145 spi.o + .debug_abbrev 0x00000214 0x11c uart0.o -.debug_line 0x00000000 0x702 +.debug_line 0x00000000 0x5a1 *(.debug_line .debug_line.* .debug_line_end) - .debug_line 0x00000000 0x459 main.o - .debug_line 0x00000459 0x2a9 spi.o + .debug_line 0x00000000 0x45d main.o + .debug_line 0x0000045d 0x144 uart0.o -.debug_frame 0x00000000 0x1e8 +.debug_frame 0x00000000 0x178 *(.debug_frame) .debug_frame 0x00000000 0x100 main.o - .debug_frame 0x00000100 0xe8 spi.o + .debug_frame 0x00000100 0x78 uart0.o -.debug_str 0x00000000 0x309 +.debug_str 0x00000000 0x2c3 *(.debug_str) - .debug_str 0x00000000 0x2b0 main.o - 0x2e9 (size before relaxing) - .debug_str 0x000002b0 0x59 spi.o - 0x22d (size before relaxing) + .debug_str 0x00000000 0x293 main.o + 0x2cc (size before relaxing) + .debug_str 0x00000293 0x30 uart0.o + 0x1c0 (size before relaxing) -.debug_loc 0x00000000 0x5d2 +.debug_loc 0x00000000 0x436 *(.debug_loc) - .debug_loc 0x00000000 0x369 main.o - .debug_loc 0x00000369 0x269 spi.o + .debug_loc 0x00000000 0x356 main.o + .debug_loc 0x00000356 0xe0 uart0.o .debug_macinfo *(.debug_macinfo) @@ -551,10 +543,10 @@ END GROUP .debug_pubtypes *(.debug_pubtypes) -.debug_ranges 0x00000000 0xc0 +.debug_ranges 0x00000000 0x90 *(.debug_ranges) .debug_ranges 0x00000000 0x60 main.o - .debug_ranges 0x00000060 0x60 spi.o + .debug_ranges 0x00000060 0x30 uart0.o .debug_macro *(.debug_macro) diff --git a/MIC-Week5/Debug/MIC-Week5.srec b/MIC-Week5/Debug/MIC-Week5.srec index 8f4bb11..848dd22 100644 --- a/MIC-Week5/Debug/MIC-Week5.srec +++ b/MIC-Week5/Debug/MIC-Week5.srec @@ -8,46 +8,12 @@ S113005025C0000023C0000021C000001FC0000014 S11300601DC000001BC0000019C0000017C0000024 S113007015C0000013C0000011C000000FC0000034 S11300800DC000000BC0000009C0000011241FBEF9 -S1130090CFEFD0E1DEBFCDBF86D044C1B1CF1816BB +S1130090CFEFD0E1DEBFCDBF20D033C0B1CF181633 S11300A019066CF420E030E0EFECF7E03197F1F75B S11300B000C000002F5F3F4F28173907A9F70895A4 -S11300C06F927F928F929F92AF92BF92CF92DF9264 -S11300D0EF92FF920F931F93CF93DF9381E087BB3F -S11300E066D087D089E19CEFCAD085E090E0D7DF65 -S11300F009E11CEFE12CF12CC0E0D0E0AA24A39488 -S1130100B12C0F2EF6E0CF2EF02DD12C612C712CBA -S11301100F2EFFE08F2EF02D912C0EC0C801AFD012 -S113012085E090E0BCDFC80187509F4F833691057E -S113013018F48BE490E0B3DFC80187599109833642 -S1130140910518F48BE490E0AADFE114F10411F0B6 -S1130150219601C02197C630D10544F0C031D105A4 -S11301604CF0E62CF72CC82DD92D04C0EA2CFB2C1E -S1130170CC2DDD2DCE015ED00F5F1F4F003187E205 -S1130180180761F681E090E0DF91CF911F910F9104 -S1130190FF90EF90DF90CF90BF90AF909F908F90A3 -S11301A07F906F9008958CDF80E090E008958FEF4A -S11301B087BBBB98C09A82E58DB908958FB9779BA8 -S11301C0FECF089598B321E030E002C0220F331F20 -S11301D08A95E2F72095292328BB089598B321E056 -S11301E030E002C0220F331F8A95E2F7292B28BB87 -S11301F0089580E0E7DF89E0E1DF8FEFDFDF80E073 -S1130200EDDF80E0DFDF8AE0D9DF8FE0D7DF80E059 -S1130210E5DF80E0D7DF8BE0D1DF83E0CFDF80E074 -S1130220DDDF80E0CFDF8CE0C9DF81E0C7DF80E085 -S1130230D5CF0895CF93DF93EC01992314F4C0E054 -S1130240D0E080E0BFDF8AE0B9DFCE01609714F030 -S11302508FE090E0B3DF80E0C1DFDF91CF910895BC -S1130260CF93DF93D82FC62F80E0ACDF8D2FA6DF8E -S11302708C2FA4DF80E0B2DFDF91CF910895CF937C -S1130280DF939C0129513C4F273F3A4208F59923BB -S113029044F4CC27DD27C81BD90B6AE084E0E0DFF7 -S11302A006C068EE73E017D0EC0184E0D9DFCE011C -S11302B064E670E010D0EC0183E0D2DFCE016AE0A6 -S11302C070E009D0C82F82E0CBDF6C2F81E0C8DF5B -S11302D0DF91CF91089597FB072E16F4009406D072 -S11302E077FD08D00BD007FC05D03EF4909581959E -S11302F09F4F0895709561957F4F0895AA1BBB1B6E -S113030051E107C0AA1FBB1FA617B70710F0A61B11 -S1130310B70B881F991F5A95A9F780959095BC0132 -S10B0320CD010895F894FFCF0C +S11300C08FEF81BB0BD013D082E390E0E8DF82B3E3 +S11300D0805882BB8AE20FD0F7CFF2DF10929000F3 +S11300E08FEC89B986E0809395001AB808958AB197 +S11300F088618AB908955D9BFECF8CB980E090E059 +S10901000895F894FFCFFE S9030000FC diff --git a/MIC-Week5/Debug/Makefile b/MIC-Week5/Debug/Makefile index dbd99ba..12b86c8 100644 --- a/MIC-Week5/Debug/Makefile +++ b/MIC-Week5/Debug/Makefile @@ -99,7 +99,7 @@ LINKER_SCRIPT_DEP+= ./%.o: .././%.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -mrelax -g2 -Wall -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -128,7 +128,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 4.9.2 - $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week5.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="MIC-Week5.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mrelax -mmcu=atmega128 -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "MIC-Week5.elf" "MIC-Week5.hex" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "MIC-Week5.elf" "MIC-Week5.eep" || exit 0 diff --git a/MIC-Week5/Debug/main.d b/MIC-Week5/Debug/main.d index 51114e2..b1141cd 100644 --- a/MIC-Week5/Debug/main.d +++ b/MIC-Week5/Debug/main.d @@ -4,7 +4,7 @@ main.d main.o: .././main.c .././uart0.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\4.9.2\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ - C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include/avr/iom128.h \ + C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ @@ -28,7 +28,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: -C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include/avr/iom128.h: +C:\Program\ Files\ (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include/avr/iom128.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: diff --git a/MIC-Week5/MIC-Week5.componentinfo.xml b/MIC-Week5/MIC-Week5.componentinfo.xml index 5ceaf94..5b64613 100644 --- a/MIC-Week5/MIC-Week5.componentinfo.xml +++ b/MIC-Week5/MIC-Week5.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\include\avr\iom128.h + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\include\avr\iom128.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.c + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\templates\main.cpp + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128 + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128 libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128 diff --git a/MIC-Week5/MIC-Week5.cproj b/MIC-Week5/MIC-Week5.cproj index c4ee061..4078387 100644 --- a/MIC-Week5/MIC-Week5.cproj +++ b/MIC-Week5/MIC-Week5.cproj @@ -55,71 +55,71 @@ - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" - True - True - True - True - True - False - True - True - - - NDEBUG - - - - - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include - - - Optimize for size (-Os) - True - True - True - - - libm - - - + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" + True + True + True + True + True + False + True + True + + + NDEBUG + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include + + + Optimize for size (-Os) + True + True + True + + + libm + + + - -mmcu=atmega128 -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\gcc\dev\atmega128" - True - True - True - True - True - False - True - True - - - DEBUG - - - - - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\include - - - Optimize (-O1) - True - True - Default (-g2) - True - - - libm - - - Default (-Wa,-g) - + -mmcu=atmega128 -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega128" + True + True + True + True + True + False + True + True + + + DEBUG + + + + + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include + + + Optimize (-O1) + True + True + Default (-g2) + True + + + libm + + + Default (-Wa,-g) + diff --git a/MIC-Week5/main.c b/MIC-Week5/main.c index 1a15ca8..c84a2ec 100644 --- a/MIC-Week5/main.c +++ b/MIC-Week5/main.c @@ -31,14 +31,14 @@ void wait( int ms ) int main( void ) { - //opgaveb1(); + opgaveb1(); //opgaveb2(); //opgaveb3(); //opgaveb4(); //test(); - test2(); + //test2(); return 0; } @@ -46,6 +46,8 @@ int main( void ) // send/receive uart - dB-meter int opgaveb1( void ) { + DDRD = 0xFF; + usart0_init(); // initialize USART0 usart0_start(); @@ -53,13 +55,15 @@ int opgaveb1( void ) { wait(50); // every 50 ms (busy waiting) - char c = uart0_receiveChar(); // receive string from uart + //char c = uart0_receiveChar(); // receive string from uart - if(c >= 'a' && c <= 'z'){ - c = ('A' + c - 'a'); - } + //if(c >= 'a' && c <= 'z'){ + // c = ('A' + c - 'a'); + //} - uart0_sendChar(c); + PORTD ^= 0x80; + + uart0_sendChar('*'); //uart0_sendChar('*'); } diff --git a/MIC-Week6/Debug/MIC-Week6.lss b/MIC-Week6/Debug/MIC-Week6.lss index d507f1a..5640612 100644 --- a/MIC-Week6/Debug/MIC-Week6.lss +++ b/MIC-Week6/Debug/MIC-Week6.lss @@ -1,8 +1,8 @@ -AVRASM ver. 2.1.57 C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm Tue Mar 22 13:18:38 2016 +AVRASM ver. 2.1.57 D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm Wed Apr 06 13:57:25 2016 -[builtin](2): Including file 'C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc\m128def.inc' -C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm(10): Including file 'C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc\m128def.inc' +[builtin](2): Including file 'C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc\m128def.inc' +D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm(10): Including file 'C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc\m128def.inc' ; diff --git a/MIC-Week6/Debug/MIC-Week6.map b/MIC-Week6/Debug/MIC-Week6.map index b7a3d71..3a90d1d 100644 --- a/MIC-Week6/Debug/MIC-Week6.map +++ b/MIC-Week6/Debug/MIC-Week6.map @@ -1,5 +1,5 @@ -AVRASM ver. 2.1.57 C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm Tue Mar 22 13:18:38 2016 +AVRASM ver. 2.1.57 D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm Wed Apr 06 13:57:25 2016 EQU SIGNATURE_000 0000001e diff --git a/MIC-Week6/Debug/MIC-Week6.tmp b/MIC-Week6/Debug/MIC-Week6.tmp index 3eaf02f..ef66b2e 100644 --- a/MIC-Week6/Debug/MIC-Week6.tmp +++ b/MIC-Week6/Debug/MIC-Week6.tmp @@ -1,19 +1,19 @@ 2.1.57 "ATmega128" - C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\Debug + D:\Code\C\Repositories\MIC-KM\MIC-Week6\Debug - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avrassembler\Include - C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm + D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc\m128def.inc + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc\m128def.inc - C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\Debug\MIC-Week6.obj + D:\Code\C\Repositories\MIC-KM\MIC-Week6\Debug\MIC-Week6.obj MIC-Week6.hex @@ -23,7 +23,7 @@ MIC-Week6.lss -
C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm19
- C:\Users\martijn\Documents\GitHub\MIC-KM\MIC-Week6\main.asm87 +
D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm19
+ D:\Code\C\Repositories\MIC-KM\MIC-Week6\main.asm87 diff --git a/MIC-Week6/MIC-Week6.asmproj b/MIC-Week6/MIC-Week6.asmproj index 3f10a7b..c3a4964 100644 --- a/MIC-Week6/MIC-Week6.asmproj +++ b/MIC-Week6/MIC-Week6.asmproj @@ -28,15 +28,15 @@ 0 - - - - - - - - - + + + + + + + + + com.atmel.avrdbg.tool.simulator @@ -57,8 +57,8 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\avrasm\inc - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\avrasm\inc + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\avrasm\inc + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\avrasm\inc m128def.inc @@ -71,8 +71,8 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\avrasm\inc - %24(PackRepoDir)\atmel\ATmega_DFP\1.0.90\avrasm\inc + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\avrasm\inc + %24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\avrasm\inc m128def.inc diff --git a/MIC-Week6/MIC-Week6.componentinfo.xml b/MIC-Week6/MIC-Week6.componentinfo.xml index 9ed1afa..d4be5b9 100644 --- a/MIC-Week6/MIC-Week6.componentinfo.xml +++ b/MIC-Week6/MIC-Week6.componentinfo.xml @@ -15,7 +15,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc include AVRASM @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\inc\m128def.inc + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\inc\m128def.inc header AVRASM @@ -37,11 +37,11 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.0.90\avrasm\templates\main.asm + C:/Program Files (x86)\Atmel\Studio\7.0\Packs\Atmel\ATmega_DFP\1.0.91\avrasm\templates\main.asm template source AVRASM - 5aPf0NPyyod27JwIRijDWg== + W3H1rXiEttYmKsTnShna6Q== avrasm/templates/main.asm Main file (.asm) @@ -49,8 +49,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.0.90/Atmel.ATmega_DFP.pdsc - 1.0.90 + C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/Atmel.ATmega_DFP.pdsc + 1.0.91 true ATmega128