Commit efb8ed1f authored by campenr's avatar campenr

fixed output and made it consistent with output from Ardunio version.

parent 8ea51270
...@@ -42,8 +42,10 @@ using namespace std; ...@@ -42,8 +42,10 @@ using namespace std;
//RF24 radio(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ); //RF24 radio(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
// Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz // Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz
RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ); //RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
// Generic setup
RF24 radio(22, 0);
// //
// Channel info // Channel info
...@@ -97,49 +99,44 @@ int main(int argc, char** argv) ...@@ -97,49 +99,44 @@ int main(int argc, char** argv)
} }
printf("\n"); printf("\n");
// forever loop // forever loop
while(1) while(1)
{ {
if ( reset_array == 1 ) // Clear measurement values
{ memset(values,0,sizeof(values));
// Clear measurement values
memset(values,0,sizeof(values)); // Scan all channels num_reps times
printf("\n"); int rep_counter = num_reps;
} while(rep_counter--)
{
// Scan all channels num_reps times
int i = num_channels; int i = num_channels;
while (i--) while (i--)
{ {
// Select this channel
radio.setChannel(i); // Select this channel
radio.setChannel(i);
// Listen for a little
radio.startListening(); // Listen for a little
delayMicroseconds(128); radio.startListening();
//radio.stopListening(); delayMicroseconds(128);
radio.stopListening();
// Did we get a carrier?
if ( radio.testCarrier() ) // Did we get a carrier?
++values[i]; if ( radio.testCarrier() ) ++values[i];
if ( values[i] == 0xf ) }
{ }
reset_array = 2;
} // Print out channel measurements, clamped to a single hex digit
radio.stopListening(); i = 0;
} while ( i < num_channels )
{
// Print out channel measurements, clamped to a single hex digit printf("%x",min(0xf,(values[i]&0xf)));
i = 0; ++i;
while ( i < num_channels ) }
{ printf("\n");
printf("%x",min(0xf,(values[i]&0xf))); }
++i;
}
printf("\n");
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment