Diff: OregonBit.cpp

Revision:

1:706c7b028278

Parent:

0:13cb9cc98bca

Child:

2:7455dae4e624

diff -r 13cb9cc98bca -r 706c7b028278 OregonBit.cpp
--- a/OregonBit.cpp	Tue Jul 26 10:19:11 2016 +0000
+++ b/OregonBit.cpp	Tue Jul 26 13:42:32 2016 +0000
@@ -25,9 +25,10 @@
 /* by storing values and checking against the second transmission of the same message (all messages sent twice, I sleep through the    */
 /* second transmission Zzzzz).                                                                                                         */
  
-
+ 
 #include "MicroBit.h"
-
+#include "FastIO.h"
+ 
 int thisPin;
 int lastPin;
 int preambleON;
@@ -46,96 +47,97 @@
 long endedAt;
 int preambleFound;
 int dataBits[32];
-int myPin = 1; // MicroBit P1
+//int myPin = 1; // MicroBit P1
+MicroBitPin P1(MICROBIT_ID_IO_P1, MICROBIT_PIN_P1, PIN_CAPABILITY_ALL);
 MicroBit uBit;
-
-
+FastInOut<MICROBIT_PIN_P1> (myPin);
+Timer xTime; 
 long getTime(long returnUsecs)
 {
-	returnUsecs = uBit.systemTime();
-/*	struct timespec currentTime;
+    returnUsecs = xTime.read_us();
+/*  struct timespec currentTime;
         long microSecs;
         long  secs;
-	clock_gettime(CLOCK_MONOTONIC, &currentTime);
+    clock_gettime(CLOCK_MONOTONIC, &currentTime);
         microSecs = currentTime.tv_nsec  * 0.001;
         secs = currentTime.tv_sec;
         returnUsecs = microSecs +  secs * 1000; */
-        returnUsecs = returnUsecs * 100; // microsecs
-	return(returnUsecs); 
+         
+    return(returnUsecs); 
 }
 int getPinValue(int returnPinValue)
 {
        // returnPinValue = digitalRead(myPin);
-        returnPinValue = uBit.io.pin[myPin].getDigitalValue(); 
-	return(returnPinValue);
+        returnPinValue = myPin.read(); 
+    return(returnPinValue);
 }
 int detectPreamble(int returnDetected)
 {
-
-	thisPin = getPinValue(thisPin);
-	if (!(thisPin == lastPin))
-	{
-		endedAt = getTime(endedAt); // set timer end for last pin
-		timeDiff = endedAt - startedAt; // reset time
-		if (lastPin == 1)
-		{
-			if ((timeDiff >= onShortLo) && (timeDiff <= onShortHi)) // error of margin on pulse length
-			{
-				preambleON++; // looking for 12 short ON pulses.
-			}
-			else // not preamble
-			{
-				preambleON = 0;
-			}
-		}
-		else // check is this preamble, lastPin off
-		{
-
-
-			if (preambleON < 11) // last preamble is special as next low not short(thisPin)
-			{
-				if ((timeDiff > offShortLo) && (timeDiff < offShortHi)) // off ok
-				{
-				}
-				else // not preamble
-				{
-					preambleON = 0;
-				}
-
-			}
-		}
-
-	startedAt = endedAt; //  set timer start for this pin
-	lastPin = thisPin;
-	}
-	if (preambleON == 12) 
-	{
-		returnDetected = 1;
-	}
-	else
-	{
-		returnDetected = 0;
-	}
-	return(returnDetected);
+ 
+    thisPin = getPinValue(thisPin);
+    if (!(thisPin == lastPin))
+    {
+        endedAt = getTime(endedAt); // set timer end for last pin
+        timeDiff = endedAt - startedAt; // reset time
+        if (lastPin == 1)
+        {
+            if ((timeDiff >= onShortLo) && (timeDiff <= onShortHi)) // error of margin on pulse length
+            {
+                preambleON++; // looking for 12 short ON pulses.
+            }
+            else // not preamble
+            {
+                preambleON = 0;
+            }
+        }
+        else // check is this preamble, lastPin off
+        {
+ 
+ 
+            if (preambleON < 11) // last preamble is special as next low not short(thisPin)
+            {
+                if ((timeDiff > offShortLo) && (timeDiff < offShortHi)) // off ok
+                {
+                }
+                else // not preamble
+                {
+                    preambleON = 0;
+                }
+ 
+            }
+        }
+ 
+    startedAt = endedAt; //  set timer start for this pin
+    lastPin = thisPin;
+    }
+    if (preambleON == 12) 
+    {
+        returnDetected = 1;
+    }
+    else
+    {
+        returnDetected = 0;
+    }
+    return(returnDetected);
 }
 int getSync()
 {
         // sync is long OFF, long ON, long OFF
-
+ 
         int sCount;
-	sCount =  1;
+    sCount =  1;
         thisPin = getPinValue(thisPin);
         lastPin = thisPin; //looking for state changes
         while (sCount < 3) // 3 sync pulses
         {
            if (!(thisPin == lastPin))
            {
-              	sCount ++;
-		if (sCount == 3)
-		{
-              		startedAt = getTime(startedAt); // time this pulse to get first bit value
-		}
-              	lastPin = thisPin;
+                sCount ++;
+        if (sCount == 3)
+        {
+                    startedAt = getTime(startedAt); // time this pulse to get first bit value
+        }
+                lastPin = thisPin;
           }
            thisPin = getPinValue(thisPin); // poll the pin state
         }
@@ -144,19 +146,19 @@
              thisPin = getPinValue(thisPin);
         }
         endedAt = getTime(endedAt);
