From 01f388043c08b2edddb2cd09cad547cc7ee3d94b Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Thu, 11 Oct 2018 19:50:40 -0500 Subject: [PATCH 01/10] Working on Supercon logo splashscreen --- firmware/badge1.X/src/splash.c | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 7a889f4..e3017a1 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -1,6 +1,70 @@ #include "splash.h" #include +const uint32_t arc[25] = { + 0b00000000000000000000000000001111, + 0b00000000000000000000000011111111, + 0b00000000000000000000011111111111, + 0b00000000000000000001111111111111, + 0b00000000000000000011111111111111, + 0b00000000000000001111111111111111, + 0b00000000000000011111111111111111, + 0b00000000000000111111111111111111, + 0b00000000000001111111111111111111, + 0b00000000000011111111111111111100, + 0b00000000000011111111111111000000, + 0b00000000000111111111111100000000, + 0b00000000001111111111110000000000, + 0b00000000001111111111100000000000, + 0b00000000011111111111000000000000, + 0b00000000011111111110000000000000, + 0b00000000011111111110000000000000, + 0b00000000111111111100000000000000, + 0b00000000111111111100000000000000, + 0b00000000111111111000000000000000, + 0b00000000111111111000000000000000, + 0b00000001111111111000000000000000, + 0b00000001111111111000000000000000, + 0b00000001111111110000000000000000, + 0b00000001111111110000000000000000 +}; + +/*** Orientations *** + 0 = top left arc + 1 = top right arc + 2 = bottom right arc + 3 = bottom left arc +********************/ + +/*** Offsets *** + 0 = Top down, bits 24 through 0 + 1 = bits 24 through 0, bottom up + 2 = bottom up, bits 0 through 24 + 3 = bottom up, bits 24 through 0 +***************/ + +// H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) +// A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) +// C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) +// K arc (248,17,2) (248,36,1) bot (225,12,233,60) +// A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) +// D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) +// A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) +// Y arc (225,70,3) (249,70,2) box (244,90,252,118) + +void draw_arc (uint16_t x, uint16_t y, uint16_t xlen, uint16_t ylen, uint32_t back) +{ + uint32_t i,j; + tft_set_write_area(x,y,xlen,ylen); + TFT_24_7789_Write_Command(0x2C); + //FIXME: Why do I need these +1 adjustments. Off-by-one in tft_set_write_area? + for (i=0; i<((xlen+1)*(ylen+1)); i++) + { + //TODO: Test for arc 1 or 0 and place color pixel as necessary + TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + } +} + struct Cipher_box { int16_t x; // Pixel location on screen (negative values for left overflow) @@ -111,6 +175,10 @@ void animate_splash(void) uint16_t x = 0; uint16_t splash_waitfor = 0; + tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black + draw_arc(10,10,100,100,0xFF0000); + while (1) { ;; } + /* struct Cipher_box box0 = { 0, 0 }; struct Cipher_box box1 = { 319+(10*CIPHER_CHAR_WIDTH), 1 }; struct Cipher_box box2 = { 0-(2*CIPHER_CHAR_WIDTH), 2 }; @@ -149,4 +217,5 @@ void animate_splash(void) } } } + */ } From 5fc6d6d2287fda1337b6786a1f28daea042f197c Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Thu, 11 Oct 2018 21:24:15 -0500 Subject: [PATCH 02/10] Implemented drawing of arc in any orientation --- firmware/badge1.X/src/splash.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index e3017a1..b95f900 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -52,16 +52,42 @@ const uint32_t arc[25] = { // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) // Y arc (225,70,3) (249,70,2) box (244,90,252,118) -void draw_arc (uint16_t x, uint16_t y, uint16_t xlen, uint16_t ylen, uint32_t back) +void draw_arc (uint16_t x, uint16_t y, uint8_t rotate, uint32_t back) { - uint32_t i,j; - tft_set_write_area(x,y,xlen,ylen); - TFT_24_7789_Write_Command(0x2C); - //FIXME: Why do I need these +1 adjustments. Off-by-one in tft_set_write_area? - for (i=0; i<((xlen+1)*(ylen+1)); i++) - { - //TODO: Test for arc 1 or 0 and place color pixel as necessary - TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + uint32_t i,j; + tft_set_write_area(x,y,24,24); + TFT_24_7789_Write_Command(0x2C); + + + //FIXME: Why do I need these +1 adjustments. Off-by-one in tft_set_write_area? + //for (i=0; i<((xlen+1)*(ylen+1)); i++) + for (i=0; i<25; i++) + { + for (j=0; j<25; j++) + { + //TODO: Test for arc 1 or 0 and place color pixel as necessary + if (rotate == 0) + { + if (arc[i] & 1<<(24-j)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + else TFT_24_7789_Write_Data3(0,0,0); + } + else if (rotate == 1) + { + if (arc[24-j] & 1<<(24-i)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + else TFT_24_7789_Write_Data3(0,0,0); + } + else if (rotate == 2) + { + if (arc[24-i] & 1<<(j)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + else TFT_24_7789_Write_Data3(0,0,0); + } + else if (rotate == 3) + { + if (arc[j] & 1<<(i)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + else TFT_24_7789_Write_Data3(0,0,0); + } + } + //TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); } } @@ -176,7 +202,10 @@ void animate_splash(void) uint16_t splash_waitfor = 0; tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black - draw_arc(10,10,100,100,0xFF0000); + draw_arc(10,10,0,0xFF0000); + draw_arc(35,10,1,0xFF0000); + draw_arc(35,35,2,0xFF0000); + draw_arc(10,35,3,0xFF0000); while (1) { ;; } /* struct Cipher_box box0 = { 0, 0 }; From a368fb7f4f1e6362369060f35a8dcb4d26afbb5a Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Thu, 11 Oct 2018 21:53:50 -0500 Subject: [PATCH 03/10] HACKADAY implemented in splash screen --- firmware/badge1.X/src/splash.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index b95f900..17e71bf 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -29,6 +29,8 @@ const uint32_t arc[25] = { 0b00000001111111110000000000000000 }; +#define LOGOC 0xFF0000 + /*** Orientations *** 0 = top left arc 1 = top right arc @@ -202,10 +204,30 @@ void animate_splash(void) uint16_t splash_waitfor = 0; tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black + + // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) + draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); + // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) + draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,36,2,LOGOC); draw_arc(110,36,3,LOGOC); tft_fill_area(150,36,8,24,LOGOC); + // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) + draw_arc(167,12,0,LOGOC); draw_arc(167,36,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,52,25,8,LOGOC); + // K arc (248,17,2) (248,36,1) bot (225,12,233,60) + draw_arc(248,12,2,LOGOC); draw_arc(248,36,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); + // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) + draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,94,2,LOGOC); draw_arc(52,94,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); + // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) + draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,94,2,LOGOC); draw_arc(110,94,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); + // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) + draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,94,2,LOGOC); draw_arc(167,94,3,LOGOC); tft_fill_area(207,94,8,24,LOGOC); + // Y arc (225,70,3) (249,70,2) box (244,90,252,118) + draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,28,LOGOC); + + /* draw_arc(10,10,0,0xFF0000); draw_arc(35,10,1,0xFF0000); draw_arc(35,35,2,0xFF0000); draw_arc(10,35,3,0xFF0000); + */ while (1) { ;; } /* struct Cipher_box box0 = { 0, 0 }; From 25592031bb7cd3def620b311d22446a79cf28470 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Thu, 11 Oct 2018 22:46:01 -0500 Subject: [PATCH 04/10] Added SUPERCON to splash --- firmware/badge1.X/src/splash.c | 40 ++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 17e71bf..3089b93 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -54,6 +54,15 @@ const uint32_t arc[25] = { // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) // Y arc (225,70,3) (249,70,2) box (244,90,252,118) +// S arc (52,128,0) (76,152,2) +// U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) +// P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) +// E arc (225,128,0) (249,128,1) (225,152,3) +// R arc (52,186,0) (76,186,1) box (52,210,8,25) +// C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) +// O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) +// N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) + void draw_arc (uint16_t x, uint16_t y, uint8_t rotate, uint32_t back) { uint32_t i,j; @@ -208,19 +217,36 @@ void animate_splash(void) // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) - draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,36,2,LOGOC); draw_arc(110,36,3,LOGOC); tft_fill_area(150,36,8,24,LOGOC); + draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,37,2,LOGOC); draw_arc(110,37,3,LOGOC); tft_fill_area(150,36,8,25,LOGOC); // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) - draw_arc(167,12,0,LOGOC); draw_arc(167,36,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,52,25,8,LOGOC); + draw_arc(167,12,0,LOGOC); draw_arc(167,37,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,53,25,8,LOGOC); // K arc (248,17,2) (248,36,1) bot (225,12,233,60) - draw_arc(248,12,2,LOGOC); draw_arc(248,36,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); + draw_arc(248,12,2,LOGOC); draw_arc(248,37,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) - draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,94,2,LOGOC); draw_arc(52,94,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); + draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,95,2,LOGOC); draw_arc(52,95,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) - draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,94,2,LOGOC); draw_arc(110,94,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); + draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,95,2,LOGOC); draw_arc(110,95,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) - draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,94,2,LOGOC); draw_arc(167,94,3,LOGOC); tft_fill_area(207,94,8,24,LOGOC); + draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,95,2,LOGOC); draw_arc(167,95,3,LOGOC); tft_fill_area(207,94,8,25,LOGOC); // Y arc (225,70,3) (249,70,2) box (244,90,252,118) - draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,28,LOGOC); + draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,29,LOGOC); + + // S arc (52,128,0) (76,152,2) + draw_arc(52,128,0,LOGOC); draw_arc(76,153,2,LOGOC); + // U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) + draw_arc(110,153,3,LOGOC); draw_arc(134,153,2,LOGOC); tft_fill_area(110,128,8,24,LOGOC); tft_fill_area(150,128,8,24,LOGOC); + // P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) + draw_arc(167,128,0,LOGOC); draw_arc(191,128,1,LOGOC); draw_arc(191,153,2,LOGOC); draw_arc(167,153,3,LOGOC); tft_fill_area(167,152,8,25,LOGOC); + // E arc (225,128,0) (249,128,1) (225,152,3) + draw_arc(225,128,0,LOGOC); draw_arc(249,128,1,LOGOC); draw_arc(225,153,3,LOGOC); + // R arc (52,186,0) (76,186,1) box (52,210,8,25) + draw_arc(52,186,0,LOGOC); draw_arc(76,186,1,LOGOC); tft_fill_area(52,210,8,25,LOGOC); + // C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) + draw_arc(110,186,0,LOGOC); draw_arc(110,211,3,LOGOC); tft_fill_area(134,186,24,8,LOGOC); tft_fill_area(134,227,24,8,LOGOC); + // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) + draw_arc(167,186,0,LOGOC); draw_arc(191,186,1,LOGOC); draw_arc(191,211,2,LOGOC); draw_arc(167,211,3,LOGOC); + // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) + draw_arc(225,186,0,LOGOC); draw_arc(249,186,1,LOGOC); tft_fill_area(225,210,8,25,LOGOC); tft_fill_area(265,210,8,25,LOGOC); /* draw_arc(10,10,0,0xFF0000); From ded6c7cf351af9255c8100a7bd073bd9cb366238 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Thu, 11 Oct 2018 23:03:06 -0500 Subject: [PATCH 05/10] Added animation to the logo --- firmware/badge1.X/src/splash.c | 65 ++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 3089b93..64c2185 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -29,7 +29,8 @@ const uint32_t arc[25] = { 0b00000001111111110000000000000000 }; -#define LOGOC 0xFF0000 +#define LOGOC 0xFF0000 +#define SPLASH_DELAY 140 /*** Orientations *** 0 = top left arc @@ -207,13 +208,21 @@ uint8_t overlaps_logo(int16_t x, uint8_t row) { return 0; } +void splash_delay(uint32_t delay) + { + uint32_t splash_startwait = millis(); + while((millis()-splash_startwait) < delay) { ;; } + return; + } + void animate_splash(void) { uint16_t x = 0; - uint16_t splash_waitfor = 0; + tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black + /* // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) @@ -247,6 +256,7 @@ void animate_splash(void) draw_arc(167,186,0,LOGOC); draw_arc(191,186,1,LOGOC); draw_arc(191,211,2,LOGOC); draw_arc(167,211,3,LOGOC); // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) draw_arc(225,186,0,LOGOC); draw_arc(249,186,1,LOGOC); tft_fill_area(225,210,8,25,LOGOC); tft_fill_area(265,210,8,25,LOGOC); + */ /* draw_arc(10,10,0,0xFF0000); @@ -254,7 +264,56 @@ void animate_splash(void) draw_arc(35,35,2,0xFF0000); draw_arc(10,35,3,0xFF0000); */ - while (1) { ;; } + + // U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) + draw_arc(110,153,3,LOGOC); draw_arc(134,153,2,LOGOC); tft_fill_area(110,128,8,24,LOGOC); tft_fill_area(150,128,8,24,LOGOC); + splash_delay(SPLASH_DELAY); + // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) + draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,95,2,LOGOC); draw_arc(110,95,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); + splash_delay(SPLASH_DELAY); + // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) + draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,95,2,LOGOC); draw_arc(167,95,3,LOGOC); tft_fill_area(207,94,8,25,LOGOC); + splash_delay(SPLASH_DELAY); + // P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) + draw_arc(167,128,0,LOGOC); draw_arc(191,128,1,LOGOC); draw_arc(191,153,2,LOGOC); draw_arc(167,153,3,LOGOC); tft_fill_area(167,152,8,25,LOGOC); + splash_delay(SPLASH_DELAY); + // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) + draw_arc(167,186,0,LOGOC); draw_arc(191,186,1,LOGOC); draw_arc(191,211,2,LOGOC); draw_arc(167,211,3,LOGOC); + splash_delay(SPLASH_DELAY); + // C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) + draw_arc(110,186,0,LOGOC); draw_arc(110,211,3,LOGOC); tft_fill_area(134,186,24,8,LOGOC); tft_fill_area(134,227,24,8,LOGOC); + splash_delay(SPLASH_DELAY); + // R arc (52,186,0) (76,186,1) box (52,210,8,25) + draw_arc(52,186,0,LOGOC); draw_arc(76,186,1,LOGOC); tft_fill_area(52,210,8,25,LOGOC); + splash_delay(SPLASH_DELAY); + // S arc (52,128,0) (76,152,2) + draw_arc(52,128,0,LOGOC); draw_arc(76,153,2,LOGOC); + splash_delay(SPLASH_DELAY); + // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) + draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,95,2,LOGOC); draw_arc(52,95,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); + splash_delay(SPLASH_DELAY); + // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) + draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); + splash_delay(SPLASH_DELAY); + // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) + draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,37,2,LOGOC); draw_arc(110,37,3,LOGOC); tft_fill_area(150,36,8,25,LOGOC); + splash_delay(SPLASH_DELAY); + // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) + draw_arc(167,12,0,LOGOC); draw_arc(167,37,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,53,25,8,LOGOC); + splash_delay(SPLASH_DELAY); + // K arc (248,17,2) (248,36,1) bot (225,12,233,60) + draw_arc(248,12,2,LOGOC); draw_arc(248,37,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); + splash_delay(SPLASH_DELAY); + // Y arc (225,70,3) (249,70,2) box (244,90,252,118) + draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,29,LOGOC); + splash_delay(SPLASH_DELAY); + // E arc (225,128,0) (249,128,1) (225,152,3) + draw_arc(225,128,0,LOGOC); draw_arc(249,128,1,LOGOC); draw_arc(225,153,3,LOGOC); + splash_delay(SPLASH_DELAY); + // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) + draw_arc(225,186,0,LOGOC); draw_arc(249,186,1,LOGOC); tft_fill_area(225,210,8,25,LOGOC); tft_fill_area(265,210,8,25,LOGOC); + splash_delay(2000); + //while (1) { ;; } /* struct Cipher_box box0 = { 0, 0 }; struct Cipher_box box1 = { 319+(10*CIPHER_CHAR_WIDTH), 1 }; From 404147243ecd9375fdae5f6841bd2363d160c3e4 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Fri, 12 Oct 2018 20:27:38 -0500 Subject: [PATCH 06/10] Completed animation. Code needs a lot of cleanup and better memory use (use existing ram so we don't clobber 2.4k) --- firmware/badge1.X/src/splash.c | 193 +++++++++++++++++++++++++-------- 1 file changed, 145 insertions(+), 48 deletions(-) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 64c2185..6fae997 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -29,8 +29,11 @@ const uint32_t arc[25] = { 0b00000001111111110000000000000000 }; -#define LOGOC 0xFF0000 -#define SPLASH_DELAY 140 +uint32_t shadow[2400]; + +#define SPLASH_DELAY 100 +#define SPLASH_X_LOC 52 +#define SPLASH_Y_LOC 17 /*** Orientations *** 0 = top left arc @@ -64,9 +67,37 @@ const uint32_t arc[25] = { // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) +void draw_and_record_pixel(uint16_t actualx, uint16_t actualy, uint32_t back) + { + //actualx += SPLASH_X_LOC; + //actualy += SPLASH_Y_LOC; + shadow[(actualy*10)+(actualx/32)] |= (1<<(actualx%32)); + TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); + } + +void draw_and_record_box(uint16_t actualx, uint16_t actualy, uint16_t width, uint16_t height, uint32_t back) + { + tft_fill_area(actualx, actualy, width, height, back); + uint16_t i,j; + for (i=0; i>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); - else TFT_24_7789_Write_Data3(0,0,0); + if (arc[i] & 1<<(24-j)) draw_and_record_pixel(x+i,y+j,back); + else draw_bg_or_not(x+i,y+j); } else if (rotate == 1) { - if (arc[24-j] & 1<<(24-i)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); - else TFT_24_7789_Write_Data3(0,0,0); + if (arc[24-j] & 1<<(24-i)) draw_and_record_pixel(x+j,y+i,back); + else draw_bg_or_not(x+j,y+i); } else if (rotate == 2) { - if (arc[24-i] & 1<<(j)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); - else TFT_24_7789_Write_Data3(0,0,0); + if (arc[24-i] & 1<<(j)) draw_and_record_pixel(x+i,y+j,back); + else draw_bg_or_not(x+i,y+j); } else if (rotate == 3) { - if (arc[j] & 1<<(i)) TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); - else TFT_24_7789_Write_Data3(0,0,0); + if (arc[j] & 1<<(i)) draw_and_record_pixel(x+j,y+i,back); + else draw_bg_or_not(x+j,y+i); } } //TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); @@ -217,45 +248,43 @@ void splash_delay(uint32_t delay) void animate_splash(void) { - uint16_t x = 0; - + uint16_t i; - tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black /* // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) - draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); + draw_arc(52,17,0,spcolor); draw_arc(77,17,1,spcolor); tft_fill_area(52,12,8,48,spcolor); tft_fill_area(93,37,8,23,spcolor); // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) - draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,37,2,LOGOC); draw_arc(110,37,3,LOGOC); tft_fill_area(150,36,8,25,LOGOC); + draw_arc(110,12,0,spcolor); draw_arc(134,12,1,spcolor); draw_arc(134,37,2,spcolor); draw_arc(110,37,3,spcolor); tft_fill_area(150,36,8,25,spcolor); // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) - draw_arc(167,12,0,LOGOC); draw_arc(167,37,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,53,25,8,LOGOC); + draw_arc(167,12,0,spcolor); draw_arc(167,37,3,spcolor); tft_fill_area(190,12,25,8,spcolor); tft_fill_area(190,53,25,8,spcolor); // K arc (248,17,2) (248,36,1) bot (225,12,233,60) - draw_arc(248,12,2,LOGOC); draw_arc(248,37,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); + draw_arc(248,12,2,spcolor); draw_arc(248,37,1,spcolor); tft_fill_area(225,12,8,48,spcolor); // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) - draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,95,2,LOGOC); draw_arc(52,95,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); + draw_arc(52,70,0,spcolor); draw_arc(76,70,1,spcolor); draw_arc(76,95,2,spcolor); draw_arc(52,95,3,spcolor); tft_fill_area(92,94,8,24,spcolor); // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) - draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,95,2,LOGOC); draw_arc(110,95,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); + draw_arc(110,70,0,spcolor); draw_arc(134,70,1,spcolor); draw_arc(134,95,2,spcolor); draw_arc(110,95,3,spcolor); tft_fill_area(150,70,8,24,spcolor); // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) - draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,95,2,LOGOC); draw_arc(167,95,3,LOGOC); tft_fill_area(207,94,8,25,LOGOC); + draw_arc(167,70,0,spcolor); draw_arc(191,70,1,spcolor); draw_arc(191,95,2,spcolor); draw_arc(167,95,3,spcolor); tft_fill_area(207,94,8,25,spcolor); // Y arc (225,70,3) (249,70,2) box (244,90,252,118) - draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,29,LOGOC); + draw_arc(225,70,3,spcolor); draw_arc(249,70,2,spcolor); tft_fill_area(244,90,8,29,spcolor); // S arc (52,128,0) (76,152,2) - draw_arc(52,128,0,LOGOC); draw_arc(76,153,2,LOGOC); + draw_arc(52,128,0,spcolor); draw_arc(76,153,2,spcolor); // U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) - draw_arc(110,153,3,LOGOC); draw_arc(134,153,2,LOGOC); tft_fill_area(110,128,8,24,LOGOC); tft_fill_area(150,128,8,24,LOGOC); + draw_arc(110,153,3,spcolor); draw_arc(134,153,2,spcolor); tft_fill_area(110,128,8,24,spcolor); tft_fill_area(150,128,8,24,spcolor); // P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) - draw_arc(167,128,0,LOGOC); draw_arc(191,128,1,LOGOC); draw_arc(191,153,2,LOGOC); draw_arc(167,153,3,LOGOC); tft_fill_area(167,152,8,25,LOGOC); + draw_arc(167,128,0,spcolor); draw_arc(191,128,1,spcolor); draw_arc(191,153,2,spcolor); draw_arc(167,153,3,spcolor); tft_fill_area(167,152,8,25,spcolor); // E arc (225,128,0) (249,128,1) (225,152,3) - draw_arc(225,128,0,LOGOC); draw_arc(249,128,1,LOGOC); draw_arc(225,153,3,LOGOC); + draw_arc(225,128,0,spcolor); draw_arc(249,128,1,spcolor); draw_arc(225,153,3,spcolor); // R arc (52,186,0) (76,186,1) box (52,210,8,25) - draw_arc(52,186,0,LOGOC); draw_arc(76,186,1,LOGOC); tft_fill_area(52,210,8,25,LOGOC); + draw_arc(52,186,0,spcolor); draw_arc(76,186,1,spcolor); tft_fill_area(52,210,8,25,spcolor); // C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) - draw_arc(110,186,0,LOGOC); draw_arc(110,211,3,LOGOC); tft_fill_area(134,186,24,8,LOGOC); tft_fill_area(134,227,24,8,LOGOC); + draw_arc(110,186,0,spcolor); draw_arc(110,211,3,spcolor); tft_fill_area(134,186,24,8,spcolor); tft_fill_area(134,227,24,8,spcolor); // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) - draw_arc(167,186,0,LOGOC); draw_arc(191,186,1,LOGOC); draw_arc(191,211,2,LOGOC); draw_arc(167,211,3,LOGOC); + draw_arc(167,186,0,spcolor); draw_arc(191,186,1,spcolor); draw_arc(191,211,2,spcolor); draw_arc(167,211,3,spcolor); // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) - draw_arc(225,186,0,LOGOC); draw_arc(249,186,1,LOGOC); tft_fill_area(225,210,8,25,LOGOC); tft_fill_area(265,210,8,25,LOGOC); + draw_arc(225,186,0,spcolor); draw_arc(249,186,1,spcolor); tft_fill_area(225,210,8,25,spcolor); tft_fill_area(265,210,8,25,spcolor); */ /* @@ -264,56 +293,124 @@ void animate_splash(void) draw_arc(35,35,2,0xFF0000); draw_arc(10,35,3,0xFF0000); */ + + uint16_t spoffsetx, spoffsety; + uint32_t spcolor; + + //while(1) { + for (i=0; i<2400; i++) { shadow[i] = 0; } + + tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black + splash_delay(1300); + spoffsetx = 6; + spoffsety = 6; + spcolor = 0x0016aeef; + // U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) - draw_arc(110,153,3,LOGOC); draw_arc(134,153,2,LOGOC); tft_fill_area(110,128,8,24,LOGOC); tft_fill_area(150,128,8,24,LOGOC); + draw_arc(110-spoffsetx,153-spoffsety,3,spcolor); draw_arc(134-spoffsetx,153-spoffsety,2,spcolor); draw_and_record_box(110-spoffsetx,128-spoffsety,8,24,spcolor); draw_and_record_box(150-spoffsetx,128-spoffsety,8,24,spcolor); splash_delay(SPLASH_DELAY); // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) - draw_arc(110,70,0,LOGOC); draw_arc(134,70,1,LOGOC); draw_arc(134,95,2,LOGOC); draw_arc(110,95,3,LOGOC); tft_fill_area(150,70,8,24,LOGOC); + draw_arc(110-spoffsetx,70-spoffsety,0,spcolor); draw_arc(134-spoffsetx,70-spoffsety,1,spcolor); draw_arc(134-spoffsetx,95-spoffsety,2,spcolor); draw_arc(110-spoffsetx,95-spoffsety,3,spcolor); draw_and_record_box(150-spoffsetx,70-spoffsety,8,24,spcolor); splash_delay(SPLASH_DELAY); // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) - draw_arc(167,70,0,LOGOC); draw_arc(191,70,1,LOGOC); draw_arc(191,95,2,LOGOC); draw_arc(167,95,3,LOGOC); tft_fill_area(207,94,8,25,LOGOC); + draw_arc(167-spoffsetx,70-spoffsety,0,spcolor); draw_arc(191-spoffsetx,70-spoffsety,1,spcolor); draw_arc(191-spoffsetx,95-spoffsety,2,spcolor); draw_arc(167-spoffsetx,95-spoffsety,3,spcolor); draw_and_record_box(207-spoffsetx,94-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) - draw_arc(167,128,0,LOGOC); draw_arc(191,128,1,LOGOC); draw_arc(191,153,2,LOGOC); draw_arc(167,153,3,LOGOC); tft_fill_area(167,152,8,25,LOGOC); + draw_arc(167-spoffsetx,128-spoffsety,0,spcolor); draw_arc(191-spoffsetx,128-spoffsety,1,spcolor); draw_arc(191-spoffsetx,153-spoffsety,2,spcolor); draw_arc(167-spoffsetx,153-spoffsety,3,spcolor); draw_and_record_box(167-spoffsetx,152-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) - draw_arc(167,186,0,LOGOC); draw_arc(191,186,1,LOGOC); draw_arc(191,211,2,LOGOC); draw_arc(167,211,3,LOGOC); + draw_arc(167-spoffsetx,186-spoffsety,0,spcolor); draw_arc(191-spoffsetx,186-spoffsety,1,spcolor); draw_arc(191-spoffsetx,211-spoffsety,2,spcolor); draw_arc(167-spoffsetx,211-spoffsety,3,spcolor); splash_delay(SPLASH_DELAY); // C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) - draw_arc(110,186,0,LOGOC); draw_arc(110,211,3,LOGOC); tft_fill_area(134,186,24,8,LOGOC); tft_fill_area(134,227,24,8,LOGOC); + draw_arc(110-spoffsetx,186-spoffsety,0,spcolor); draw_arc(110-spoffsetx,211-spoffsety,3,spcolor); draw_and_record_box(134-spoffsetx,186-spoffsety,24,8,spcolor); draw_and_record_box(134-spoffsetx,227-spoffsety,24,8,spcolor); splash_delay(SPLASH_DELAY); // R arc (52,186,0) (76,186,1) box (52,210,8,25) - draw_arc(52,186,0,LOGOC); draw_arc(76,186,1,LOGOC); tft_fill_area(52,210,8,25,LOGOC); + draw_arc(52-spoffsetx,186-spoffsety,0,spcolor); draw_arc(76-spoffsetx,186-spoffsety,1,spcolor); draw_and_record_box(52-spoffsetx,210-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // S arc (52,128,0) (76,152,2) - draw_arc(52,128,0,LOGOC); draw_arc(76,153,2,LOGOC); + draw_arc(52-spoffsetx,128-spoffsety,0,spcolor); draw_arc(76-spoffsetx,153-spoffsety,2,spcolor); splash_delay(SPLASH_DELAY); // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) - draw_arc(52,70,0,LOGOC); draw_arc(76,70,1,LOGOC); draw_arc(76,95,2,LOGOC); draw_arc(52,95,3,LOGOC); tft_fill_area(92,94,8,24,LOGOC); + draw_arc(52-spoffsetx,70-spoffsety,0,spcolor); draw_arc(76-spoffsetx,70-spoffsety,1,spcolor); draw_arc(76-spoffsetx,95-spoffsety,2,spcolor); draw_arc(52-spoffsetx,95-spoffsety,3,spcolor); draw_and_record_box(92-spoffsetx,94-spoffsety,8,24,spcolor); + splash_delay(SPLASH_DELAY); + // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) + draw_arc(52-spoffsetx,17-spoffsety,0,spcolor); draw_arc(77-spoffsetx,17-spoffsety,1,spcolor); draw_and_record_box(52-spoffsetx,12-spoffsety,8,48,spcolor); draw_and_record_box(93-spoffsetx,37-spoffsety,8,23,spcolor); + splash_delay(SPLASH_DELAY); + // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) + draw_arc(110-spoffsetx,12-spoffsety,0,spcolor); draw_arc(134-spoffsetx,12-spoffsety,1,spcolor); draw_arc(134-spoffsetx,37-spoffsety,2,spcolor); draw_arc(110-spoffsetx,37-spoffsety,3,spcolor); draw_and_record_box(150-spoffsetx,36-spoffsety,8,25,spcolor); + splash_delay(SPLASH_DELAY); + // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) + draw_arc(167-spoffsetx,12-spoffsety,0,spcolor); draw_arc(167-spoffsetx,37-spoffsety,3,spcolor); draw_and_record_box(190-spoffsetx,12-spoffsety,25,8,spcolor); draw_and_record_box(190-spoffsetx,53-spoffsety,25,8,spcolor); + splash_delay(SPLASH_DELAY); + // K arc (248,17,2) (248,36,1) bot (225,12,233,60) + draw_arc(248-spoffsetx,12-spoffsety,2,spcolor); draw_arc(248-spoffsetx,37-spoffsety,1,spcolor); draw_and_record_box(225-spoffsetx,12-spoffsety,8,48,spcolor); splash_delay(SPLASH_DELAY); + // Y arc (225,70,3) (249,70,2) box (244,90,252,118) + draw_arc(225-spoffsetx,70-spoffsety,3,spcolor); draw_arc(249-spoffsetx,70-spoffsety,2,spcolor); draw_and_record_box(244-spoffsetx,90-spoffsety,8,29,spcolor); + splash_delay(SPLASH_DELAY); + // E arc (225,128,0) (249,128,1) (225,152,3) + draw_arc(225-spoffsetx,128-spoffsety,0,spcolor); draw_arc(249-spoffsetx,128-spoffsety,1,spcolor); draw_arc(225-spoffsetx,153-spoffsety,3,spcolor); + splash_delay(SPLASH_DELAY); + // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) + draw_arc(225-spoffsetx,186-spoffsety,0,spcolor); draw_arc(249-spoffsetx,186-spoffsety,1,spcolor); draw_and_record_box(225-spoffsetx,210-spoffsety,8,25,spcolor); draw_and_record_box(265-spoffsetx,210-spoffsety,8,25,spcolor); + splash_delay(SPLASH_DELAY); + + spoffsetx = 0; + spoffsety = 0; + spcolor = 0x00FFFFFF; + // H arc (52,17,0) (76,17,1) box (52,12,60,60) (92,37,100,60) - draw_arc(52,17,0,LOGOC); draw_arc(77,17,1,LOGOC); tft_fill_area(52,12,8,48,LOGOC); tft_fill_area(93,37,8,23,LOGOC); + draw_arc(52-spoffsetx,17-spoffsety,0,spcolor); draw_arc(77-spoffsetx,17-spoffsety,1,spcolor); tft_fill_area(52-spoffsetx,12-spoffsety,8,48,spcolor); tft_fill_area(93-spoffsetx,37-spoffsety,8,23,spcolor); splash_delay(SPLASH_DELAY); // A arc (110,12,0) (134,12,1) (134,36,2) (110,36,3) box (149,36,157,60) - draw_arc(110,12,0,LOGOC); draw_arc(134,12,1,LOGOC); draw_arc(134,37,2,LOGOC); draw_arc(110,37,3,LOGOC); tft_fill_area(150,36,8,25,LOGOC); + draw_arc(110-spoffsetx,12-spoffsety,0,spcolor); draw_arc(134-spoffsetx,12-spoffsety,1,spcolor); draw_arc(134-spoffsetx,37-spoffsety,2,spcolor); draw_arc(110-spoffsetx,37-spoffsety,3,spcolor); tft_fill_area(150-spoffsetx,36-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // C arc (167,17,0) (167,36,3) box (190,12,215,20) (190,52,215,60) - draw_arc(167,12,0,LOGOC); draw_arc(167,37,3,LOGOC); tft_fill_area(190,12,25,8,LOGOC); tft_fill_area(190,53,25,8,LOGOC); + draw_arc(167-spoffsetx,12-spoffsety,0,spcolor); draw_arc(167-spoffsetx,37-spoffsety,3,spcolor); tft_fill_area(190-spoffsetx,12-spoffsety,25,8,spcolor); tft_fill_area(190-spoffsetx,53-spoffsety,25,8,spcolor); splash_delay(SPLASH_DELAY); // K arc (248,17,2) (248,36,1) bot (225,12,233,60) - draw_arc(248,12,2,LOGOC); draw_arc(248,37,1,LOGOC); tft_fill_area(225,12,8,48,LOGOC); + draw_arc(248-spoffsetx,12-spoffsety,2,spcolor); draw_arc(248-spoffsetx,37-spoffsety,1,spcolor); tft_fill_area(225-spoffsetx,12-spoffsety,8,48,spcolor); + splash_delay(SPLASH_DELAY); + // A arc (52,70,0) (76,70,1) (134,94,2) (52,94,3) box (92,94,100,118) + draw_arc(52-spoffsetx,70-spoffsety,0,spcolor); draw_arc(76-spoffsetx,70-spoffsety,1,spcolor); draw_arc(76-spoffsetx,95-spoffsety,2,spcolor); draw_arc(52-spoffsetx,95-spoffsety,3,spcolor); tft_fill_area(92-spoffsetx,94-spoffsety,8,24,spcolor); + splash_delay(SPLASH_DELAY); + // D arc (110,70,0) (134,70,1) (134,94,2) (110,36,3) box (149,70,157,93) + draw_arc(110-spoffsetx,70-spoffsety,0,spcolor); draw_arc(134-spoffsetx,70-spoffsety,1,spcolor); draw_arc(134-spoffsetx,95-spoffsety,2,spcolor); draw_arc(110-spoffsetx,95-spoffsety,3,spcolor); tft_fill_area(150-spoffsetx,70-spoffsety,8,24,spcolor); + splash_delay(SPLASH_DELAY); + // A arc (167,70,0) (191,70,1) (191,94,2) (167,36,3) box (207,94,215,118) + draw_arc(167-spoffsetx,70-spoffsety,0,spcolor); draw_arc(191-spoffsetx,70-spoffsety,1,spcolor); draw_arc(191-spoffsetx,95-spoffsety,2,spcolor); draw_arc(167-spoffsetx,95-spoffsety,3,spcolor); tft_fill_area(207-spoffsetx,94-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // Y arc (225,70,3) (249,70,2) box (244,90,252,118) - draw_arc(225,70,3,LOGOC); draw_arc(249,70,2,LOGOC); tft_fill_area(244,90,8,29,LOGOC); + draw_arc(225-spoffsetx,70-spoffsety,3,spcolor); draw_arc(249-spoffsetx,70-spoffsety,2,spcolor); tft_fill_area(244-spoffsetx,90-spoffsety,8,29,spcolor); + splash_delay(SPLASH_DELAY); + // S arc (52,128,0) (76,152,2) + draw_arc(52-spoffsetx,128-spoffsety,0,spcolor); draw_arc(76-spoffsetx,153-spoffsety,2,spcolor); + splash_delay(SPLASH_DELAY); + // U arc (110,152,3) (134,152,2) box (110,128,8,24) (150,128,8,24) + draw_arc(110-spoffsetx,153-spoffsety,3,spcolor); draw_arc(134-spoffsetx,153-spoffsety,2,spcolor); draw_and_record_box(110-spoffsetx,128-spoffsety,8,24,spcolor); tft_fill_area(150-spoffsetx,128-spoffsety,8,24,spcolor); + splash_delay(SPLASH_DELAY); + // P arc (167,128,0) (191,128,1) (191,152,2) (167,152,3) box (167,152,8,25) + draw_arc(167-spoffsetx,128-spoffsety,0,spcolor); draw_arc(191-spoffsetx,128-spoffsety,1,spcolor); draw_arc(191-spoffsetx,153-spoffsety,2,spcolor); draw_arc(167-spoffsetx,153-spoffsety,3,spcolor); tft_fill_area(167-spoffsetx,152-spoffsety,8,25,spcolor); splash_delay(SPLASH_DELAY); // E arc (225,128,0) (249,128,1) (225,152,3) - draw_arc(225,128,0,LOGOC); draw_arc(249,128,1,LOGOC); draw_arc(225,153,3,LOGOC); + draw_arc(225-spoffsetx,128-spoffsety,0,spcolor); draw_arc(249-spoffsetx,128-spoffsety,1,spcolor); draw_arc(225-spoffsetx,153-spoffsety,3,spcolor); + splash_delay(SPLASH_DELAY); + // R arc (52,186,0) (76,186,1) box (52,210,8,25) + draw_arc(52-spoffsetx,186-spoffsety,0,spcolor); draw_arc(76-spoffsetx,186-spoffsety,1,spcolor); tft_fill_area(52-spoffsetx,210-spoffsety,8,25,spcolor); + splash_delay(SPLASH_DELAY); + // C arc (110,186,0) (110,210,3) box (134,186,24,8) (134,227,24,8) + draw_arc(110-spoffsetx,186-spoffsety,0,spcolor); draw_arc(110-spoffsetx,211-spoffsety,3,spcolor); tft_fill_area(134-spoffsetx,186-spoffsety,24,8,spcolor); tft_fill_area(134-spoffsetx,227-spoffsety,24,8,spcolor); + splash_delay(SPLASH_DELAY); + // O arc (167,186,0) (191,186,1) (191,210,2) (167,210,3) + draw_arc(167-spoffsetx,186-spoffsety,0,spcolor); draw_arc(191-spoffsetx,186-spoffsety,1,spcolor); draw_arc(191-spoffsetx,211-spoffsety,2,spcolor); draw_arc(167-spoffsetx,211-spoffsety,3,spcolor); splash_delay(SPLASH_DELAY); // N arc (225,186,0) (249,186,1) box (225,210,8,25) (266,210,8,25) - draw_arc(225,186,0,LOGOC); draw_arc(249,186,1,LOGOC); tft_fill_area(225,210,8,25,LOGOC); tft_fill_area(265,210,8,25,LOGOC); - splash_delay(2000); - //while (1) { ;; } + draw_arc(225-spoffsetx,186-spoffsety,0,spcolor); draw_arc(249-spoffsetx,186-spoffsety,1,spcolor); tft_fill_area(225-spoffsetx,210-spoffsety,8,25,spcolor); tft_fill_area(265-spoffsetx,210-spoffsety,8,25,spcolor); + splash_delay(1300); + + // } + /* struct Cipher_box box0 = { 0, 0 }; struct Cipher_box box1 = { 319+(10*CIPHER_CHAR_WIDTH), 1 }; From d6b0feb33f6d64cf7872356d66cd1c63cd7af6a9 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Fri, 12 Oct 2018 21:18:49 -0500 Subject: [PATCH 07/10] Piggy back on the 'ram' memory array from basic.c --- firmware/badge1.X/src/splash.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 6fae997..7af459e 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -29,7 +29,8 @@ const uint32_t arc[25] = { 0b00000001111111110000000000000000 }; -uint32_t shadow[2400]; +extern uint8_t ram[65536L]; +//uint32_t shadow[2400]; #define SPLASH_DELAY 100 #define SPLASH_X_LOC 52 @@ -71,7 +72,7 @@ void draw_and_record_pixel(uint16_t actualx, uint16_t actualy, uint32_t back) { //actualx += SPLASH_X_LOC; //actualy += SPLASH_Y_LOC; - shadow[(actualy*10)+(actualx/32)] |= (1<<(actualx%32)); + ram[(actualy*40)+(actualx/8)] |= (1<<(actualx%8)); TFT_24_7789_Write_Data3((back>>16)&0xFF,(back>>8)&0xFF,(back>>0)&0xFF); } @@ -83,7 +84,7 @@ void draw_and_record_box(uint16_t actualx, uint16_t actualy, uint16_t width, uin { for (j=0; j Date: Sat, 13 Oct 2018 11:45:33 -0500 Subject: [PATCH 08/10] Change compiler optimizations that were crashing badge --- .../badge1.X/nbproject/Makefile-default.mk | 108 +++++++++--------- .../nbproject/Makefile-genesis.properties | 4 +- .../badge1.X/nbproject/configurations.xml | 4 +- .../nbproject/private/configurations.xml | 2 +- .../badge1.X/nbproject/private/private.xml | 14 ++- firmware/badge1.X/src/splash.c | 1 - 6 files changed, 72 insertions(+), 61 deletions(-) diff --git a/firmware/badge1.X/nbproject/Makefile-default.mk b/firmware/badge1.X/nbproject/Makefile-default.mk index 1c46bb3..0b2fe21 100644 --- a/firmware/badge1.X/nbproject/Makefile-default.mk +++ b/firmware/badge1.X/nbproject/Makefile-default.mk @@ -110,314 +110,314 @@ ${OBJECTDIR}/src/basic/tokenizer.o: src/basic/tokenizer.c nbproject/Makefile-${ @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/tokenizer.o.d @${RM} ${OBJECTDIR}/src/basic/tokenizer.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/basic/ubasic.o: src/basic/ubasic.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/ubasic.o.d @${RM} ${OBJECTDIR}/src/basic/ubasic.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d @${RM} ${OBJECTDIR}/src/Z80/hwz.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d @${RM} ${OBJECTDIR}/src/Z80/iosim.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim1.o: src/Z80/sim1.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim1.o.d @${RM} ${OBJECTDIR}/src/Z80/sim1.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d @${RM} ${OBJECTDIR}/src/Z80/sim2.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim3.o: src/Z80/sim3.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim3.o.d @${RM} ${OBJECTDIR}/src/Z80/sim3.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d @${RM} ${OBJECTDIR}/src/Z80/sim4.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim5.o: src/Z80/sim5.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim5.o.d @${RM} ${OBJECTDIR}/src/Z80/sim5.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d @${RM} ${OBJECTDIR}/src/Z80/sim6.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim7.o: src/Z80/sim7.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim7.o.d @${RM} ${OBJECTDIR}/src/Z80/sim7.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/simfun.o: src/Z80/simfun.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simfun.o.d @${RM} ${OBJECTDIR}/src/Z80/simfun.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/simglb.o: src/Z80/simglb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simglb.o.d @${RM} ${OBJECTDIR}/src/Z80/simglb.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/disp.o: src/disp.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/disp.o.d @${RM} ${OBJECTDIR}/src/disp.o - @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/hw.o: src/hw.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/hw.o.d @${RM} ${OBJECTDIR}/src/hw.o - @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/images.o: src/images.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/images.o.d @${RM} ${OBJECTDIR}/src/images.o - @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/vt100.o.d @${RM} ${OBJECTDIR}/src/vt100.o - @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/main.o: src/main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/main.o.d @${RM} ${OBJECTDIR}/src/main.o - @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/splash.o: src/splash.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/splash.o.d @${RM} ${OBJECTDIR}/src/splash.o - @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/tetrapuzz.o: src/tetrapuzz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tetrapuzz.o.d @${RM} ${OBJECTDIR}/src/tetrapuzz.o - @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/box_game.o.d @${RM} ${OBJECTDIR}/src/box_game.o - @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/tune_player.o: src/tune_player.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tune_player.o.d @${RM} ${OBJECTDIR}/src/tune_player.o - @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/post.o.d @${RM} ${OBJECTDIR}/src/post.o - @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/snake.o.d @${RM} ${OBJECTDIR}/src/snake.o - @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/user_program.o: src/user_program.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/user_program.o.d @${RM} ${OBJECTDIR}/src/user_program.o - @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/badge.o.d @${RM} ${OBJECTDIR}/src/badge.o - @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt else ${OBJECTDIR}/src/basic/tokenizer.o: src/basic/tokenizer.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/tokenizer.o.d @${RM} ${OBJECTDIR}/src/basic/tokenizer.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/basic/ubasic.o: src/basic/ubasic.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/ubasic.o.d @${RM} ${OBJECTDIR}/src/basic/ubasic.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d @${RM} ${OBJECTDIR}/src/Z80/hwz.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d @${RM} ${OBJECTDIR}/src/Z80/iosim.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim1.o: src/Z80/sim1.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim1.o.d @${RM} ${OBJECTDIR}/src/Z80/sim1.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d @${RM} ${OBJECTDIR}/src/Z80/sim2.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim3.o: src/Z80/sim3.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim3.o.d @${RM} ${OBJECTDIR}/src/Z80/sim3.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d @${RM} ${OBJECTDIR}/src/Z80/sim4.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim5.o: src/Z80/sim5.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim5.o.d @${RM} ${OBJECTDIR}/src/Z80/sim5.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d @${RM} ${OBJECTDIR}/src/Z80/sim6.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/sim7.o: src/Z80/sim7.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim7.o.d @${RM} ${OBJECTDIR}/src/Z80/sim7.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/simfun.o: src/Z80/simfun.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simfun.o.d @${RM} ${OBJECTDIR}/src/Z80/simfun.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/Z80/simglb.o: src/Z80/simglb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simglb.o.d @${RM} ${OBJECTDIR}/src/Z80/simglb.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/disp.o: src/disp.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/disp.o.d @${RM} ${OBJECTDIR}/src/disp.o - @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/hw.o: src/hw.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/hw.o.d @${RM} ${OBJECTDIR}/src/hw.o - @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/images.o: src/images.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/images.o.d @${RM} ${OBJECTDIR}/src/images.o - @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/vt100.o.d @${RM} ${OBJECTDIR}/src/vt100.o - @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/main.o: src/main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/main.o.d @${RM} ${OBJECTDIR}/src/main.o - @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/splash.o: src/splash.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/splash.o.d @${RM} ${OBJECTDIR}/src/splash.o - @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/tetrapuzz.o: src/tetrapuzz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tetrapuzz.o.d @${RM} ${OBJECTDIR}/src/tetrapuzz.o - @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/box_game.o.d @${RM} ${OBJECTDIR}/src/box_game.o - @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/tune_player.o: src/tune_player.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tune_player.o.d @${RM} ${OBJECTDIR}/src/tune_player.o - @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/post.o.d @${RM} ${OBJECTDIR}/src/post.o - @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/snake.o.d @${RM} ${OBJECTDIR}/src/snake.o - @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/user_program.o: src/user_program.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/user_program.o.d @${RM} ${OBJECTDIR}/src/user_program.o - @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt ${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/badge.o.d @${RM} ${OBJECTDIR}/src/badge.o - @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt endif @@ -432,12 +432,12 @@ endif ifeq ($(TYPE_IMAGE), DEBUG_RUN) dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_CC} $(MP_EXTRA_LD_PRE) -g -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC0275F -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D=__DEBUG_D,--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml + ${MP_CC} $(MP_EXTRA_LD_PRE) -g -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC0275F -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D=__DEBUG_D,--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml else dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml + ${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml ${MP_CC_DIR}/xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} endif diff --git a/firmware/badge1.X/nbproject/Makefile-genesis.properties b/firmware/badge1.X/nbproject/Makefile-genesis.properties index 426fa40..2258424 100644 --- a/firmware/badge1.X/nbproject/Makefile-genesis.properties +++ b/firmware/badge1.X/nbproject/Makefile-genesis.properties @@ -1,8 +1,8 @@ # -#Tue Sep 18 18:57:45 CEST 2018 +#Sat Oct 13 11:38:12 CDT 2018 default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=f03d7c843128b5e50a1f7aa63f2ccfb5 default.languagetoolchain.dir=/opt/microchip/xc32/v2.10/bin -configurations-xml=e2183cea8fe5ecc78a6e6e8c6083a126 +configurations-xml=8ae6666b8b7748b6dfe9d4817bb31c4a com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=ddd77f39013c5d7ceec7afa039614a52 default.languagetoolchain.version=2.10 host.platform=linux diff --git a/firmware/badge1.X/nbproject/configurations.xml b/firmware/badge1.X/nbproject/configurations.xml index e1f3c8f..8f94089 100644 --- a/firmware/badge1.X/nbproject/configurations.xml +++ b/firmware/badge1.X/nbproject/configurations.xml @@ -126,7 +126,7 @@ - + @@ -191,7 +191,7 @@ - + diff --git a/firmware/badge1.X/nbproject/private/configurations.xml b/firmware/badge1.X/nbproject/private/configurations.xml index 685f5a0..3c4c9e0 100644 --- a/firmware/badge1.X/nbproject/private/configurations.xml +++ b/firmware/badge1.X/nbproject/private/configurations.xml @@ -4,7 +4,7 @@ 0 - :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>9012:=<rev>0100:=<man>Microchip Technology Incorporated:=<prod>MPLAB PICkit 4:=<sn>BUR181416523:=<drv>x:=<xpt>b:=end + :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>9012:=<rev>0100:=<man>Microchip Technology Incorporated:=<prod>MPLAB PICkit 4:=<sn>BUR180524591:=<drv>x:=<xpt>b:=end /opt/microchip/xc32/v2.10/bin place holder 1 diff --git a/firmware/badge1.X/nbproject/private/private.xml b/firmware/badge1.X/nbproject/private/private.xml index 6807a2b..2c864c0 100644 --- a/firmware/badge1.X/nbproject/private/private.xml +++ b/firmware/badge1.X/nbproject/private/private.xml @@ -2,6 +2,18 @@ - + + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.h + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/main.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/disp.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/user_program.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.h + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/Z80/hwz.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/basic/ubasic.c + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge_settings.h + file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge.c + diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge1.X/src/splash.c index 7af459e..530d5b5 100644 --- a/firmware/badge1.X/src/splash.c +++ b/firmware/badge1.X/src/splash.c @@ -302,7 +302,6 @@ void animate_splash(void) for (i=0; i<9600; i++) { ram[i] = 0; } tft_fill_area(0,0,320,240,CIPHER_BACKGROUND); //Make display black - splash_delay(1300); spoffsetx = 6; spoffsety = 6; spcolor = 0x0016aeef; From e67afa003f250bd0be680a596e18169fab54ccc4 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Sat, 13 Oct 2018 12:23:35 -0500 Subject: [PATCH 09/10] Changing name of project to badge-supercon18 --- firmware/{badge1.X => badge-supercon18.X}/Makefile | 0 firmware/{badge1.X => badge-supercon18.X}/badge1.X.production.hex | 0 .../nbproject/Makefile-default.mk | 0 .../nbproject/Makefile-genesis.properties | 0 .../{badge1.X => badge-supercon18.X}/nbproject/Makefile-impl.mk | 0 .../nbproject/Makefile-local-default.mk | 0 .../nbproject/Makefile-variables.mk | 0 .../nbproject/Package-default.bash | 0 .../{badge1.X => badge-supercon18.X}/nbproject/configurations.xml | 0 .../nbproject/private/SuppressibleMessageMemo.properties | 0 .../nbproject/private/configurations.xml | 0 .../nbproject/private/private.xml | 0 firmware/{badge1.X => badge-supercon18.X}/nbproject/project.xml | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/fdefs.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/hwz.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/hwz.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/iosim.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim1.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim2.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim3.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim4.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim5.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim6.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim7.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/simfun.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/simglb.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/simglb.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/Z80/simint.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/badge.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/badge.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/badge_settings.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/badge_user.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/basic/tokenizer.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/basic/tokenizer.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/basic/ubasic.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/basic/ubasic.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/box_game.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/box_game.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/disp.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/disp.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/hw.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/hw.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/images.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/main.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/opts.txt | 0 firmware/{badge1.X => badge-supercon18.X}/src/post.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/post.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/snake.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/snake.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/splash.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/splash.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/tetrapuzz.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/tetrapuzz.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/tune_player.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/tune_player.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/user_program.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/user_program.h | 0 firmware/{badge1.X => badge-supercon18.X}/src/vt100.c | 0 firmware/{badge1.X => badge-supercon18.X}/src/vt100.h | 0 60 files changed, 0 insertions(+), 0 deletions(-) rename firmware/{badge1.X => badge-supercon18.X}/Makefile (100%) rename firmware/{badge1.X => badge-supercon18.X}/badge1.X.production.hex (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Makefile-default.mk (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Makefile-genesis.properties (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Makefile-impl.mk (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Makefile-local-default.mk (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Makefile-variables.mk (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/Package-default.bash (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/configurations.xml (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/private/SuppressibleMessageMemo.properties (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/private/configurations.xml (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/private/private.xml (100%) rename firmware/{badge1.X => badge-supercon18.X}/nbproject/project.xml (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/fdefs.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/hwz.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/hwz.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/iosim.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim1.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim2.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim3.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim4.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim5.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim6.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/sim7.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/simfun.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/simglb.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/simglb.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/Z80/simint.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/badge.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/badge.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/badge_settings.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/badge_user.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/basic/tokenizer.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/basic/tokenizer.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/basic/ubasic.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/basic/ubasic.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/box_game.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/box_game.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/disp.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/disp.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/hw.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/hw.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/images.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/main.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/opts.txt (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/post.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/post.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/snake.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/snake.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/splash.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/splash.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/tetrapuzz.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/tetrapuzz.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/tune_player.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/tune_player.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/user_program.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/user_program.h (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/vt100.c (100%) rename firmware/{badge1.X => badge-supercon18.X}/src/vt100.h (100%) diff --git a/firmware/badge1.X/Makefile b/firmware/badge-supercon18.X/Makefile similarity index 100% rename from firmware/badge1.X/Makefile rename to firmware/badge-supercon18.X/Makefile diff --git a/firmware/badge1.X/badge1.X.production.hex b/firmware/badge-supercon18.X/badge1.X.production.hex similarity index 100% rename from firmware/badge1.X/badge1.X.production.hex rename to firmware/badge-supercon18.X/badge1.X.production.hex diff --git a/firmware/badge1.X/nbproject/Makefile-default.mk b/firmware/badge-supercon18.X/nbproject/Makefile-default.mk similarity index 100% rename from firmware/badge1.X/nbproject/Makefile-default.mk rename to firmware/badge-supercon18.X/nbproject/Makefile-default.mk diff --git a/firmware/badge1.X/nbproject/Makefile-genesis.properties b/firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties similarity index 100% rename from firmware/badge1.X/nbproject/Makefile-genesis.properties rename to firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties diff --git a/firmware/badge1.X/nbproject/Makefile-impl.mk b/firmware/badge-supercon18.X/nbproject/Makefile-impl.mk similarity index 100% rename from firmware/badge1.X/nbproject/Makefile-impl.mk rename to firmware/badge-supercon18.X/nbproject/Makefile-impl.mk diff --git a/firmware/badge1.X/nbproject/Makefile-local-default.mk b/firmware/badge-supercon18.X/nbproject/Makefile-local-default.mk similarity index 100% rename from firmware/badge1.X/nbproject/Makefile-local-default.mk rename to firmware/badge-supercon18.X/nbproject/Makefile-local-default.mk diff --git a/firmware/badge1.X/nbproject/Makefile-variables.mk b/firmware/badge-supercon18.X/nbproject/Makefile-variables.mk similarity index 100% rename from firmware/badge1.X/nbproject/Makefile-variables.mk rename to firmware/badge-supercon18.X/nbproject/Makefile-variables.mk diff --git a/firmware/badge1.X/nbproject/Package-default.bash b/firmware/badge-supercon18.X/nbproject/Package-default.bash similarity index 100% rename from firmware/badge1.X/nbproject/Package-default.bash rename to firmware/badge-supercon18.X/nbproject/Package-default.bash diff --git a/firmware/badge1.X/nbproject/configurations.xml b/firmware/badge-supercon18.X/nbproject/configurations.xml similarity index 100% rename from firmware/badge1.X/nbproject/configurations.xml rename to firmware/badge-supercon18.X/nbproject/configurations.xml diff --git a/firmware/badge1.X/nbproject/private/SuppressibleMessageMemo.properties b/firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties similarity index 100% rename from firmware/badge1.X/nbproject/private/SuppressibleMessageMemo.properties rename to firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties diff --git a/firmware/badge1.X/nbproject/private/configurations.xml b/firmware/badge-supercon18.X/nbproject/private/configurations.xml similarity index 100% rename from firmware/badge1.X/nbproject/private/configurations.xml rename to firmware/badge-supercon18.X/nbproject/private/configurations.xml diff --git a/firmware/badge1.X/nbproject/private/private.xml b/firmware/badge-supercon18.X/nbproject/private/private.xml similarity index 100% rename from firmware/badge1.X/nbproject/private/private.xml rename to firmware/badge-supercon18.X/nbproject/private/private.xml diff --git a/firmware/badge1.X/nbproject/project.xml b/firmware/badge-supercon18.X/nbproject/project.xml similarity index 100% rename from firmware/badge1.X/nbproject/project.xml rename to firmware/badge-supercon18.X/nbproject/project.xml diff --git a/firmware/badge1.X/src/Z80/fdefs.h b/firmware/badge-supercon18.X/src/Z80/fdefs.h similarity index 100% rename from firmware/badge1.X/src/Z80/fdefs.h rename to firmware/badge-supercon18.X/src/Z80/fdefs.h diff --git a/firmware/badge1.X/src/Z80/hwz.c b/firmware/badge-supercon18.X/src/Z80/hwz.c similarity index 100% rename from firmware/badge1.X/src/Z80/hwz.c rename to firmware/badge-supercon18.X/src/Z80/hwz.c diff --git a/firmware/badge1.X/src/Z80/hwz.h b/firmware/badge-supercon18.X/src/Z80/hwz.h similarity index 100% rename from firmware/badge1.X/src/Z80/hwz.h rename to firmware/badge-supercon18.X/src/Z80/hwz.h diff --git a/firmware/badge1.X/src/Z80/iosim.c b/firmware/badge-supercon18.X/src/Z80/iosim.c similarity index 100% rename from firmware/badge1.X/src/Z80/iosim.c rename to firmware/badge-supercon18.X/src/Z80/iosim.c diff --git a/firmware/badge1.X/src/Z80/sim.h b/firmware/badge-supercon18.X/src/Z80/sim.h similarity index 100% rename from firmware/badge1.X/src/Z80/sim.h rename to firmware/badge-supercon18.X/src/Z80/sim.h diff --git a/firmware/badge1.X/src/Z80/sim1.c b/firmware/badge-supercon18.X/src/Z80/sim1.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim1.c rename to firmware/badge-supercon18.X/src/Z80/sim1.c diff --git a/firmware/badge1.X/src/Z80/sim2.c b/firmware/badge-supercon18.X/src/Z80/sim2.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim2.c rename to firmware/badge-supercon18.X/src/Z80/sim2.c diff --git a/firmware/badge1.X/src/Z80/sim3.c b/firmware/badge-supercon18.X/src/Z80/sim3.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim3.c rename to firmware/badge-supercon18.X/src/Z80/sim3.c diff --git a/firmware/badge1.X/src/Z80/sim4.c b/firmware/badge-supercon18.X/src/Z80/sim4.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim4.c rename to firmware/badge-supercon18.X/src/Z80/sim4.c diff --git a/firmware/badge1.X/src/Z80/sim5.c b/firmware/badge-supercon18.X/src/Z80/sim5.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim5.c rename to firmware/badge-supercon18.X/src/Z80/sim5.c diff --git a/firmware/badge1.X/src/Z80/sim6.c b/firmware/badge-supercon18.X/src/Z80/sim6.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim6.c rename to firmware/badge-supercon18.X/src/Z80/sim6.c diff --git a/firmware/badge1.X/src/Z80/sim7.c b/firmware/badge-supercon18.X/src/Z80/sim7.c similarity index 100% rename from firmware/badge1.X/src/Z80/sim7.c rename to firmware/badge-supercon18.X/src/Z80/sim7.c diff --git a/firmware/badge1.X/src/Z80/simfun.c b/firmware/badge-supercon18.X/src/Z80/simfun.c similarity index 100% rename from firmware/badge1.X/src/Z80/simfun.c rename to firmware/badge-supercon18.X/src/Z80/simfun.c diff --git a/firmware/badge1.X/src/Z80/simglb.c b/firmware/badge-supercon18.X/src/Z80/simglb.c similarity index 100% rename from firmware/badge1.X/src/Z80/simglb.c rename to firmware/badge-supercon18.X/src/Z80/simglb.c diff --git a/firmware/badge1.X/src/Z80/simglb.h b/firmware/badge-supercon18.X/src/Z80/simglb.h similarity index 100% rename from firmware/badge1.X/src/Z80/simglb.h rename to firmware/badge-supercon18.X/src/Z80/simglb.h diff --git a/firmware/badge1.X/src/Z80/simint.c b/firmware/badge-supercon18.X/src/Z80/simint.c similarity index 100% rename from firmware/badge1.X/src/Z80/simint.c rename to firmware/badge-supercon18.X/src/Z80/simint.c diff --git a/firmware/badge1.X/src/badge.c b/firmware/badge-supercon18.X/src/badge.c similarity index 100% rename from firmware/badge1.X/src/badge.c rename to firmware/badge-supercon18.X/src/badge.c diff --git a/firmware/badge1.X/src/badge.h b/firmware/badge-supercon18.X/src/badge.h similarity index 100% rename from firmware/badge1.X/src/badge.h rename to firmware/badge-supercon18.X/src/badge.h diff --git a/firmware/badge1.X/src/badge_settings.h b/firmware/badge-supercon18.X/src/badge_settings.h similarity index 100% rename from firmware/badge1.X/src/badge_settings.h rename to firmware/badge-supercon18.X/src/badge_settings.h diff --git a/firmware/badge1.X/src/badge_user.h b/firmware/badge-supercon18.X/src/badge_user.h similarity index 100% rename from firmware/badge1.X/src/badge_user.h rename to firmware/badge-supercon18.X/src/badge_user.h diff --git a/firmware/badge1.X/src/basic/tokenizer.c b/firmware/badge-supercon18.X/src/basic/tokenizer.c similarity index 100% rename from firmware/badge1.X/src/basic/tokenizer.c rename to firmware/badge-supercon18.X/src/basic/tokenizer.c diff --git a/firmware/badge1.X/src/basic/tokenizer.h b/firmware/badge-supercon18.X/src/basic/tokenizer.h similarity index 100% rename from firmware/badge1.X/src/basic/tokenizer.h rename to firmware/badge-supercon18.X/src/basic/tokenizer.h diff --git a/firmware/badge1.X/src/basic/ubasic.c b/firmware/badge-supercon18.X/src/basic/ubasic.c similarity index 100% rename from firmware/badge1.X/src/basic/ubasic.c rename to firmware/badge-supercon18.X/src/basic/ubasic.c diff --git a/firmware/badge1.X/src/basic/ubasic.h b/firmware/badge-supercon18.X/src/basic/ubasic.h similarity index 100% rename from firmware/badge1.X/src/basic/ubasic.h rename to firmware/badge-supercon18.X/src/basic/ubasic.h diff --git a/firmware/badge1.X/src/box_game.c b/firmware/badge-supercon18.X/src/box_game.c similarity index 100% rename from firmware/badge1.X/src/box_game.c rename to firmware/badge-supercon18.X/src/box_game.c diff --git a/firmware/badge1.X/src/box_game.h b/firmware/badge-supercon18.X/src/box_game.h similarity index 100% rename from firmware/badge1.X/src/box_game.h rename to firmware/badge-supercon18.X/src/box_game.h diff --git a/firmware/badge1.X/src/disp.c b/firmware/badge-supercon18.X/src/disp.c similarity index 100% rename from firmware/badge1.X/src/disp.c rename to firmware/badge-supercon18.X/src/disp.c diff --git a/firmware/badge1.X/src/disp.h b/firmware/badge-supercon18.X/src/disp.h similarity index 100% rename from firmware/badge1.X/src/disp.h rename to firmware/badge-supercon18.X/src/disp.h diff --git a/firmware/badge1.X/src/hw.c b/firmware/badge-supercon18.X/src/hw.c similarity index 100% rename from firmware/badge1.X/src/hw.c rename to firmware/badge-supercon18.X/src/hw.c diff --git a/firmware/badge1.X/src/hw.h b/firmware/badge-supercon18.X/src/hw.h similarity index 100% rename from firmware/badge1.X/src/hw.h rename to firmware/badge-supercon18.X/src/hw.h diff --git a/firmware/badge1.X/src/images.c b/firmware/badge-supercon18.X/src/images.c similarity index 100% rename from firmware/badge1.X/src/images.c rename to firmware/badge-supercon18.X/src/images.c diff --git a/firmware/badge1.X/src/main.c b/firmware/badge-supercon18.X/src/main.c similarity index 100% rename from firmware/badge1.X/src/main.c rename to firmware/badge-supercon18.X/src/main.c diff --git a/firmware/badge1.X/src/opts.txt b/firmware/badge-supercon18.X/src/opts.txt similarity index 100% rename from firmware/badge1.X/src/opts.txt rename to firmware/badge-supercon18.X/src/opts.txt diff --git a/firmware/badge1.X/src/post.c b/firmware/badge-supercon18.X/src/post.c similarity index 100% rename from firmware/badge1.X/src/post.c rename to firmware/badge-supercon18.X/src/post.c diff --git a/firmware/badge1.X/src/post.h b/firmware/badge-supercon18.X/src/post.h similarity index 100% rename from firmware/badge1.X/src/post.h rename to firmware/badge-supercon18.X/src/post.h diff --git a/firmware/badge1.X/src/snake.c b/firmware/badge-supercon18.X/src/snake.c similarity index 100% rename from firmware/badge1.X/src/snake.c rename to firmware/badge-supercon18.X/src/snake.c diff --git a/firmware/badge1.X/src/snake.h b/firmware/badge-supercon18.X/src/snake.h similarity index 100% rename from firmware/badge1.X/src/snake.h rename to firmware/badge-supercon18.X/src/snake.h diff --git a/firmware/badge1.X/src/splash.c b/firmware/badge-supercon18.X/src/splash.c similarity index 100% rename from firmware/badge1.X/src/splash.c rename to firmware/badge-supercon18.X/src/splash.c diff --git a/firmware/badge1.X/src/splash.h b/firmware/badge-supercon18.X/src/splash.h similarity index 100% rename from firmware/badge1.X/src/splash.h rename to firmware/badge-supercon18.X/src/splash.h diff --git a/firmware/badge1.X/src/tetrapuzz.c b/firmware/badge-supercon18.X/src/tetrapuzz.c similarity index 100% rename from firmware/badge1.X/src/tetrapuzz.c rename to firmware/badge-supercon18.X/src/tetrapuzz.c diff --git a/firmware/badge1.X/src/tetrapuzz.h b/firmware/badge-supercon18.X/src/tetrapuzz.h similarity index 100% rename from firmware/badge1.X/src/tetrapuzz.h rename to firmware/badge-supercon18.X/src/tetrapuzz.h diff --git a/firmware/badge1.X/src/tune_player.c b/firmware/badge-supercon18.X/src/tune_player.c similarity index 100% rename from firmware/badge1.X/src/tune_player.c rename to firmware/badge-supercon18.X/src/tune_player.c diff --git a/firmware/badge1.X/src/tune_player.h b/firmware/badge-supercon18.X/src/tune_player.h similarity index 100% rename from firmware/badge1.X/src/tune_player.h rename to firmware/badge-supercon18.X/src/tune_player.h diff --git a/firmware/badge1.X/src/user_program.c b/firmware/badge-supercon18.X/src/user_program.c similarity index 100% rename from firmware/badge1.X/src/user_program.c rename to firmware/badge-supercon18.X/src/user_program.c diff --git a/firmware/badge1.X/src/user_program.h b/firmware/badge-supercon18.X/src/user_program.h similarity index 100% rename from firmware/badge1.X/src/user_program.h rename to firmware/badge-supercon18.X/src/user_program.h diff --git a/firmware/badge1.X/src/vt100.c b/firmware/badge-supercon18.X/src/vt100.c similarity index 100% rename from firmware/badge1.X/src/vt100.c rename to firmware/badge-supercon18.X/src/vt100.c diff --git a/firmware/badge1.X/src/vt100.h b/firmware/badge-supercon18.X/src/vt100.h similarity index 100% rename from firmware/badge1.X/src/vt100.h rename to firmware/badge-supercon18.X/src/vt100.h From 817eff7cb8c83a7dd3a4fa2ec04d8611c2a6eaab Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Sat, 13 Oct 2018 12:27:54 -0500 Subject: [PATCH 10/10] Replaced MPLABX project files with a fresh set to ensure configuration is as desired --- .../nbproject/Makefile-default.mk | 298 ++++----- .../nbproject/Makefile-genesis.properties | 4 +- .../nbproject/Makefile-impl.mk | 2 +- .../nbproject/Makefile-variables.mk | 8 +- .../nbproject/Package-default.bash | 12 +- .../nbproject/configurations.xml | 595 +----------------- .../SuppressibleMessageMemo.properties | 3 - .../nbproject/private/private.xml | 12 +- .../badge-supercon18.X/nbproject/project.xml | 4 +- 9 files changed, 191 insertions(+), 747 deletions(-) delete mode 100644 firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties diff --git a/firmware/badge-supercon18.X/nbproject/Makefile-default.mk b/firmware/badge-supercon18.X/nbproject/Makefile-default.mk index 0b2fe21..3c4b0ec 100644 --- a/firmware/badge-supercon18.X/nbproject/Makefile-default.mk +++ b/firmware/badge-supercon18.X/nbproject/Makefile-default.mk @@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN) IMAGE_TYPE=debug OUTPUT_SUFFIX=elf DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} else IMAGE_TYPE=production OUTPUT_SUFFIX=hex DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} endif ifeq ($(COMPARE_BUILD), true) @@ -57,17 +57,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=src/basic/tokenizer.c src/basic/ubasic.c src/Z80/hwz.c src/Z80/iosim.c src/Z80/sim1.c src/Z80/sim2.c src/Z80/sim3.c src/Z80/sim4.c src/Z80/sim5.c src/Z80/sim6.c src/Z80/sim7.c src/Z80/simfun.c src/Z80/simglb.c src/disp.c src/hw.c src/images.c src/vt100.c src/main.c src/splash.c src/tetrapuzz.c src/box_game.c src/tune_player.c src/post.c src/snake.c src/user_program.c src/badge.c +SOURCEFILES_QUOTED_IF_SPACED=src/basic/tokenizer.c src/basic/ubasic.c src/Z80/sim2.c src/Z80/sim4.c src/Z80/sim1.c src/Z80/sim3.c src/Z80/iosim.c src/Z80/sim5.c src/Z80/sim7.c src/Z80/simfun.c src/Z80/hwz.c src/Z80/simglb.c src/Z80/sim6.c src/badge.c src/box_game.c src/disp.c src/hw.c src/images.c src/main.c src/post.c src/snake.c src/splash.c src/tetrapuzz.c src/tune_player.c src/user_program.c src/vt100.c # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/src/basic/tokenizer.o ${OBJECTDIR}/src/basic/ubasic.o ${OBJECTDIR}/src/Z80/hwz.o ${OBJECTDIR}/src/Z80/iosim.o ${OBJECTDIR}/src/Z80/sim1.o ${OBJECTDIR}/src/Z80/sim2.o ${OBJECTDIR}/src/Z80/sim3.o ${OBJECTDIR}/src/Z80/sim4.o ${OBJECTDIR}/src/Z80/sim5.o ${OBJECTDIR}/src/Z80/sim6.o ${OBJECTDIR}/src/Z80/sim7.o ${OBJECTDIR}/src/Z80/simfun.o ${OBJECTDIR}/src/Z80/simglb.o ${OBJECTDIR}/src/disp.o ${OBJECTDIR}/src/hw.o ${OBJECTDIR}/src/images.o ${OBJECTDIR}/src/vt100.o ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/splash.o ${OBJECTDIR}/src/tetrapuzz.o ${OBJECTDIR}/src/box_game.o ${OBJECTDIR}/src/tune_player.o ${OBJECTDIR}/src/post.o ${OBJECTDIR}/src/snake.o ${OBJECTDIR}/src/user_program.o ${OBJECTDIR}/src/badge.o -POSSIBLE_DEPFILES=${OBJECTDIR}/src/basic/tokenizer.o.d ${OBJECTDIR}/src/basic/ubasic.o.d ${OBJECTDIR}/src/Z80/hwz.o.d ${OBJECTDIR}/src/Z80/iosim.o.d ${OBJECTDIR}/src/Z80/sim1.o.d ${OBJECTDIR}/src/Z80/sim2.o.d ${OBJECTDIR}/src/Z80/sim3.o.d ${OBJECTDIR}/src/Z80/sim4.o.d ${OBJECTDIR}/src/Z80/sim5.o.d ${OBJECTDIR}/src/Z80/sim6.o.d ${OBJECTDIR}/src/Z80/sim7.o.d ${OBJECTDIR}/src/Z80/simfun.o.d ${OBJECTDIR}/src/Z80/simglb.o.d ${OBJECTDIR}/src/disp.o.d ${OBJECTDIR}/src/hw.o.d ${OBJECTDIR}/src/images.o.d ${OBJECTDIR}/src/vt100.o.d ${OBJECTDIR}/src/main.o.d ${OBJECTDIR}/src/splash.o.d ${OBJECTDIR}/src/tetrapuzz.o.d ${OBJECTDIR}/src/box_game.o.d ${OBJECTDIR}/src/tune_player.o.d ${OBJECTDIR}/src/post.o.d ${OBJECTDIR}/src/snake.o.d ${OBJECTDIR}/src/user_program.o.d ${OBJECTDIR}/src/badge.o.d +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/src/basic/tokenizer.o ${OBJECTDIR}/src/basic/ubasic.o ${OBJECTDIR}/src/Z80/sim2.o ${OBJECTDIR}/src/Z80/sim4.o ${OBJECTDIR}/src/Z80/sim1.o ${OBJECTDIR}/src/Z80/sim3.o ${OBJECTDIR}/src/Z80/iosim.o ${OBJECTDIR}/src/Z80/sim5.o ${OBJECTDIR}/src/Z80/sim7.o ${OBJECTDIR}/src/Z80/simfun.o ${OBJECTDIR}/src/Z80/hwz.o ${OBJECTDIR}/src/Z80/simglb.o ${OBJECTDIR}/src/Z80/sim6.o ${OBJECTDIR}/src/badge.o ${OBJECTDIR}/src/box_game.o ${OBJECTDIR}/src/disp.o ${OBJECTDIR}/src/hw.o ${OBJECTDIR}/src/images.o ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/post.o ${OBJECTDIR}/src/snake.o ${OBJECTDIR}/src/splash.o ${OBJECTDIR}/src/tetrapuzz.o ${OBJECTDIR}/src/tune_player.o ${OBJECTDIR}/src/user_program.o ${OBJECTDIR}/src/vt100.o +POSSIBLE_DEPFILES=${OBJECTDIR}/src/basic/tokenizer.o.d ${OBJECTDIR}/src/basic/ubasic.o.d ${OBJECTDIR}/src/Z80/sim2.o.d ${OBJECTDIR}/src/Z80/sim4.o.d ${OBJECTDIR}/src/Z80/sim1.o.d ${OBJECTDIR}/src/Z80/sim3.o.d ${OBJECTDIR}/src/Z80/iosim.o.d ${OBJECTDIR}/src/Z80/sim5.o.d ${OBJECTDIR}/src/Z80/sim7.o.d ${OBJECTDIR}/src/Z80/simfun.o.d ${OBJECTDIR}/src/Z80/hwz.o.d ${OBJECTDIR}/src/Z80/simglb.o.d ${OBJECTDIR}/src/Z80/sim6.o.d ${OBJECTDIR}/src/badge.o.d ${OBJECTDIR}/src/box_game.o.d ${OBJECTDIR}/src/disp.o.d ${OBJECTDIR}/src/hw.o.d ${OBJECTDIR}/src/images.o.d ${OBJECTDIR}/src/main.o.d ${OBJECTDIR}/src/post.o.d ${OBJECTDIR}/src/snake.o.d ${OBJECTDIR}/src/splash.o.d ${OBJECTDIR}/src/tetrapuzz.o.d ${OBJECTDIR}/src/tune_player.o.d ${OBJECTDIR}/src/user_program.o.d ${OBJECTDIR}/src/vt100.o.d # Object Files -OBJECTFILES=${OBJECTDIR}/src/basic/tokenizer.o ${OBJECTDIR}/src/basic/ubasic.o ${OBJECTDIR}/src/Z80/hwz.o ${OBJECTDIR}/src/Z80/iosim.o ${OBJECTDIR}/src/Z80/sim1.o ${OBJECTDIR}/src/Z80/sim2.o ${OBJECTDIR}/src/Z80/sim3.o ${OBJECTDIR}/src/Z80/sim4.o ${OBJECTDIR}/src/Z80/sim5.o ${OBJECTDIR}/src/Z80/sim6.o ${OBJECTDIR}/src/Z80/sim7.o ${OBJECTDIR}/src/Z80/simfun.o ${OBJECTDIR}/src/Z80/simglb.o ${OBJECTDIR}/src/disp.o ${OBJECTDIR}/src/hw.o ${OBJECTDIR}/src/images.o ${OBJECTDIR}/src/vt100.o ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/splash.o ${OBJECTDIR}/src/tetrapuzz.o ${OBJECTDIR}/src/box_game.o ${OBJECTDIR}/src/tune_player.o ${OBJECTDIR}/src/post.o ${OBJECTDIR}/src/snake.o ${OBJECTDIR}/src/user_program.o ${OBJECTDIR}/src/badge.o +OBJECTFILES=${OBJECTDIR}/src/basic/tokenizer.o ${OBJECTDIR}/src/basic/ubasic.o ${OBJECTDIR}/src/Z80/sim2.o ${OBJECTDIR}/src/Z80/sim4.o ${OBJECTDIR}/src/Z80/sim1.o ${OBJECTDIR}/src/Z80/sim3.o ${OBJECTDIR}/src/Z80/iosim.o ${OBJECTDIR}/src/Z80/sim5.o ${OBJECTDIR}/src/Z80/sim7.o ${OBJECTDIR}/src/Z80/simfun.o ${OBJECTDIR}/src/Z80/hwz.o ${OBJECTDIR}/src/Z80/simglb.o ${OBJECTDIR}/src/Z80/sim6.o ${OBJECTDIR}/src/badge.o ${OBJECTDIR}/src/box_game.o ${OBJECTDIR}/src/disp.o ${OBJECTDIR}/src/hw.o ${OBJECTDIR}/src/images.o ${OBJECTDIR}/src/main.o ${OBJECTDIR}/src/post.o ${OBJECTDIR}/src/snake.o ${OBJECTDIR}/src/splash.o ${OBJECTDIR}/src/tetrapuzz.o ${OBJECTDIR}/src/tune_player.o ${OBJECTDIR}/src/user_program.o ${OBJECTDIR}/src/vt100.o # Source Files -SOURCEFILES=src/basic/tokenizer.c src/basic/ubasic.c src/Z80/hwz.c src/Z80/iosim.c src/Z80/sim1.c src/Z80/sim2.c src/Z80/sim3.c src/Z80/sim4.c src/Z80/sim5.c src/Z80/sim6.c src/Z80/sim7.c src/Z80/simfun.c src/Z80/simglb.c src/disp.c src/hw.c src/images.c src/vt100.c src/main.c src/splash.c src/tetrapuzz.c src/box_game.c src/tune_player.c src/post.c src/snake.c src/user_program.c src/badge.c +SOURCEFILES=src/basic/tokenizer.c src/basic/ubasic.c src/Z80/sim2.c src/Z80/sim4.c src/Z80/sim1.c src/Z80/sim3.c src/Z80/iosim.c src/Z80/sim5.c src/Z80/sim7.c src/Z80/simfun.c src/Z80/hwz.c src/Z80/simglb.c src/Z80/sim6.c src/badge.c src/box_game.c src/disp.c src/hw.c src/images.c src/main.c src/post.c src/snake.c src/splash.c src/tetrapuzz.c src/tune_player.c src/user_program.c src/vt100.c CFLAGS= @@ -87,7 +87,7 @@ FIXDEPS=fixDeps ifneq ($(INFORMATION_MESSAGE), ) @echo $(INFORMATION_MESSAGE) endif - ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} + ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} MP_PROCESSOR_OPTION=32MX370F512H MP_LINKER_FILE_OPTION= @@ -110,314 +110,314 @@ ${OBJECTDIR}/src/basic/tokenizer.o: src/basic/tokenizer.c nbproject/Makefile-${ @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/tokenizer.o.d @${RM} ${OBJECTDIR}/src/basic/tokenizer.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/basic/ubasic.o: src/basic/ubasic.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/ubasic.o.d @${RM} ${OBJECTDIR}/src/basic/ubasic.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d - @${RM} ${OBJECTDIR}/src/Z80/hwz.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim2.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d - @${RM} ${OBJECTDIR}/src/Z80/iosim.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim4.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim1.o: src/Z80/sim1.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim1.o.d @${RM} ${OBJECTDIR}/src/Z80/sim1.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim2.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim3.o: src/Z80/sim3.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim3.o.d @${RM} ${OBJECTDIR}/src/Z80/sim3.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim4.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d + @${RM} ${OBJECTDIR}/src/Z80/iosim.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim5.o: src/Z80/sim5.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim5.o.d @${RM} ${OBJECTDIR}/src/Z80/sim5.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim6.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim7.o: src/Z80/sim7.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim7.o.d @${RM} ${OBJECTDIR}/src/Z80/sim7.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/simfun.o: src/Z80/simfun.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simfun.o.d @${RM} ${OBJECTDIR}/src/Z80/simfun.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src/Z80" + @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d + @${RM} ${OBJECTDIR}/src/Z80/hwz.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/simglb.o: src/Z80/simglb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simglb.o.d @${RM} ${OBJECTDIR}/src/Z80/simglb.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src/Z80" + @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim6.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/badge.o.d + @${RM} ${OBJECTDIR}/src/badge.o + @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/box_game.o.d + @${RM} ${OBJECTDIR}/src/box_game.o + @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/disp.o: src/disp.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/disp.o.d @${RM} ${OBJECTDIR}/src/disp.o - @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/hw.o: src/hw.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/hw.o.d @${RM} ${OBJECTDIR}/src/hw.o - @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/images.o: src/images.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/images.o.d @${RM} ${OBJECTDIR}/src/images.o - @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/vt100.o.d - @${RM} ${OBJECTDIR}/src/vt100.o - @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/main.o: src/main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/main.o.d @${RM} ${OBJECTDIR}/src/main.o - @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/post.o.d + @${RM} ${OBJECTDIR}/src/post.o + @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/snake.o.d + @${RM} ${OBJECTDIR}/src/snake.o + @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/splash.o: src/splash.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/splash.o.d @${RM} ${OBJECTDIR}/src/splash.o - @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/tetrapuzz.o: src/tetrapuzz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tetrapuzz.o.d @${RM} ${OBJECTDIR}/src/tetrapuzz.o - @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/box_game.o.d - @${RM} ${OBJECTDIR}/src/box_game.o - @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/tune_player.o: src/tune_player.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tune_player.o.d @${RM} ${OBJECTDIR}/src/tune_player.o - @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/post.o.d - @${RM} ${OBJECTDIR}/src/post.o - @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/snake.o.d - @${RM} ${OBJECTDIR}/src/snake.o - @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/user_program.o: src/user_program.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/user_program.o.d @${RM} ${OBJECTDIR}/src/user_program.o - @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/badge.o.d - @${RM} ${OBJECTDIR}/src/badge.o - @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/vt100.o.d + @${RM} ${OBJECTDIR}/src/vt100.o + @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) else ${OBJECTDIR}/src/basic/tokenizer.o: src/basic/tokenizer.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/tokenizer.o.d @${RM} ${OBJECTDIR}/src/basic/tokenizer.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/tokenizer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/tokenizer.o.d" -o ${OBJECTDIR}/src/basic/tokenizer.o src/basic/tokenizer.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/basic/ubasic.o: src/basic/ubasic.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/basic" @${RM} ${OBJECTDIR}/src/basic/ubasic.o.d @${RM} ${OBJECTDIR}/src/basic/ubasic.o - @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/basic/ubasic.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/basic/ubasic.o.d" -o ${OBJECTDIR}/src/basic/ubasic.o src/basic/ubasic.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d - @${RM} ${OBJECTDIR}/src/Z80/hwz.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim2.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d - @${RM} ${OBJECTDIR}/src/Z80/iosim.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim4.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim1.o: src/Z80/sim1.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim1.o.d @${RM} ${OBJECTDIR}/src/Z80/sim1.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/Z80/sim2.o: src/Z80/sim2.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim2.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim2.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim2.o.d" -o ${OBJECTDIR}/src/Z80/sim2.o src/Z80/sim2.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim1.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim1.o.d" -o ${OBJECTDIR}/src/Z80/sim1.o src/Z80/sim1.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim3.o: src/Z80/sim3.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim3.o.d @${RM} ${OBJECTDIR}/src/Z80/sim3.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim3.o.d" -o ${OBJECTDIR}/src/Z80/sim3.o src/Z80/sim3.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/Z80/sim4.o: src/Z80/sim4.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/Z80/iosim.o: src/Z80/iosim.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim4.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim4.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim4.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim4.o.d" -o ${OBJECTDIR}/src/Z80/sim4.o src/Z80/sim4.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/Z80/iosim.o.d + @${RM} ${OBJECTDIR}/src/Z80/iosim.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/iosim.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/iosim.o.d" -o ${OBJECTDIR}/src/Z80/iosim.o src/Z80/iosim.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim5.o: src/Z80/sim5.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim5.o.d @${RM} ${OBJECTDIR}/src/Z80/sim5.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src/Z80" - @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d - @${RM} ${OBJECTDIR}/src/Z80/sim6.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim5.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim5.o.d" -o ${OBJECTDIR}/src/Z80/sim5.o src/Z80/sim5.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/sim7.o: src/Z80/sim7.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/sim7.o.d @${RM} ${OBJECTDIR}/src/Z80/sim7.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim7.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim7.o.d" -o ${OBJECTDIR}/src/Z80/sim7.o src/Z80/sim7.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/simfun.o: src/Z80/simfun.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simfun.o.d @${RM} ${OBJECTDIR}/src/Z80/simfun.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simfun.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simfun.o.d" -o ${OBJECTDIR}/src/Z80/simfun.o src/Z80/simfun.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/Z80/hwz.o: src/Z80/hwz.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src/Z80" + @${RM} ${OBJECTDIR}/src/Z80/hwz.o.d + @${RM} ${OBJECTDIR}/src/Z80/hwz.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/hwz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/hwz.o.d" -o ${OBJECTDIR}/src/Z80/hwz.o src/Z80/hwz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/Z80/simglb.o: src/Z80/simglb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src/Z80" @${RM} ${OBJECTDIR}/src/Z80/simglb.o.d @${RM} ${OBJECTDIR}/src/Z80/simglb.o - @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/Z80/simglb.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/simglb.o.d" -o ${OBJECTDIR}/src/Z80/simglb.o src/Z80/simglb.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/Z80/sim6.o: src/Z80/sim6.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src/Z80" + @${RM} ${OBJECTDIR}/src/Z80/sim6.o.d + @${RM} ${OBJECTDIR}/src/Z80/sim6.o + @${FIXDEPS} "${OBJECTDIR}/src/Z80/sim6.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/Z80/sim6.o.d" -o ${OBJECTDIR}/src/Z80/sim6.o src/Z80/sim6.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/badge.o.d + @${RM} ${OBJECTDIR}/src/badge.o + @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/box_game.o.d + @${RM} ${OBJECTDIR}/src/box_game.o + @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/disp.o: src/disp.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/disp.o.d @${RM} ${OBJECTDIR}/src/disp.o - @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/disp.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/disp.o.d" -o ${OBJECTDIR}/src/disp.o src/disp.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/hw.o: src/hw.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/hw.o.d @${RM} ${OBJECTDIR}/src/hw.o - @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/hw.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/hw.o.d" -o ${OBJECTDIR}/src/hw.o src/hw.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/images.o: src/images.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/images.o.d @${RM} ${OBJECTDIR}/src/images.o - @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/vt100.o.d - @${RM} ${OBJECTDIR}/src/vt100.o - @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/images.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/images.o.d" -o ${OBJECTDIR}/src/images.o src/images.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/main.o: src/main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/main.o.d @${RM} ${OBJECTDIR}/src/main.o - @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/main.o.d" -o ${OBJECTDIR}/src/main.o src/main.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/post.o.d + @${RM} ${OBJECTDIR}/src/post.o + @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) + +${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}/src" + @${RM} ${OBJECTDIR}/src/snake.o.d + @${RM} ${OBJECTDIR}/src/snake.o + @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/splash.o: src/splash.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/splash.o.d @${RM} ${OBJECTDIR}/src/splash.o - @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/splash.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/splash.o.d" -o ${OBJECTDIR}/src/splash.o src/splash.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/tetrapuzz.o: src/tetrapuzz.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tetrapuzz.o.d @${RM} ${OBJECTDIR}/src/tetrapuzz.o - @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/box_game.o: src/box_game.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/box_game.o.d - @${RM} ${OBJECTDIR}/src/box_game.o - @${FIXDEPS} "${OBJECTDIR}/src/box_game.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/box_game.o.d" -o ${OBJECTDIR}/src/box_game.o src/box_game.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tetrapuzz.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tetrapuzz.o.d" -o ${OBJECTDIR}/src/tetrapuzz.o src/tetrapuzz.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/tune_player.o: src/tune_player.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/tune_player.o.d @${RM} ${OBJECTDIR}/src/tune_player.o - @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/post.o: src/post.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/post.o.d - @${RM} ${OBJECTDIR}/src/post.o - @${FIXDEPS} "${OBJECTDIR}/src/post.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/post.o.d" -o ${OBJECTDIR}/src/post.o src/post.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt - -${OBJECTDIR}/src/snake.o: src/snake.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/snake.o.d - @${RM} ${OBJECTDIR}/src/snake.o - @${FIXDEPS} "${OBJECTDIR}/src/snake.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/snake.o.d" -o ${OBJECTDIR}/src/snake.o src/snake.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/tune_player.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/tune_player.o.d" -o ${OBJECTDIR}/src/tune_player.o src/tune_player.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) ${OBJECTDIR}/src/user_program.o: src/user_program.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" @${RM} ${OBJECTDIR}/src/user_program.o.d @${RM} ${OBJECTDIR}/src/user_program.o - @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${FIXDEPS} "${OBJECTDIR}/src/user_program.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/user_program.o.d" -o ${OBJECTDIR}/src/user_program.o src/user_program.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -${OBJECTDIR}/src/badge.o: src/badge.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/src/vt100.o: src/vt100.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/src" - @${RM} ${OBJECTDIR}/src/badge.o.d - @${RM} ${OBJECTDIR}/src/badge.o - @${FIXDEPS} "${OBJECTDIR}/src/badge.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/badge.o.d" -o ${OBJECTDIR}/src/badge.o src/badge.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -specs=src/opts.txt + @${RM} ${OBJECTDIR}/src/vt100.o.d + @${RM} ${OBJECTDIR}/src/vt100.o + @${FIXDEPS} "${OBJECTDIR}/src/vt100.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -O1 -funroll-loops -D_SUPPRESS_PLIB_WARNING -MMD -MF "${OBJECTDIR}/src/vt100.o.d" -o ${OBJECTDIR}/src/vt100.o src/vt100.c -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) endif @@ -430,15 +430,15 @@ endif # ------------------------------------------------------------------------------------ # Rules for buildStep: link ifeq ($(TYPE_IMAGE), DEBUG_RUN) -dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_CC} $(MP_EXTRA_LD_PRE) -g -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC0275F -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D=__DEBUG_D,--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml + ${MP_CC} $(MP_EXTRA_LD_PRE) -g -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC0275F -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D=__DEBUG_D,--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml else -dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} - ${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc -specs=src/opts.txt $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml - ${MP_CC_DIR}/xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} + ${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=128,--defsym=_min_stack_size=128,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml + ${MP_CC_DIR}/xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} endif diff --git a/firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties b/firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties index 2258424..5c0faf9 100644 --- a/firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties +++ b/firmware/badge-supercon18.X/nbproject/Makefile-genesis.properties @@ -1,8 +1,8 @@ # -#Sat Oct 13 11:38:12 CDT 2018 +#Sat Oct 13 12:18:38 CDT 2018 default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=f03d7c843128b5e50a1f7aa63f2ccfb5 default.languagetoolchain.dir=/opt/microchip/xc32/v2.10/bin -configurations-xml=8ae6666b8b7748b6dfe9d4817bb31c4a +configurations-xml=573a35f1333edb10280acb0de2601fb7 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=ddd77f39013c5d7ceec7afa039614a52 default.languagetoolchain.version=2.10 host.platform=linux diff --git a/firmware/badge-supercon18.X/nbproject/Makefile-impl.mk b/firmware/badge-supercon18.X/nbproject/Makefile-impl.mk index 582d2ad..ba25003 100644 --- a/firmware/badge-supercon18.X/nbproject/Makefile-impl.mk +++ b/firmware/badge-supercon18.X/nbproject/Makefile-impl.mk @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} # Project Name -PROJECTNAME=badge1.X +PROJECTNAME=badge-supercon18.X # Active Configuration DEFAULTCONF=default diff --git a/firmware/badge-supercon18.X/nbproject/Makefile-variables.mk b/firmware/badge-supercon18.X/nbproject/Makefile-variables.mk index 7d28749..86473c2 100644 --- a/firmware/badge-supercon18.X/nbproject/Makefile-variables.mk +++ b/firmware/badge-supercon18.X/nbproject/Makefile-variables.mk @@ -6,8 +6,8 @@ CND_BASEDIR=`pwd` # default configuration CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=badge1.X.production.hex -CND_ARTIFACT_PATH_default=dist/default/production/badge1.X.production.hex +CND_ARTIFACT_NAME_default=badge-supercon18.X.production.hex +CND_ARTIFACT_PATH_default=dist/default/production/badge-supercon18.X.production.hex CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package -CND_PACKAGE_NAME_default=badge1.x.tar -CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/badge1.x.tar +CND_PACKAGE_NAME_default=badge-supercon18.x.tar +CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/badge-supercon18.x.tar diff --git a/firmware/badge-supercon18.X/nbproject/Package-default.bash b/firmware/badge-supercon18.X/nbproject/Package-default.bash index 4576bf6..fed3e75 100644 --- a/firmware/badge-supercon18.X/nbproject/Package-default.bash +++ b/firmware/badge-supercon18.X/nbproject/Package-default.bash @@ -10,9 +10,9 @@ CND_CONF=default CND_DISTDIR=dist TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging TMPDIRNAME=tmp-packaging -OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -OUTPUT_BASENAME=badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -PACKAGE_TOP_DIR=badge1.x/ +OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +OUTPUT_BASENAME=badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +PACKAGE_TOP_DIR=badge-supercon18.x/ # Functions function checkReturnCode @@ -57,15 +57,15 @@ mkdir -p ${TMPDIR} # Copy files and create directories and links cd "${TOP}" -makeDirectory ${TMPDIR}/badge1.x/bin +makeDirectory ${TMPDIR}/badge-supercon18.x/bin copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755 # Generate tar file cd "${TOP}" -rm -f ${CND_DISTDIR}/${CND_CONF}/package/badge1.x.tar +rm -f ${CND_DISTDIR}/${CND_CONF}/package/badge-supercon18.x.tar cd ${TMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/badge1.x.tar * +tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/badge-supercon18.x.tar * checkReturnCode # Cleanup diff --git a/firmware/badge-supercon18.X/nbproject/configurations.xml b/firmware/badge-supercon18.X/nbproject/configurations.xml index 8f94089..2008b5a 100644 --- a/firmware/badge-supercon18.X/nbproject/configurations.xml +++ b/firmware/badge-supercon18.X/nbproject/configurations.xml @@ -4,26 +4,29 @@ - + src/basic/tokenizer.h src/basic/ubasic.h - - src/Z80/fdefs.h + src/Z80/hwz.h src/Z80/sim.h src/Z80/simglb.h + src/Z80/fdefs.h + src/badge.h + src/badge_settings.h + src/badge_user.h + src/box_game.h src/disp.h src/hw.h - src/vt100.h + src/post.h + src/snake.h src/splash.h + src/tetrapuzz.h src/tune_player.h - src/post.h - src/badge_settings.h - src/badge.h src/user_program.h - src/badge_user.h + src/vt100.h - + src/basic/tokenizer.c src/basic/ubasic.c - - src/Z80/hwz.c - src/Z80/iosim.c - src/Z80/sim1.c + src/Z80/sim2.c - src/Z80/sim3.c src/Z80/sim4.c + src/Z80/sim1.c + src/Z80/sim3.c + src/Z80/iosim.c src/Z80/sim5.c - src/Z80/sim6.c src/Z80/sim7.c src/Z80/simfun.c + src/Z80/hwz.c src/Z80/simglb.c + src/Z80/sim6.c + src/badge.c + src/box_game.c src/disp.c src/hw.c src/images.c - src/vt100.c src/main.c + src/post.c + src/snake.c src/splash.c src/tetrapuzz.c - src/box_game.c src/tune_player.c - src/post.c - src/snake.c src/user_program.c - src/badge.c + src/vt100.c - . - ../cpmsrc + src + ../cmpsrc Makefile @@ -98,7 +101,7 @@ false - false + true @@ -241,553 +244,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties b/firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties deleted file mode 100644 index c0f7321..0000000 --- a/firmware/badge-supercon18.X/nbproject/private/SuppressibleMessageMemo.properties +++ /dev/null @@ -1,3 +0,0 @@ -# -#Thu May 10 22:49:41 CEST 2018 -realice/DEVID_MISMATCH=true diff --git a/firmware/badge-supercon18.X/nbproject/private/private.xml b/firmware/badge-supercon18.X/nbproject/private/private.xml index 2c864c0..7824af8 100644 --- a/firmware/badge-supercon18.X/nbproject/private/private.xml +++ b/firmware/badge-supercon18.X/nbproject/private/private.xml @@ -3,17 +3,7 @@ - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.h - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/main.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/disp.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/user_program.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.h - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/Z80/hwz.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/basic/ubasic.c - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge_settings.h - file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge.c + file:/home/mike/MPLABXProjects/badge-supercon18.X/src/splash.c diff --git a/firmware/badge-supercon18.X/nbproject/project.xml b/firmware/badge-supercon18.X/nbproject/project.xml index 3332b80..d639a8e 100644 --- a/firmware/badge-supercon18.X/nbproject/project.xml +++ b/firmware/badge-supercon18.X/nbproject/project.xml @@ -3,8 +3,8 @@ com.microchip.mplab.nbide.embedded.makeproject - badge1 - 4c890340-e8fa-4dd9-8ce3-1d80c8c40d12 + badge-supercon18 + 42cab5b4-899a-4f1d-b033-b73f79c2bbdb 0 c