Fix build

mateoconlechuga · mateoconlechuga · commit 61ba572aad6e · 2017-04-30T06:16:03.000-07:00
diff --git a/examples/debugging/src/main.c b/examples/debugging/src/main.c
@@ -33,3 +33,4 @@ void main(void) {
     /* Fail this assertion */
     assert(dbg_test_var_2);
 }
+
diff --git a/examples/fileio_detect/autotester.json b/examples/fileio_detect/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/fileio_detect/src/main.c b/examples/fileio_detect/src/main.c
@@ -42,3 +42,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
+
diff --git a/examples/fileio_factorize/autotester.json b/examples/fileio_factorize/autotester.json
@@ -34,3 +34,4 @@
     }
   }
 }
+
diff --git a/examples/fileio_factorize/src/main.c b/examples/fileio_factorize/src/main.c
@@ -70,3 +70,4 @@ void prime_factors(unsigned int n) {
     
     primes[total_primes++] = n;
 }
+
diff --git a/examples/fileio_os_vars/autotester.json b/examples/fileio_os_vars/autotester.json
@@ -62,3 +62,4 @@
     }
   }
 }
+
diff --git a/examples/fileio_os_vars/src/main.c b/examples/fileio_os_vars/src/main.c
@@ -99,3 +99,4 @@ cplx_t StrsToCplx(char *real, char **real_end, char *imag, char **imag_end) {
     res.imag.sign |= TI_CPLX_TYPE;
     return res;
 }
+
diff --git a/examples/fileio_read_write/autotester.json b/examples/fileio_read_write/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/fileio_read_write/src/main.c b/examples/fileio_read_write/src/main.c
@@ -76,3 +76,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
+
diff --git a/examples/fileio_tokens/autotester.json b/examples/fileio_tokens/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/fileio_tokens/src/main.c b/examples/fileio_tokens/src/main.c
@@ -46,3 +46,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
+
diff --git a/examples/gfx_buffered_cube/autotester.json b/examples/gfx_buffered_cube/autotester.json
@@ -37,3 +37,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_buffered_cube/src/main.c b/examples/gfx_buffered_cube/src/main.c
@@ -112,3 +112,4 @@ void rotate(void) {
         gfx_Line(face1[i][0], face1[i][1], face2[ i ][0], face2[ i ][1]);
     }
 }
+
diff --git a/examples/gfx_buffering/autotester.json b/examples/gfx_buffering/autotester.json
@@ -31,3 +31,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_buffering/src/main.c b/examples/gfx_buffering/src/main.c
@@ -45,3 +45,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_char/autotester.json b/examples/gfx_char/autotester.json
@@ -29,4 +29,5 @@
       "expected_CRCs": [ "FFAF89BA", "101734A5", "9DA19F44" ]
     }
   }
-}
+}
+
diff --git a/examples/gfx_char/src/main.c b/examples/gfx_char/src/main.c
@@ -50,3 +50,4 @@ void printu(char *str, int x, int y) {
         x += gfx_GetCharWidth(*str++);
     }
 }
+
diff --git a/examples/gfx_clipping/autotester.json b/examples/gfx_clipping/autotester.json
@@ -49,3 +49,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_clipping/src/main.c b/examples/gfx_clipping/src/main.c
@@ -82,3 +82,4 @@ void main(void) {
     /* Usual cleanup */
     gfx_End();
 }
