Browse Source

DUMPDEV throughout

jamesbowman 9 years ago
parent
commit
b9f992a75d
7 changed files with 17 additions and 17 deletions
  1. 4 4
      GD2.h
  2. 2 2
      chess.ino
  3. 2 2
      cobra.ino
  4. 2 2
      examples.ino
  5. 1 1
      jnr.ino
  6. 1 1
      simon.ino
  7. 5 5
      viewer.ino

+ 4 - 4
GD2.h

@@ -7,7 +7,7 @@
 #ifndef _GD2_H_INCLUDED
 #define _GD2_H_INCLUDED
 
-#if defined(RASPBERRY_PI) || defined(EMUPC)
+#if defined(RASPBERRY_PI) || defined(DUMPDEV)
 #include "wiring.h"
 #endif
 
@@ -29,7 +29,7 @@
 #define GD_STORAGE      4
 
 ////////////////////////////////////////////////////////////////////////
-#if !defined(RASPBERRY_PI) && !defined(EMUPC)
+#if !defined(RASPBERRY_PI) && !defined(DUMPDEV)
 #define VERBOSE 0
 
 struct dirent {
@@ -488,7 +488,7 @@ private:
 
 extern GDClass GD;
 
-#if !defined(RASPBERRY_PI) && !defined(EMUPC)
+#if !defined(RASPBERRY_PI) && !defined(DUMPDEV)
 class Reader {
 public:
   int openfile(const char *filename) {
@@ -861,7 +861,7 @@ class Poly {
     }
 };
 
-#if !defined(RASPBERRY_PI) && !defined(EMUPC)
+#if !defined(RASPBERRY_PI) && !defined(DUMPDEV)
 class Streamer {
 public:
   void begin(const char *rawsamples,

+ 2 - 2
chess.ino

@@ -69,7 +69,7 @@ volatile char breakpoint; /* for debugger */
                                 
 /* User interface routines */
 void myputchar(char c) {
-#ifdef EMUPC    // JCB{
+#ifdef DUMPDEV    // JCB{
   fprintf(stderr, "%c", c);
 #endif    // }JCB
 }
@@ -194,7 +194,7 @@ C:if(m>I-M|m<M-I)d=98;                         /* mate holds to any depth  */
   if(z&&d>2)
    {*c='a'+(X&7);c[1]='8'-(X>>4);c[2]='a'+(Y&7);c[3]='8'-(Y>>4&7);c[4]=0;
     breakpoint=2;           /* AVR Studio 4 Breakpoint for moves, watch c[] */
-#ifdef EMUPC    // JCB{
+#ifdef DUMPDEV    // JCB{
     fprintf(stderr, "%2d ply, %9d searched, score=%6d by %c%c%c%c\n",d-1,N-S,m,
      'a'+(X&7),'8'-(X>>4),'a'+(Y&7),'8'-(Y>>4&7)); /* uncomment for Kibitz */   
 #else

+ 2 - 2
cobra.ino

@@ -359,7 +359,7 @@ void setup()
   LOAD_ASSETS();
   GD.BitmapHandle(BACKGROUND_HANDLE);
   GD.BitmapSize(BILINEAR, REPEAT, REPEAT, 480, 272);
-#ifdef EMUPC    // JCB{
+#ifdef DUMPDEV    // JCB{
   // startMotion(240, 136);
   // trackMotion(240, 138);
 #endif          // }JCB
@@ -428,7 +428,7 @@ void loop()
   draw_edges();
   draw_navlight(0);
   GD.RestoreContext();
-#ifndef EMUPC // JCB{
+#ifndef DUMPDEV // JCB{
   GD.cmd_number(240, 7, 26, OPT_CENTER, micros() - t0);
 #else
   // GD.cmd_number(240, 7, 26, OPT_CENTER, t);

+ 2 - 2
examples.ino

@@ -104,7 +104,7 @@ void loop()
   GD.Vertex2ii(260, 170);
   GD.swap();  //' }f
   
-#ifndef EMUPC    // JCB
+#ifndef DUMPDEV    // JCB
   Serial.begin(9600);
   for (;;) {      //' g{
     GD.get_inputs();
@@ -118,7 +118,7 @@ void loop()
     GD.cmd_number((i % 16) * 30, (i / 16) * 17, 26, 0, i);
   }
   GD.swap();
-#ifndef EMUPC    // JCB
+#ifndef DUMPDEV    // JCB
   GD.get_inputs(); //' }h
   Serial.println(GD.inputs.tag);
 #endif          // JCB

+ 1 - 1
jnr.ino

@@ -157,7 +157,7 @@ void loop()
 
   xscroll.run(GD.inputs.y > 240 && touching, GD.inputs.x);
   draw(bx);
-#ifdef EMUPC  // JCB{
+#ifdef DUMPDEV  // JCB{
   GD.RestoreContext();
   GD.ColorA(128);
   GD.Begin(POINTS);

+ 1 - 1
simon.ino

@@ -75,7 +75,7 @@ static int get_note() //' getnote{
     drawscreen(0);
     if ((1 <= GD.inputs.tag) && (GD.inputs.tag <= 4))
       pressed = GD.inputs.tag;
-#ifdef EMUPC    // JCB{
+#ifdef DUMPDEV    // JCB{
     pressed = 1;
 #endif          // }JCB
   }

+ 5 - 5
viewer.ino

@@ -125,7 +125,7 @@ static void showdir1(char directory[60][8], int num_jpgs, int yb, int sel)
   }
 }
 
-#ifdef EMUPC  // JCB{
+#ifdef DUMPDEV  // JCB{
 extern FILE *stimfile;
 #endif        // }JCB
 
@@ -138,7 +138,7 @@ void loop()
   scroller yscroll;
 
   {
-#ifdef EMUPC  // JCB{
+#ifdef DUMPDEV  // JCB{
     char fn[9];
     for (int i = 1; i < 40; i++) {
       sprintf(fn, "kitten%02d", i);
@@ -182,7 +182,7 @@ void loop()
     picked = GD.inputs.tag - 128;
   }
 
-#ifndef EMUPC // JCB
+#ifndef DUMPDEV // JCB
   GD.Clear();
   draw_progress();
 #else         // JCB{
@@ -199,7 +199,7 @@ void loop()
   GD.cmd_getprops(m_ptr, m_w, m_h);
   GD.finish();
 
-#ifndef EMUPC // JCB
+#ifndef DUMPDEV // JCB
   uint16_t w = GD.rd16(m_w);
   uint16_t h = GD.rd16(m_h);
 #else         // JCB{
@@ -215,7 +215,7 @@ void loop()
   float zoom = 0.3;
   int fadeout = 0;
 
-#ifdef EMUPC  // JCB{
+#ifdef DUMPDEV  // JCB{
   while (!feof(stimfile)) {
 #else         // }JCB
   while (1) {