-	timeDiff = endedAt - startedAt;
-	startedAt = endedAt; // start timer for next bit. 
-	if (timeDiff > syncEnd0Lo && timeDiff < syncEnd0Hi)
-	{
-		dataBits[0] = 0;
-	}
-	else
-	{
-		dataBits[0] = 1;
-	}
+    timeDiff = endedAt - startedAt;
+    startedAt = endedAt; // start timer for next bit. 
+    if (timeDiff > syncEnd0Lo && timeDiff < syncEnd0Hi)
+    {
+        dataBits[0] = 0;
+    }
+    else
+    {
+        dataBits[0] = 1;
+    }
         return;
 }
-
+ 
 int getData()
 {
 // get next 31 data bits, we determined bit 0 in SYNC
@@ -164,71 +166,71 @@
 int l;
 int s;
         i = 1; //first bit[0] was derived in Sync
-	s = 0; // short pulse 
-	l = 0; // long pulse
-
+    s = 0; // short pulse 
+    l = 0; // long pulse
+ 
         while (i < 32)
         {
            if (!(thisPin == lastPin)) // lastPin and thisPin are from getSync.
            {
                 endedAt = getTime(endedAt); //  timer started in getSync
                 timeDiff = endedAt - startedAt;
-		startedAt = endedAt; // next starts at this end
-			if (lastPin == 0) //lastPin was OFF
-			{
-				if ((timeDiff > offShortLo) && (timeDiff < offShortHi))
-					{ // short off detected
-						s++;
-						l=0;
-					}
-					if ((timeDiff > offLongLo) && (timeDiff < offLongHi))
-					{ // long off detected
-						l++;
-						s=0;
-					}
-			}
-			else // lastPin was ON
-			{
-					if ((timeDiff > onShortLo) && (timeDiff < onShortHi)) // half-time
-					{ // short on detetcted
-						s++;
-						l=0;
-					}
-					if ((timeDiff > onLongLo) && (timeDiff < onLongHi)) // full-time
-					{ // long on detected
-						l++;
-						s=0;
-					}
-			}
-			if (s == 2)
-			{ // 2 short pulses this bit equals previous bit (we know 1st bit from sync)
-					dataBits[i] = dataBits[(i-1)];
-					i++;
-					s=0;
-					l=0;
-			}
-			if (l == 1)
-			{ // 1 long pulse this bit is inverse of previous bit (we know 1st bit from sync)
-					if (dataBits[(i-1)] == 0)
-					{
-					   dataBits[i] = 1;
-					}
-					else
-					{
-					   dataBits[i] = 0;
-					}
-					l=0;
-					s=0;
-					i++;
-			}
+        startedAt = endedAt; // next starts at this end
+            if (lastPin == 0) //lastPin was OFF
+            {
+                if ((timeDiff > offShortLo) && (timeDiff < offShortHi))
+                    { // short off detected
+                        s++;
+                        l=0;
+                    }
+                    if ((timeDiff > offLongLo) && (timeDiff < offLongHi))
+                    { // long off detected
+                        l++;
+                        s=0;
+                    }
+            }
+            else // lastPin was ON
+            {
+                    if ((timeDiff > onShortLo) && (timeDiff < onShortHi)) // half-time
+                    { // short on detetcted
+                        s++;
+                        l=0;
+                    }
+                    if ((timeDiff > onLongLo) && (timeDiff < onLongHi)) // full-time
+                    { // long on detected
+                        l++;
+                        s=0;
+                    }
+            }
+            if (s == 2)
+            { // 2 short pulses this bit equals previous bit (we know 1st bit from sync)
+                    dataBits[i] = dataBits[(i-1)];
+                    i++;
+                    s=0;
+                    l=0;
+            }
+            if (l == 1)
+            { // 1 long pulse this bit is inverse of previous bit (we know 1st bit from sync)
+                    if (dataBits[(i-1)] == 0)
+                    {
+                       dataBits[i] = 1;
+                    }
+                    else
+                    {
+                       dataBits[i] = 0;
+                    }
+                    l=0;
+                    s=0;
+                    i++;
+            }
             // update  last pin to this pin value
                 lastPin = thisPin;
            }
            thisPin = getPinValue(thisPin); // get pin value 
         }
-	return;
+    return;
 }
