Fix spacing and clean up examples to use more defines; user headers rebuild sources

Author: mateoconlechuga

CEdev/bin/main_makefile

@@ -229,12 +229,12 @@ $(OBJDIR)/%.obj : $(SRCDIR)/%.asm
 	@$(AS) $(ASM_FLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
 
 #These rules compile the source files into object files
-$(OBJDIR)/%.obj : $(SRCDIR)/%.c
+$(OBJDIR)/%.obj : $(SRCDIR)/%.c $(USERHEADERS)
 	@if not exist $(OBJDIR) mkdir $(OBJDIR)
 	@$(CD) $(OBJDIR) && \
 	@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))
 
-$(OBJDIR)/%.obj : $(GFXDIR)/%.c
+$(OBJDIR)/%.obj : $(GFXDIR)/%.c $(USERHEADERS)
 	@if not exist $(OBJDIR) mkdir $(OBJDIR)
 	@$(CD) $(OBJDIR) && \
 	@$(CC) $(CFLAGS) $(call WINPATH,$(addprefix $(CURDIR)/,$<))

CEdev/examples/demo_0/bin/DEMO0.8xp

@@ -11,42 +11,27 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h, intce.h
 
 /* Put function prototypes here */
 void printText(const char *text, uint8_t x, uint8_t y);
 void printTextSmall(const char *text, uint8_t xpos, uint8_t ypos);
 