+
diff --git a/examples/gfx_floodfill/autotester.json b/examples/gfx_floodfill/autotester.json
@@ -33,3 +33,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_floodfill/src/main.c b/examples/gfx_floodfill/src/main.c
@@ -48,3 +48,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_hello_world/autotester.json b/examples/gfx_hello_world/autotester.json
@@ -37,3 +37,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_hello_world/src/main.c b/examples/gfx_hello_world/src/main.c
@@ -44,3 +44,4 @@ void main(void) {
 void print_string_centered(const char *str) {
     gfx_PrintStringXY(str, (LCD_WIDTH-gfx_GetStringWidth(str)) / 2, (LCD_HEIGHT-FONT_HEIGHT) / 2);
 }
+
diff --git a/examples/gfx_light_dark/autotester.json b/examples/gfx_light_dark/autotester.json
@@ -60,3 +60,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_light_dark/src/main.c b/examples/gfx_light_dark/src/main.c
@@ -57,3 +57,4 @@ void main(void) {
     /* Usual cleanup */
     gfx_End();
 }
+
diff --git a/examples/gfx_shapes_shift/autotester.json b/examples/gfx_shapes_shift/autotester.json
@@ -57,3 +57,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_shapes_shift/src/main.c b/examples/gfx_shapes_shift/src/main.c
@@ -88,3 +88,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_sprite/autotester.json b/examples/gfx_sprite/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_sprite/src/gfx/logo_gfx.c b/examples/gfx_sprite/src/gfx/logo_gfx.c
@@ -194,3 +194,4 @@ uint16_t logo_gfx_pal[190] = {
  0xFF32,  // 188 :: rgba(253,207,151,255)
  0xFFFF,  // 189 :: rgba(255,255,255,255)
 };
+
diff --git a/examples/gfx_sprite/src/gfx/logo_gfx.h b/examples/gfx_sprite/src/gfx/logo_gfx.h
@@ -11,3 +11,4 @@ extern uint8_t ubuntu_data[1026];
 extern uint16_t logo_gfx_pal[190];
 
 #endif
+
diff --git a/examples/gfx_sprite/src/gfx/ubuntu.c b/examples/gfx_sprite/src/gfx/ubuntu.c
@@ -38,3 +38,4 @@ uint8_t ubuntu_data[1026] = {
  0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,
  0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,
 };
+
diff --git a/examples/gfx_sprite/src/main.c b/examples/gfx_sprite/src/main.c
@@ -37,3 +37,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_sprite_compress/autotester.json b/examples/gfx_sprite_compress/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_sprite_compress/src/gfx/all_gfx.c b/examples/gfx_sprite_compress/src/gfx/all_gfx.c
@@ -260,3 +260,4 @@ uint16_t all_gfx_pal[256] = {
  0x5622,  // 254 :: rgba(170,139,16,255)
  0xD66D,  // 255 :: rgba(176,157,106,255)
 };
+
diff --git a/examples/gfx_sprite_compress/src/gfx/all_gfx.h b/examples/gfx_sprite_compress/src/gfx/all_gfx.h
@@ -8,3 +8,4 @@ extern uint8_t apple_compressed[20881];
 extern uint16_t all_gfx_pal[256];
 
 #endif
+
diff --git a/examples/gfx_sprite_compress/src/gfx/apple.c b/examples/gfx_sprite_compress/src/gfx/apple.c
@@ -657,3 +657,4 @@ uint8_t apple_compressed[20881] = {
  0x02,0xDB,0x74,0x35,0x67,0xD3,0x00,0xC7,0x46,0xC7,0x66,0xC3,0x10,0xB1,0x7E,0x30,0x0B,0x5E,0x97,0x10,0xFC,0x5F,0x05,0xDC,0x00,0x03,0xA6,0xDB,0x13,0xC0,0x00,0x69,
  0x84,0xD3,0x03,0x7E,0xDB,0x13,0xC0,0x00,0x69,0x84,0xD3,0x06,0x18,0xDB,0x40,0x00,0x20,
 };
+
diff --git a/examples/gfx_sprite_compress/src/main.c b/examples/gfx_sprite_compress/src/main.c
@@ -46,3 +46,4 @@ void main(void) {
     
     gfx_End();
 }
+
diff --git a/examples/gfx_sprite_rotate/autotester.json b/examples/gfx_sprite_rotate/autotester.json
@@ -30,3 +30,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_sprite_rotate/src/gfx/logo_gfx.c b/examples/gfx_sprite_rotate/src/gfx/logo_gfx.c
@@ -194,3 +194,4 @@ uint16_t logo_gfx_pal[190] = {
  0x7AF3,  // 188 :: rgba(250,186,160,255)
  0x7B38,  // 189 :: rgba(246,201,201,255)
 };
+
diff --git a/examples/gfx_sprite_rotate/src/gfx/logo_gfx.h b/examples/gfx_sprite_rotate/src/gfx/logo_gfx.h
@@ -9,3 +9,4 @@ extern uint8_t ubuntu_data[1026];
 extern uint16_t logo_gfx_pal[190];
 
 #endif
+
diff --git a/examples/gfx_sprite_rotate/src/gfx/ubuntu.c b/examples/gfx_sprite_rotate/src/gfx/ubuntu.c
@@ -38,3 +38,4 @@ uint8_t ubuntu_data[1026] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 };
+
diff --git a/examples/gfx_sprite_rotate/src/main.c b/examples/gfx_sprite_rotate/src/main.c
@@ -39,3 +39,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_tilemap/autotester.json b/examples/gfx_tilemap/autotester.json
@@ -43,3 +43,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_tilemap/src/gfx/tiles_gfx.c b/examples/gfx_tilemap/src/gfx/tiles_gfx.c
@@ -80,3 +80,4 @@ uint16_t tiles_gfx_pal[76] = {
  0xC76C,  // 74 :: rgba(142,221,101,255)
  0x318F,  // 75 :: rgba(99,96,123,255)
 };
