Merge branch 'pr/31'

Conflicts:
	hardware/zpuino/zpu20/cores/zpuino/board_papilio_pro.h
	hardware/zpuino/zpu20/cores/zpuino/delay.cpp
	libraries/Servo/library.properties
	libraries/Servo/src/Servo.h

Author: jackgassett

hardware/zpuino/zpu20/cores/zpuino/board_papilio_one.h

@@ -297,4 +297,113 @@
 #define WING_C_14 FPGA_PIN_P16
 #define WING_C_15 FPGA_PIN_P17
 
+//Wing 1 Column A
+#define WA0 0
+#define WA1 1
+#define WA2 2
+#define WA3 3
+#define WA4 4
+#define WA5 5
+#define WA6 6
+#define WA7 7
+#define WA8 8
+#define WA9 9
+#define WA10 10
+#define WA11 11
+#define WA12 12
+#define WA13 13
+#define WA14 14
+#define WA15 15
+
+//Wing 1 Column B
+#define WB0 16    //This doesn't work for some reason!
+#define WB1 17
+#define WB2 18
+#define WB3 19
+#define WB4 20
+#define WB5 21
+#define WB6 22
+#define WB7 23
+#define WB8 24
+#define WB9 25
+#define WB10 26
+#define WB11 27
+#define WB12 28
+#define WB13 29
+#define WB14 30
+#define WB15 31
+
+//Wing 2 Column C
+#define WC0 32
+#define WC1 33
+#define WC2 34
+#define WC3 35
+#define WC4 36
+#define WC5 37
+#define WC6 38
+#define WC7 39
+#define WC8 40
+#define WC9 41
+#define WC10 42
+#define WC11 43
+#define WC12 44
+#define WC13 45
+#define WC14 46
+#define WC15 47
+
+// ******** Define AH/AL syntax
+//Wing 1 Column A
+#define WAL0 0
+#define WAL1 1
+#define WAL2 2
+#define WAL3 3
+#define WAL4 4
+#define WAL5 5
+#define WAL6 6
+#define WAL7 7
+#define WAH0 8
+#define WAH1 9
+#define WAH2 10
+#define WAH3 11
+#define WAH4 12
+#define WAH5 13
+#define WAH6 14
+#define WAH7 15
+
+//Wing 1 Column B
+#define WBL0 16    //This doesn't work for some reason!
+#define WBL1 17
+#define WBL2 18
+#define WBL3 19
+#define WBL4 20
+#define WBL5 21
+#define WBL6 22
+#define WBL7 23
+#define WBH0 24
+#define WBH1 25
+#define WBH2 26
+#define WBH3 27
+#define WBH4 28
+#define WBH5 29
+#define WBH6 30
+#define WBH7 31
+
+//Wing 2 Column C
+#define WCL0 32
+#define WCL1 33
+#define WCL2 34
+#define WCL3 35
+#define WCL4 36
+#define WCL5 37
+#define WCL6 38
+#define WCL7 39
+#define WCH0 40
+#define WCH1 41
+#define WCH2 42
+#define WCH3 43
+#define WCH4 44
+#define WCH5 45
+#define WCH6 46
+#define WCH7 47
+
 #endif

hardware/zpuino/zpu20/cores/zpuino/board_papilio_pro.h

@@ -135,58 +135,6 @@
 #define WING_C_14 FPGA_PIN_P16
 #define WING_C_15 FPGA_PIN_P17
 
-
-#define WING_AL0 0
-#define WING_AL1 1
-#define WING_AL2 2
-#define WING_AL3 3
-#define WING_AL4 4
-#define WING_AL5 5
-#define WING_AL6 6
-#define WING_AL7 7
-#define WING_AH0 8
-#define WING_AH1 9
-#define WING_AH2 10
-#define WING_AH3 11
-#define WING_AH4 12
-#define WING_AH5 13
-#define WING_AH6 14
-#define WING_AH7 15
-
-#define WING_BL0 16
-#define WING_BL1 17
-#define WING_BL2 18
-#define WING_BL3 19
-#define WING_BL4 20
-#define WING_BL5 21
-#define WING_BL6 22
-#define WING_BL7 23
-#define WING_BH0 24
-#define WING_BH1 25
-#define WING_BH2 26
-#define WING_BH3 27
-#define WING_BH4 28
-#define WING_BH5 29
-#define WING_BH6 30
-#define WING_BH7 31
-        
-#define WING_CL0 32
-#define WING_CL1 33
-#define WING_CL2 34
-#define WING_CL3 35
-#define WING_CL4 36
-#define WING_CL5 37
-#define WING_CL6 38
-#define WING_CL7 39
-#define WING_CH0 40
-#define WING_CH1 41
-#define WING_CH2 42
-#define WING_CH3 43
-#define WING_CH4 44
-#define WING_CH5 45
-#define WING_CH6 46
-#define WING_CH7 47
-
 //Wing 1 Column A
 #define WA0 0
 #define WA1 1

hardware/zpuino/zpu20/cores/zpuino/delay.cpp

@@ -2,14 +2,14 @@
 
 void delayCycles(unsigned int cycles)
 {
-	unsigned int current = TIMERTSC;
-	unsigned int next = current + cycles;
-	/* This might overflow. We assume cycles is less than 2^30 */
-	if (next<current) {
-		while (TIMERTSC&0x80000000) {}    // Wait for timer to roll over
-	}
+    unsigned int current = TIMERTSC;
+    unsigned int next = current + cycles;
+    /* This might overflow. We assume cycles is less than 2^30 */
+    if (next<current) {
+        while (TIMERTSC&0x80000000) {}    // Wait for timer to roll over
+    }
 
-	while (TIMERTSC<next) {}
+    while (TIMERTSC<next) {}
 }
 
 static unsigned lastMillis = 0;
@@ -24,9 +24,6 @@ unsigned int millis(void) {
     return addMillis + currentMillis;
 }
 
-/* unsigned int millis(void) {
-    return TIMERTSC / clocksPerMilisecond;
-} */
 unsigned int micros(void) {
     return TIMERTSC / clocksPerMicrosecond;
 }

hardware/zpuino/zpu20/cores/zpuino/register.h

@@ -91,6 +91,9 @@ typedef volatile unsigned int* register_t;
 #define TMR0CMP  REGISTER(TIMERSBASE,2)
 #define TIMERTSC REGISTER(TIMERSBASE,3)
 
+#define MILLISL  REGISTER(TIMERSBASE,4)
+#define MILLISH  REGISTER(TIMERSBASE,5)
+
 // PWM for timer 0
 #define TMR0PWMLOW(x) REGISTER(TIMERSBASE, 32+(4*x))
 #define TMR0PWMHIGH(x) REGISTER(TIMERSBASE, 33+(4*x))

hardware/zpuino/zpu20/cores/zpuino/zposix.cpp

@@ -188,7 +188,7 @@ int fstat(int fd, struct stat *buf)
 {
     int ret = -1;
     if (__fds[fd].ops) {
-        if (__fds[fd].ops->read) {
+        if (__fds[fd].ops->fstat) {
             ret = __fds[fd].ops->fstat(__fds[fd].data,buf);
         }
     }

hardware/zpuino/zpu20/cores/zpuino/zstdio.c

@@ -242,8 +242,9 @@ FILE *fdopen(int fd, const char *mode)
 
 int fseek(FILE *stream, long offset, int whence)
 {
-    UNIMPLEMENTED();
-    return -1;
+    if (!stream || stream->fd<0)
+        return -1;
+    return lseek(stream->fd,offset,whence);
 }
 long ftell(FILE *stream)
 {