-/* Initialize some strings -- It is faster to place strings as globals */
-const char HelloWorld[] = "Hello World!";
-const char Welcome[] = "Welcome to C!";
-char Apples[] = "Apples!";
-char Oranges[] = "Oranges";
+/* Initialize some strings */
+const char *HelloWorld = "Hello World!";
+const char *Welcome = "Welcome to C!";
 
 /* Put all your code here */
 void main(void) {
-    /* uint8_t is an unsigned integer that can range from 0-255. It generally performs faster than just an int, so try to use it when possible */
+    /* uint8_t is an unsigned integer that can range from 0-255. It performs faster than just an int, so try to use it (or int8_t) when possible */
     uint8_t count;
 
     /* This function cleans up the screen and gets everything ready for the OS */
     prgm_CleanUp();
 
     /* Print a few strings */
-    printText(HelloWorld, 0, 0);
-    printText(Welcome, 0, 1);
-    
-    /* This will print 'Apples' */
-    for(count=3; count<6; count++) {
-        printText(Apples, 0, count);
-    }
-    
-    /* Copy the 'Oranges' string to the 'Apples' location */
-    strcpy(Apples, Oranges);
-    
-    /* This will print 'Oranges'. Therefore, apples are oranges */
-    for(count=6; count<9; count++) {
-        printText(Apples, 0, count);
-    }
+    printText( HelloWorld, 0, 0 );
+    printText( Welcome, 0, 1 );
 
     /* Wait for a key press */
     while( !os_GetCSC() );

CEdev/examples/demo_0/src/main.c

@@ -11,14 +11,11 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h, intce.h
 
 /* Put function prototypes here */
 void fillScreen(uint8_t color);
 
-/* Location of memory-mapped screen */
-uint16_t *lcd_vramArray =  (uint16_t*)0xD40000;
-
 /* Put all your code here */
 void main(void) { 
     /* Turn the whole screen black */
@@ -40,5 +37,5 @@ void main(void) {
 /* Fill the screen with a given color */
 void fillScreen(uint8_t color) {
     /* memset_fast is a way faster implementation of memset; either one will work here though */
-    memset_fast(lcd_vramArray, color, 320*240*2);
+    memset_fast(lcd_Ram, color, LCD_SIZE);
 }

CEdev/examples/demo_1/bin/DEMO1.8xp

@@ -11,28 +11,31 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h, intce.h
 
 /* Put function prototypes here */
 
 /* Put all your code here */
 void main(void) {
-	uint8_t i, bl_level_copy;
-	
-	bl_level_copy = lcd_BacklightLevel;
-	
-	for(i = bl_level_copy; i > 0; i--) {
-		boot_WaitShort();
-		lcd_BacklightLevel = i;
-	}
-	
-	for(i = 0; i < 255; i++) {
-		boot_WaitShort();
-		lcd_BacklightLevel = i;
-	}
+    uint8_t i, level;
+    
+    /* Store the current brightness level */
+    level = lcd_BacklightLevel;
+    
+    /* Change lcd brightness levels */
+    for(i = level; i > 0; i--) {
+        boot_WaitShort();
+        lcd_BacklightLevel = i;
+    }
+    
+    for(i = 0; i < 255; i++) {
+        boot_WaitShort();
+        lcd_BacklightLevel = i;
+    }
 
-	lcd_BacklightLevel = bl_level_copy;
+    /* Restore the old brightness level */
+    lcd_BacklightLevel = level;
 
-	/* Clean up for the return to the OS */
-	prgm_CleanUp();
+    /* Clean up for the return to the OS */
+    prgm_CleanUp();
 }

CEdev/examples/demo_1/src/main.c

@@ -11,42 +11,42 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h, intce.h
 
-#define ONE_SECOND		32768/1
-#define HALF_SECOND		32768/2
-#define QUARTER_SECOND		32768/4
+#define ONE_SECOND         32768/1
+#define HALF_SECOND        32768/2
+#define QUARTER_SECOND     32768/4
 
 /* Put all your code here */
 void main(void) {
-	unsigned seconds = 0;
-	char str[10];
+    unsigned seconds = 0;
+    char str[10];
 
-	/* Clean up the home screen */
-	prgm_CleanUp();
-	
-	/* Disable the timer so it doesn't run when we don't want it to be running */
-	timer_Control = TIMER1_DISABLE;
-	
-	/* By using the 32768 kHz clock, we can count for exactly 1 second here, or a different interval of time */
-	timer_1_ReloadValue = timer_1_Counter = ONE_SECOND;
-	
-	/* 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_0INT | TIMER1_DOWN;
-	
-	do {
-		/* If the timer is reloaded, we reached 0 */
-		if(timer_IntStatus & TIMER1_RELOADED) {
-			/* Print a string */
-			sprintf( str, "%u", seconds++ );
-			os_SetCursorPos( 0, 0 );
-			os_PutStrFull( str );
-			
-			/* Acknowledge the reload */
-			timer_IntStatus = TIMER1_RELOADED;
-		}
-	} while(!os_GetCSC());
-	
-	/* Clean up for the return to the OS */
-	prgm_CleanUp();
+    /* Clean up the home screen */
+    prgm_CleanUp();
+    
+    /* Disable the timer so it doesn't run when we don't want it to be running */
+    timer_Control = TIMER1_DISABLE;
+    
+    /* By using the 32768 kHz clock, we can count for exactly 1 second here, or a different interval of time */
+    timer_1_ReloadValue = timer_1_Counter = ONE_SECOND;
+    
+    /* 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_0INT | TIMER1_DOWN;
+    
+    do {
+        /* If the timer is reloaded, we reached 0 */
+        if(timer_IntStatus & TIMER1_RELOADED) {
+            /* Print a string */
+            sprintf( str, "%u", seconds++ );
+            os_SetCursorPos( 0, 0 );
+            os_PutStrFull( str );
+            
+            /* Acknowledge the reload */
+            timer_IntAcknowledge = TIMER1_RELOADED;
+        }
+    } while(!os_GetCSC());
+    
+    /* Clean up for the return to the OS */
+    prgm_CleanUp();
 }

CEdev/examples/demo_2/src/main.c

@@ -11,55 +11,55 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h, intce.h
 
-#define ONE_SECOND		32768/1
-#define HALF_SECOND		32768/2
-#define QUARTER_SECOND		32768/4
+#define ONE_SECOND         32768/1
+#define HALF_SECOND        32768/2
+#define QUARTER_SECOND     32768/4
 
 /* Function Prototypes */
 void reset_counter(void);
 
 /* Put all your code here */
 void main(void) {
-	unsigned count = 0;
-	char str[10];
-	
-	timer_1_MatchValue_1 = ONE_SECOND;
-	
-	/* Clean up the home screen */
-	prgm_CleanUp();
-	
-	/* Reset the counter */
-	reset_counter();
-	
-	do {
-		/* If the timer is reloaded, we reached 0 */
-		if(timer_IntStatus & TIMER1_MATCH1) {
-			/* Print the count */
-			sprintf( str, "%u", count++ );
-			os_SetCursorPos( 0, 0 );
-			os_PutStrFull( str );
-			
-			/* Reset the count */
-			reset_counter();
-			
-			/* Acknowledge the interrupt */
-			timer_IntStatus = TIMER1_MATCH1;
-		}
-	} while(!os_GetCSC());
-	
-	/* Clean up for the return to the OS */
-	prgm_CleanUp();
+    unsigned count = 0;
+    char str[10];
+    
+    timer_1_MatchValue_1 = ONE_SECOND;
+    
+    /* Clean up the home screen */
+    prgm_CleanUp();
+    
+    /* Reset the counter */
+    reset_counter();
+    
+    do {
+        /* Count until we reach the match value */
+        if(timer_IntStatus & TIMER1_MATCH1) {
+            /* Print the count */
+            sprintf( str, "%u", count++ );
+            os_SetCursorPos( 0, 0 );
+            os_PutStrFull( str );
+            
+            /* Reset the count */
+            reset_counter();
+            
+            /* Acknowledge the interrupt */
+            timer_IntStatus = TIMER1_MATCH1;
+        }
+    } while(!os_GetCSC());
+    
+    /* Clean up for the return to the OS */
+    prgm_CleanUp();
 }
 
 void reset_counter(void) {
-	/* Disable the timer so it doesn't run when we don't want it to be running */
-	timer_Control = TIMER1_DISABLE;
-	
-	/* By using the 32768 kHz clock, we can count for exactly 1 second here, or a different interval of time */
-	timer_1_Counter = 0;
-	
-	/* 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;
+    /* Disable the timer so it doesn't run when we don't want it to be running */
+    timer_Control = TIMER1_DISABLE;
+    
+    /* By using the 32768 kHz clock, we can count for exactly 1 second here, or a different interval of time */
+    timer_1_Counter = 0;
+    
+    /* 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;
 }

CEdev/examples/demo_3/src/main.c

@@ -11,34 +11,34 @@
 #include <string.h>
 
 /* Other available headers */
-// stdarg.h, setjmp.h, assert.h, ctype.h, float.h, iso646.h, limits.h, errno.h, debug.h
+// stdarg.h, setjmp.h, ctype.h, float.h, iso646.h, limits.h, errno.h, intce.h
 #include <assert.h>
 #include <debug.h>
 
 /* Put function prototypes here */
 
 /* Put all your code here */
 void main(void) {
-	/* Set the intial value of some variables */
-	int dbg_test_var_1 = 10;
-	uint8_t dbg_test_var_2 = 3;
-	
-	/* Print a simple debugging string */
-	dbg_sprintf(dbgout, "This is the start of a CEmu debugging test\n");
-	
-	/* Set a watchpoint that will break anytime we write/change this varaible */
-	dbg_SetWriteWatchpoint( &dbg_test_var_1, sizeof dbg_test_var_1 );
-	
-	/* Set a non breaking watchpoint just so we can see what is in this variable at any given time */
-	dbg_SetWatchpoint( &dbg_test_var_2, sizeof dbg_test_var_2 );
-	
-	/* Now, let's write to the varaible to see what happens (Go to the 'Watchpoints' tab in CEmu to view the status) */
-	dbg_test_var_1 = 5;
-	
-	/* 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 the intial value of some variables */
+    int dbg_test_var_1 = 10;
+    uint8_t dbg_test_var_2 = 3;
+    
+    /* Print a simple debugging string */
+    dbg_sprintf(dbgout, "This is the start of a CEmu debugging test\n");
+    
+    /* Set a watchpoint that will break anytime we write/change this varaible */
+    dbg_SetWriteWatchpoint( &dbg_test_var_1, sizeof dbg_test_var_1 );
+    
+    /* Set a non breaking watchpoint just so we can see what is in this variable at any given time */
+    dbg_SetWatchpoint( &dbg_test_var_2, sizeof dbg_test_var_2 );
+    
+    /* Now, let's write to the varaible to see what happens (Go to the 'Watchpoints' tab in CEmu to view the status) */
+    dbg_test_var_1 = 5;
+    
+    /* Remove the watchpoint that we had set */
+    dbg_RemoveWatchpoint( &dbg_test_var_1 );
+    dbg_RemoveWatchpoint( &dbg_test_var_2 );
+    
+    /* Clean up everything */
+    prgm_CleanUp();
 }