+
diff --git a/examples/gfx_tilemap/src/gfx/tiles_gfx.h b/examples/gfx_tilemap/src/gfx/tiles_gfx.h
@@ -267,3 +267,4 @@ extern uint8_t *tileset_tiles_data[128];
 extern uint16_t tiles_gfx_pal[76];
 
 #endif
+
diff --git a/examples/gfx_tilemap/src/gfx/tileset.c b/examples/gfx_tilemap/src/gfx/tileset.c
@@ -2820,3 +2820,4 @@ uint8_t *tileset_tiles_data[128] = {
  tileset_tile_126_data,
  tileset_tile_127_data,
 };
+
diff --git a/examples/gfx_tilemap/src/main.c b/examples/gfx_tilemap/src/main.c
@@ -100,3 +100,4 @@ void main(void) {
     /* Close the graphics and return to the OS */
     gfx_End();
 }
+
diff --git a/examples/gfx_tilemap/src/tilemapdata.c b/examples/gfx_tilemap/src/tilemapdata.c
@@ -28,3 +28,4 @@ uint8_t tilemap_map[] = {
 	0x30,0x44,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x43,0x32,0x04,0x05,0x20,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x43,0x32,
 	0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x42,0x14,0x15,0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x42,
 };
+
diff --git a/examples/gfx_tilemap_compress/autotester.json b/examples/gfx_tilemap_compress/autotester.json
@@ -43,3 +43,4 @@
     }
   }
 }
+
diff --git a/examples/gfx_tilemap_compress/src/gfx/tiles_gfx.c b/examples/gfx_tilemap_compress/src/gfx/tiles_gfx.c
@@ -80,3 +80,4 @@ uint16_t tiles_gfx_pal[76] = {
  0xC76C,  // 74 :: rgba(142,221,101,255)
  0x318F,  // 75 :: rgba(99,96,123,255)
 };
+
diff --git a/examples/gfx_tilemap_compress/src/gfx/tiles_gfx.h b/examples/gfx_tilemap_compress/src/gfx/tiles_gfx.h
@@ -138,3 +138,4 @@ extern uint8_t *tileset_tiles_compressed[128];
 extern uint16_t tiles_gfx_pal[76];
 
 #endif