-
+ 
 int processData()
 {
 int x = 0;
@@ -242,67 +244,70 @@
 int nib;
 int nibble[4];
 int lowBat=0;
-
-	for (x=0;x<8;x++)
-	{
-		for (y=0;y<4;y++){nibble[y]=0;} //initialise
-		nStart=(31-((x*4)+3)); // array index for nibble start
-		nFinish=nStart+4;
-		y = 3; // nibble index
-		// Reverse the bits in message data (dataBits) to create 8 nibbles of 4 bits.
-		for (z=nStart;z<nFinish;z++) // read 4 bits 
-		{
-			if (y >= 0)
-			{
-				nibble[y]=dataBits[z];//reverse bits, y starts at 3 back to 0
-				y--;
-			}
-		}
-		nibbleValue=0;
-		nib=8;
-		temp=0;
-		for (z=0;z<4;z++) // convert this nibble to decimal from binary
-		{
-			temp=nibbleValue;
-			nibbleValue=(nib * nibble[z]) + temp;
-			temp=nib;
-			if (temp > 1) nib = (temp / 2);
-
-		}
-		nibbleValues[x] = nibbleValue; // store nibble decimal values
-	}
-
-	// Print out the converted decimal nibble values
-	for (x=0;x<8;x++)
-	{
-		if (x==6) //channel number conversion
-		{
-			 temp=99;
-			 if (nibbleValues[x]==0) temp=1;
-			 if (nibbleValues[x]==4) temp=2;
-			 if (nibbleValues[x]==8) temp=3;
-			 printf(" Channel     : %d\n",temp);
-		}
-		if (x==2)
-		{
-			// printf(" Temperature : ");
-			uBit.display.scroll("Temp :");
-			if ((nibbleValues[x]==10) || (nibbleValues[x]==2)) uBit.display.scroll("-"); // printf("-"); // 8 = low bat, 2=minus, 10=minus+low bat
-			if ((nibbleValues[x]==8) || (nibbleValues[x]==10)) lowBat=1; else lowBat=0;
-
-		}
-		if ((x==3) || (x==4)) uBit.display.scroll(nibbleValues[x]);// printf("%d",nibbleValues[x]);
-		if (x==5)
-		{
-			// printf(".");
-			// printf("%d degC.\n",nibbleValues[x]);
-			uBit.display.scroll(".");
-			uBit.display.scroll(" degC.");
-			uBit.display.scroll(nibbleValues[x]);
-		}
-		if (lowBat==1) uBit.display.scroll("Low Battery"); // printf("Low Battery. \n");
-	}
-	return;
+ 
+    for (x=0;x<8;x++)
+    {
+        for (y=0;y<4;y++){nibble[y]=0;} //initialise
+        nStart=(31-((x*4)+3)); // array index for nibble start
+        nFinish=nStart+4;
+        y = 3; // nibble index
+        // Reverse the bits in message data (dataBits) to create 8 nibbles of 4 bits.
+        for (z=nStart;z<nFinish;z++) // read 4 bits 
+        {
+            if (y >= 0)
+            {
+                nibble[y]=dataBits[z];//reverse bits, y starts at 3 back to 0
+                y--;
+            }
+        }
+        nibbleValue=0;
+        nib=8;
+        temp=0;
+        for (z=0;z<4;z++) // convert this nibble to decimal from binary
+        {
+            temp=nibbleValue;
+            nibbleValue=(nib * nibble[z]) + temp;
+            temp=nib;
+            if (temp > 1) nib = (temp / 2);
+ 
+        }
+        nibbleValues[x] = nibbleValue; // store nibble decimal values
+    }
+ 
+    // Print out the converted decimal nibble values
+    for (x=0;x<8;x++)
+    {
+        if (x==6) //channel number conversion
+        {
+             temp=99;
+             if (nibbleValues[x]==0) temp=1;
+             if (nibbleValues[x]==4) temp=2;
+             if (nibbleValues[x]==8) temp=3;
+       //      printf(" Channel     : %d\n",temp);
+             uBit.display.scroll("Channel:");
+             uBit.display.scroll(temp);
+        }
+        if (x==2)
+        {
+            // printf(" Temperature:");
+            uBit.display.scroll("Temp :");
+            if ((nibbleValues[x]==10) || (nibbleValues[x]==2)) uBit.display.scroll("-"); // printf("-"); // 8 = low bat, 2=minus, 10=minus+low bat
+            if ((nibbleValues[x]==8) || (nibbleValues[x]==10)) lowBat=1; else lowBat=0;
+ 
+        }
+        if ((x==3) || (x==4)) uBit.display.scroll(nibbleValues[x]);// printf("%d",nibbleValues[x]);
+        if (x==5)
+        {
+            // printf(".");
+            // printf("%d degC.\n",nibbleValues[x]);
+            uBit.display.scroll(".");
+            uBit.display.scroll(nibbleValues[x]);
+            uBit.display.scroll("degC");
+            
+        }
+        if (lowBat==1) uBit.display.scroll("Low Battery"); // printf("Low Battery. \n");
+    }
+    return;
 }
 int main()
 {
@@ -329,32 +334,33 @@
 //        wiringPiSetup();
 //        pinMode(myPin, INPUT);
           uBit.io.pin[myPin].setDigitalValue(0); 
-	preambleFound = 0;
-	preambleON = 0;
-	// printf("Waiting for transmission (approx. every 30s).\n");
-	// printf("Press Ctrl-C to exit.\n");
-	uBit.display.scroll("Waiting...");
-	while (1)
-	{ // loop forever or ctrl-c
-
-		thisPin = getPinValue(thisPin);
-		lastPin = thisPin;
-		endedAt = getTime(endedAt); // set initial timer end
-		startedAt = endedAt;
-
-		while (preambleFound == 0) // constantly monitor for preamble
-		{
-			preambleFound = detectPreamble(preambleFound);
-		}
-		if (preambleFound == 1)
-		{
-       		        getSync();
-       	        	getData();
-			processData();
-			preambleFound = 0;
-			preambleON = 0;
-			uBit.sleep(10); // avoid second xmission of same data
-		}
-	}
-	exit(0);
-}
+    preambleFound = 0;
+    preambleON = 0;
+    // printf("Waiting for transmission (approx. every 30s).\n");
+    // printf("Press Ctrl-C to exit.\n");
+    uBit.display.scroll("Waiting...");
+    while (1)
+    { // loop forever or ctrl-c
+ 
+        thisPin = getPinValue(thisPin);
+        lastPin = thisPin;
+        xTime.start();
+        endedAt = getTime(endedAt); // set initial timer end
+        startedAt = endedAt;
+ 
+        while (preambleFound == 0) // constantly monitor for preamble
+        {
+            preambleFound = detectPreamble(preambleFound);
+        }
+        if (preambleFound == 1)
+        {
+                    getSync();
+                    getData();
+            processData();
+            preambleFound = 0;
+            preambleON = 0;
+            uBit.sleep(10); // avoid second xmission of same data
+        }
+    }
+    exit(0);
+}
\ No newline at end of file