Clean up example files

Will still need to find a good method to just clear the screen

Author: mateoconlechuga

examples/debugging/src/main.c

@@ -26,14 +26,10 @@ void main(void) {
     /* Remove the watchpoint that we had set */
     dbg_RemoveWatchpoint(&dbg_test_var_1);
     dbg_RemoveWatchpoint(&dbg_test_var_2);
-    
-    /* Clean up everything */
-    prgm_CleanUp();
 
     /* Set this value to zero */
     dbg_test_var_2 = 0;
 
     /* Fail this assertion */
     assert(dbg_test_var_2);
 }
-

examples/fileio_detect/src/main.c

@@ -25,22 +25,20 @@ void main(void) {
     const char search_string[] = { 0xFD, 0x21, 0x80, 0x00 };
 
     /* Find all of the variables that start with this string */
-    while((var_name = ti_Detect(&search_pos, search_string)) != NULL) {
+    while ((var_name = ti_Detect(&search_pos, search_string)) != NULL) {
         /* Print the name of the variable (Should be LibLoad) */
         printText(0, y++, var_name);
     }
 
     /* Wait for a key */
-    while(!os_GetCSC());
+    while (!os_GetCSC());
 
-    /* Clean up everything */
+    /* Close all open files */
     ti_CloseAll();
-    prgm_CleanUp();
 }
 
 /* Draw text on the homescreen at the given X/Y location */
 void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
-

examples/fileio_factorize/src/main.c

@@ -1,16 +1,12 @@
-/* Keep these headers */
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tice.h>
- 
-/* Standard headers - it's recommended to leave them included */
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
-/* Shared library headers - depends on which ones you wish to use */
 #include <fileioc.h>
 
 void prime_factors(unsigned int n);
@@ -27,22 +23,23 @@ void main(void) {
     int in;
 
     /* Get the answer variable */
-    if(ti_RclVar(TI_REAL_TYPE, ti_Ans, &real_in)) return;    
-    if((in = os_RealToInt24(real_in)) < 1) return;
+    if (ti_RclVar(TI_REAL_TYPE, ti_Ans, &real_in)) return;    
+    if ((in = os_RealToInt24(real_in)) < 1) return;
 
+    /* Get the prime factors of the input */
     prime_factors((unsigned)in);
 
-    if(!total_primes) return;
+    /* Create a list to store the primes */
+    if (!total_primes) return;
     list_out = ti_MallocList(total_primes);
 
-    for(i=0; i<total_primes; i++) {
+    /* Write out the list of primes */
+    for (i=0; i<total_primes; i++) {
         list_out->items[i] = os_Int24ToReal(primes[i]);
     }
 
+    /* Set the new answer */
     ti_SetVar(TI_REAL_LIST_TYPE, ti_Ans, list_out);
-    
-    /* Clean up everything */
-    prgm_CleanUp();
 }
 
 /* Store to an array all the prime numbers */
@@ -54,9 +51,7 @@ void prime_factors(unsigned int n) {
         n /= 2;
     }
 
-    if (n == 1) {
-        return;
-    }
+    if (n == 1) return;
 
     div = 3;
     end = sqrt(n);
@@ -67,9 +62,7 @@ void prime_factors(unsigned int n) {
                 primes[total_primes++] = div;
                 n /= div;
             } while (!(n % div));
-            if (n == 1) {
-                return;
-            }
+            if (n == 1) return;
             end = sqrt(n);
         }
         div += 2;

examples/fileio_os_vars/src/main.c

@@ -1,16 +1,13 @@
-/* Keep these headers */
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tice.h>
- 
-/* Standard headers - it's recommended to leave them included */
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-/* Shared library headers - depends on which ones you wish to use */
 #include <fileioc.h>
 
 /* Some function prototypes. Maybe in the future these functions will become a library */
@@ -61,9 +58,6 @@ void main(void) {
     matrix_element(my_matrix, 0, 1) = real_2_5;
     ti_SetVar(TI_MATRIX_TYPE, ti_Ans, my_matrix);
     free(my_matrix);
-
-    /* Clean up everything */
-    prgm_CleanUp();
 }
 
 /* Stores some ints to a complex variable type */
@@ -104,4 +98,4 @@ cplx_t StrsToCplx(char *real, char **real_end, char *imag, char **imag_end) {
     res.imag = os_StrToReal(imag, imag_end);
     res.imag.sign |= TI_CPLX_TYPE;
     return res;
-}
+}

examples/fileio_read_write/src/main.c

@@ -64,16 +64,15 @@ void main(void) {
     printText(0, 0, "An error occured");
 noerr:
 
-    /* Get the scan codes */
-    while(!os_GetCSC());
+    /* Pause */
+    while (!os_GetCSC());
 
+    /* Close all open files */
     ti_CloseAll();
-    prgm_CleanUp();
 }
 
 /* Draw text on the homescreen at the given X/Y location */
 void printText(int8_t xpos, int8_t ypos, const char *text) {
     os_SetCursorPos(ypos, xpos);
     os_PutStrFull(text);
 }
-

examples/fileio_tokens/src/main.c

@@ -1,49 +1,44 @@
-/* Keep these headers */
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tice.h>
- 
-/* Standard headers - it's recommended to leave them included */
-#include <math.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-/* Shared library headers -- depends on which ones you wish to use */
 #include <fileioc.h>
 