+
diff --git a/examples/gfx_tilemap_compress/src/gfx/tileset.c b/examples/gfx_tilemap_compress/src/gfx/tileset.c
@@ -852,3 +852,4 @@ uint8_t *tileset_tiles_compressed[128] = {
  tileset_tile_126_compressed,
  tileset_tile_127_compressed,
 };
+
diff --git a/examples/gfx_tilemap_compress/src/main.c b/examples/gfx_tilemap_compress/src/main.c
@@ -117,3 +117,4 @@ void main(void) {
     /* Close the graphics */
     gfx_End();
 }
+
diff --git a/examples/gfx_tilemap_compress/src/tilemapdata.c b/examples/gfx_tilemap_compress/src/tilemapdata.c
@@ -28,3 +28,4 @@ uint8_t tilemap_map[] = {
 	0x30,0x44,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x43,0x32,0x04,0x05,0x20,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x43,0x32,
 	0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x42,0x14,0x15,0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x42,
 };
+
diff --git a/examples/hello_world/src/main.c b/examples/hello_world/src/main.c
@@ -42,3 +42,4 @@ void printText(const char *text, uint8_t xpos, uint8_t ypos) {
 void printTextSmall(const char *text, uint8_t xpos, uint8_t ypos) {
     os_FontDrawText(text, xpos, ypos);
 }
+
diff --git a/examples/interrupt_counter/src/main.c b/examples/interrupt_counter/src/main.c
@@ -66,3 +66,4 @@ void interrupt isr_timer1(void) {
     /* Must acknowledge that the interrupt occured to clear the flag */
     int_Acknowledge = INT_TIMER1;
 }
+
diff --git a/examples/interrupt_on/src/main.c b/examples/interrupt_on/src/main.c
@@ -48,3 +48,4 @@ void interrupt isr_on(void) {
     /* Must acknowledge that the interrupt occured to clear the flag */
     int_Acknowledge = INT_ON;
 }
+
diff --git a/examples/keypad_arrows/autotester.json b/examples/keypad_arrows/autotester.json
@@ -58,3 +58,4 @@
     }
   }
 }
+
diff --git a/examples/keypad_arrows/src/main.c b/examples/keypad_arrows/src/main.c
@@ -26,16 +26,16 @@ void main(void) {
         
         switch (key) {
             case kb_Down:           /* Change screen color to black */
-                fillScreen(0x00);
+                fill_screen(0x00);
                 break;
             case kb_Right:          /* Change screen color to red */
-                fillScreen(0xE0);
+                fill_screen(0xE0);
                 break;
             case kb_Up:             /* Change screen color to white */
-                fillScreen(0xFF);
+                fill_screen(0xFF);
                 break;
             case kb_Left:           /* Change screen color to a different red */
-                fillScreen(0xC0);
+                fill_screen(0xC0);
                 break;
             default:
                 break;
@@ -47,3 +47,4 @@ void main(void) {
 void fill_screen(uint8_t color) {
     memset_fast(lcd_Ram, color, LCD_SIZE);
 }
+
diff --git a/examples/keypad_interrupt/autotester.json b/examples/keypad_interrupt/autotester.json
@@ -41,3 +41,4 @@
     }
   }
 }
+
diff --git a/examples/keypad_interrupt/src/main.c b/examples/keypad_interrupt/src/main.c
@@ -66,3 +66,4 @@ void interrupt isr_keyboard(void) {
     /* Acknowledge in the keypad controller (Not technically required because interrupt controller handles signal) */
     kb_IntAcknowledge = KB_DATA_CHANGED;
 }
+
diff --git a/examples/keypad_interrupt2/autotester.json b/examples/keypad_interrupt2/autotester.json
@@ -44,3 +44,4 @@
     }
   }
 }
+
diff --git a/examples/keypad_interrupt2/src/main.c b/examples/keypad_interrupt2/src/main.c
@@ -61,3 +61,4 @@ void interrupt isr_keyboard(void) {
     /* Acknowledge in the keypad controller (This is required for mode 1) */
     kb_IntAcknowledge = KB_MODE_1_PRESS;
 }
