GOS module, for operating system independance

GMISC fast floating point trig
GMISC fast fixed point trig

2 files changed, 7 insertions, 12 deletions

diff --git a/demos/modules/gdisp/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h
index cc60c46b..cd7515d9 100644
--- a/demos/modules/gdisp/gdisp_circles/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_circles/gfxconf.h
@@ -28,12 +28,13 @@
 #ifndef _GFXCONF_H

 #define _GFXCONF_H

 

+/* The operating system to use - one of these must be defined */

+#define GFX_USE_OS_CHIBIOS		TRUE

+#define GFX_USE_OS_WIN32		FALSE

+#define GFX_USE_OS_POSIX		FALSE

+

 /* GFX sub-systems to turn on */

 #define GFX_USE_GDISP			TRUE

-#define GFX_USE_GWIN			FALSE

-#define GFX_USE_GEVENT			FALSE

-#define GFX_USE_GTIMER			FALSE

-#define GFX_USE_GINPUT			FALSE

 

 /* Features for the GDISP sub-system. */

 #define GDISP_NEED_VALIDATION	TRUE

diff --git a/demos/modules/gdisp/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c
index 395af009..3a9675bb 100644
--- a/demos/modules/gdisp/gdisp_circles/main.c
+++ b/demos/modules/gdisp/gdisp_circles/main.c
@@ -25,19 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

 

-#include "ch.h"

-#include "hal.h"

 #include "gfx.h"

 

 int main(void) {

 	coord_t		width, height;

 

-    halInit();

-    chSysInit();

-

     /* Initialize and clear the display */

-    gdispInit();

-    gdispClear(Black);

+    gfxInit();

 

     // Get the screen size

     width = gdispGetWidth();

@@ -52,7 +46,7 @@ int main(void) {
     gdispFillArc(width/8, height/8, 30, 10, 70, Gray);

 

     while(TRUE) {

-        chThdSleepMilliseconds(500);

+    	gfxSleepMilliseconds(500);

     }   

 }