-/* Declare some strings and variables */
-const char prgmName[] = "ABC";
+/* Declare the program name */
+const char *prgmName = "ABC";
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
 
 /* Main Function */
 void main(void) {
-    ti_var_t myProgram;
+    ti_var_t prgm;
     uint8_t *data_ptr;
-    uint8_t token_length;
 
     /* Close any files that may be open already */
     ti_CloseAll();
 
-    /* Open a new variable; deleting it if it already exists */
-    myProgram = ti_OpenVar(prgmName,"r",ti_Program);
+    /* Open the program for reading */
+    prgm = ti_OpenVar(prgmName, "r", TI_PRGM_TYPE);
 
     /* Make sure we opened okay */
-    if (!myProgram) goto err;
+    if (!prgm) goto err;
 
-    data_ptr = ti_GetDataPtr( myProgram );
-    printText( 0, 0, ti_GetTokenString( &data_ptr, NULL, NULL ) );
-    printText( 0, 1, ti_GetTokenString( &data_ptr, NULL, NULL ) );
+    data_ptr = ti_GetDataPtr(prgm);
+    printText(0, 0, ti_GetTokenString(&data_ptr, NULL, NULL));
+    printText(0, 1, ti_GetTokenString(&data_ptr, NULL, NULL));
 
 err:    
-    /* Wait for a key */
-    while( !os_GetCSC() );
+    /* Pause */
+    while (!os_GetCSC());
 
+    /* Close files */
     ti_CloseAll();
-    prgm_CleanUp();
 }
 
 /* Draw text on the homescreen at the given X/Y location */

examples/gfx_buffered_cube/src/main.c

@@ -1,22 +1,19 @@
-/* Keep these headers */
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tice.h>
 
-/* Standard headers - it's recommended to leave them included */
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-/* Shared libraries */
 #include <graphx.h>
 
-/* Put function prototypes here */
+/* Function prototypes */
 void rotate(void);
 
-/* Put globals here */
+/* Globals */
 #define ORG (-50)
 #define DEG (6.0)
 #define ANG (DEG * M_PI / 180.0)
@@ -47,10 +44,10 @@ float midx1,
       midx2,
       midy2;
 
-uint8_t loop;
-
 /* Place main code in main */
 void main(void) {
+    uint8_t loop = 0;
+
     /* Seed the random numbers */
     srand(rtc_Time());
 
@@ -70,8 +67,8 @@ void main(void) {
     while (!os_GetCSC()) {
 
         /* Change the color of the cube depending on loop (mod 16) */
-        if (!((loop++) & 0xF)) {
-            gfx_SetColor(rand() & 0xFE);
+        if (!((loop++) & 0xf)) {
+            gfx_SetColor(rand() & 0xfe);
         }
 
         /* Call the rotation code */
@@ -81,9 +78,8 @@ void main(void) {
         gfx_SwapDraw();
     }
 
-    /* Clean up the program */
+    /* End the graphics */
     gfx_End();
-    prgm_CleanUp();
 }
 
 /* Rotation code */
@@ -115,4 +111,4 @@ void rotate(void) {
         gfx_Line(face2[i][0], face2[i][1], face2[i+1][0], face2[i+1][1]);
         gfx_Line(face1[i][0], face1[i][1], face2[ i ][0], face2[ i ][1]);
     }
-}
+}

examples/gfx_buffering/src/main.c

@@ -1,57 +1,47 @@
-/* Keep these headers */
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tice.h>
 
-/* Standard headers - it's recommended to leave them included */
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-/* Shared libraries */
 #include <graphx.h>
 
-/*
- * This tutorial is meant to be played around with to get a feeling for how buffering works
- */
- 
-/* Put function prototypes here */
- 
-/* Put all your code here */
+/* This tutorial is meant to be played around with to get a feeling for how buffering works */
 void main(void) {
     /* Initialize the 8bpp graphics */
-    gfx_Begin( gfx_8bpp );
+    gfx_Begin(gfx_8bpp);
 
     /* Set up the palette */
-    gfx_SetColor( gfx_black );
+    gfx_SetColor(gfx_black);
 
     /* Draw to buffer to avoid tearing */
     gfx_SetDrawBuffer();
 
     /* Draw a line on the buffer */
-    //gfx_FillScreen( gfx_black );
-    gfx_Line( 0, 0, LCD_WIDTH-1, LCD_HEIGHT-1 );
+    //gfx_FillScreen(gfx_black);
+    gfx_Line(0, 0, LCD_WIDTH-1, LCD_HEIGHT-1);
 
     /* Wait for a key */
-    while( !os_GetCSC() ); 
+    while (!os_GetCSC()); 
 
     /* Swap the buffer with the screen */
     gfx_SwapDraw();
 
     /* Copy part of the screen to the offscreen buffer */
-    gfx_Blit( gfx_buffer );
-    //gfx_BlitLines( gfx_buffer, 0, 20 );
-    //gfx_BlitRectangle( gfx_buffer, 0, 0, 160, 120 );
+    gfx_Blit(gfx_buffer);
+    //gfx_BlitLines(gfx_buffer, 0, 20);
+    //gfx_BlitRectangle(gfx_buffer, 0, 0, 160, 120);
 
     /* This should cause half of the line to flicker, and the other half to stay steady */
 
-    while( !os_GetCSC() ) {
+    while (!os_GetCSC()) {
         gfx_SwapDraw();
     }
 
-    /* Close the graphics and return to the OS */
+    /* Close the graphics */
     gfx_End();
-    prgm_CleanUp();
 }