+
diff --git a/examples/keypad_multiple_keys/autotester.json b/examples/keypad_multiple_keys/autotester.json
@@ -58,3 +58,4 @@
     }
   }
 }
+
diff --git a/examples/keypad_multiple_keys/src/main.c b/examples/keypad_multiple_keys/src/main.c
@@ -55,3 +55,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
+
diff --git a/examples/lcd_fade/src/main.c b/examples/lcd_fade/src/main.c
@@ -27,3 +27,4 @@ void main(void) {
     /* Restore the old brightness level */
     lcd_BacklightLevel = level;
 }
+
diff --git a/examples/lcd_fill/src/main.c b/examples/lcd_fill/src/main.c
@@ -12,13 +12,13 @@ void fill_screen(uint8_t color);
 
 void main(void) { 
     /* Turn the whole screen black */
-    fillScreen(0x00);
+    fill_screen(0x00);
     
     /* Wait for a key press */
     while (!os_GetCSC());
     
     /* Turn the whole screen red */
-    fillScreen(0xe0);
+    fill_screen(0xe0);
     
     /* Wait for a key press */
     while (!os_GetCSC());
@@ -29,3 +29,4 @@ void fill_screen(uint8_t color) {
     /* memset_fast is a way faster implementation of memset; either one will work here though */
     memset_fast(lcd_Ram, color, LCD_SIZE);
 }
+
diff --git a/examples/real_time_clock/src/main.c b/examples/real_time_clock/src/main.c
@@ -63,3 +63,4 @@ void interrupt isr_rtc(void) {
 void interrupt isr_on(void) {
     exit_loop = true;
 }
+
diff --git a/examples/second_counter/src/main.c b/examples/second_counter/src/main.c
@@ -38,3 +38,4 @@ void main(void) {
         }
     } while (!os_GetCSC());
 }
+
diff --git a/examples/second_counter2/src/main.c b/examples/second_counter2/src/main.c
@@ -52,3 +52,4 @@ void reset_counter(void) {
     /* Enable the timer, set it to the 32768 kHz clock, enable an interrupt once it reaches 0, and make it count down */
     timer_Control = TIMER1_ENABLE | TIMER1_32K | TIMER1_NOINT | TIMER1_UP;
 }
+
diff --git a/examples/template/src/main.c b/examples/template/src/main.c
@@ -28,3 +28,4 @@ void main(void) {
 }
 
 /* Put other functions here */
+

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ void main(void) {`
`33`	`33`	`/* Fail this assertion */`
`34`	`34`	`assert(dbg_test_var_2);`
`35`	`35`	`}`
	`36`	`+`
Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {`
`42`	`42`	`os_SetCursorPos(ypos, xpos);`
`43`	`43`	`os_PutStrFull(text);`
`44`	`44`	`}`
	`45`	`+`
Original file line number	Diff line number	Diff line change
`@@ -70,3 +70,4 @@ void prime_factors(unsigned int n) {`
`70`	`70`
`71`	`71`	`primes[total_primes++] = n;`
`72`	`72`	`}`
	`73`	`+`
Original file line number	Diff line number	Diff line change
`@@ -99,3 +99,4 @@ cplx_t StrsToCplx(char real, char real_end, char imag, char **imag_end) {`
`99`	`99`	`res.imag.sign \|= TI_CPLX_TYPE;`
`100`	`100`	`return res;`
`101`	`101`	`}`
	`102`	`+`
Original file line number	Diff line number	Diff line change
`@@ -76,3 +76,4 @@ void printText(int8_t xpos, int8_t ypos, const char *text) {`
`76`	`76`	`os_SetCursorPos(ypos, xpos);`
`77`	`77`	`os_PutStrFull(text);`
`78`	`78`	`}`
	`79`	`+`