zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_HAL: fixed example build

master
Andrew Tridgell 11 years ago
parent
a04c056598
commit
fc7f3c8aa6
4 changed files with 0 additions and 218 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      libraries/AP_HAL_AVR/examples/ArduCopterLibs/ArduCopterLibs.pde
  2. 59
      libraries/AP_HAL_AVR/examples/ArduPlaneLibs/ArduPlaneLibs.pde
  3. 59
      libraries/AP_HAL_AVR/examples/Console/Console.pde
  4. 56
      libraries/AP_HAL_FLYMAPLE/examples/Console/Console.pde

44
libraries/AP_HAL_AVR/examples/ArduCopterLibs/ArduCopterLibs.pde
Unescape View File

@ -61,45 +61,6 @@ void stream_loopback(AP_HAL::Stream* s, uint32_t time) { @@ -61,45 +61,6 @@ void stream_loopback(AP_HAL::Stream* s, uint32_t time) {
}
}
void stream_console_loopback(AP_HAL::Stream* s, AP_HAL::ConsoleDriver* c,
uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
/* Read the uart, write to the console backend. */
if (s->available() > 0) {
int b;
b = s->read();
if (-1 != b) {
uint8_t tmp[1];
tmp[0] = (uint8_t) b;
c->backend_write(tmp, 1);
}
}
/* Loop back the console upon itself. */
{
int b;
b = c->read();
if (-1 != b) {
c->write((uint8_t)b);
}
}
/* Read the console backend, print to the uart. */
{
uint8_t tmp[1];
int readback = c->backend_read(tmp, 1);
if (readback > 0) {
s->write(tmp[0]);
}
}
}
}
void setup(void)
{
//
@ -114,11 +75,6 @@ void setup(void) @@ -114,11 +75,6 @@ void setup(void)
hal.console->println_P(PSTR("progmem"));
hal.console->printf("printf %d %u %#x %p %f %S\n", -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->printf_P(PSTR("printf_P %d %u %#x %p %f %S\n"), -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->println("loopback for 10sec:");
stream_loopback(hal.console, 10000);
hal.console->println("loopback done");
hal.console->println("done.");
for(;;);

59
libraries/AP_HAL_AVR/examples/ArduPlaneLibs/ArduPlaneLibs.pde
Unescape View File

@ -41,61 +41,6 @@ const AP_HAL::HAL& hal = AP_HAL_AVR_APM1; @@ -41,61 +41,6 @@ const AP_HAL::HAL& hal = AP_HAL_AVR_APM1;
#endif
void stream_loopback(AP_HAL::Stream* s, uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
if (s->available() > 0) {
int c;
c = s->read();
if (-1 != c) {
s->write((uint8_t)c);
}
}
}
}
void stream_console_loopback(AP_HAL::Stream* s, AP_HAL::ConsoleDriver* c,
uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
/* Read the uart, write to the console backend. */
if (s->available() > 0) {
int b;
b = s->read();
if (-1 != b) {
uint8_t tmp[1];
tmp[0] = (uint8_t) b;
c->backend_write(tmp, 1);
}
}
/* Loop back the console upon itself. */
{
int b;
b = c->read();
if (-1 != b) {
c->write((uint8_t)b);
}
}
/* Read the console backend, print to the uart. */
{
uint8_t tmp[1];
int readback = c->backend_read(tmp, 1);
if (readback > 0) {
s->write(tmp[0]);
}
}
}
}
void setup(void)
{
//
@ -111,10 +56,6 @@ void setup(void) @@ -111,10 +56,6 @@ void setup(void)
hal.console->printf("printf %d %u %#x %p %f %S\n", -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->printf_P(PSTR("printf_P %d %u %#x %p %f %S\n"), -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->println("loopback for 10sec:");
stream_loopback(hal.console, 10000);
hal.console->println("loopback done");
for(;;);
}

59
libraries/AP_HAL_AVR/examples/Console/Console.pde
Unescape View File

@ -20,61 +20,6 @@ const AP_HAL::HAL& hal = AP_HAL_AVR_APM2; @@ -20,61 +20,6 @@ const AP_HAL::HAL& hal = AP_HAL_AVR_APM2;
const AP_HAL::HAL& hal = AP_HAL_AVR_APM1;
#endif
void stream_loopback(AP_HAL::Stream* s, uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
if (s->available() > 0) {
int c;
c = s->read();
if (-1 != c) {
s->write((uint8_t)c);
}
}
}
}
void stream_console_loopback(AP_HAL::Stream* s, AP_HAL::ConsoleDriver* c,
uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
/* Read the uart, write to the console backend. */
if (s->available() > 0) {
int b;
b = s->read();
if (-1 != b) {
uint8_t tmp[1];
tmp[0] = (uint8_t) b;
c->backend_write(tmp, 1);
}
}
/* Loop back the console upon itself. */
{
int b;
b = c->read();
if (-1 != b) {
c->write((uint8_t)b);
}
}
/* Read the console backend, print to the uart. */
{
uint8_t tmp[1];
int readback = c->backend_read(tmp, 1);
if (readback > 0) {
s->write(tmp[0]);
}
}
}
}
void setup(void)
{
//
@ -90,10 +35,6 @@ void setup(void) @@ -90,10 +35,6 @@ void setup(void)
hal.console->printf("printf %d %u %#x %p %f %S\n", -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->printf_P(PSTR("printf_P %d %u %#x %p %f %S\n"), -1000, 1000, 1000, 1000, 1.2345, PSTR("progmem"));
hal.console->println("loopback for 10sec:");
stream_loopback(hal.console, 10000);
hal.console->println("loopback done");
for(;;);
}

56
libraries/AP_HAL_FLYMAPLE/examples/Console/Console.pde
Unescape View File

@ -17,62 +17,6 @@ @@ -17,62 +17,6 @@
const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
void stream_loopback(AP_HAL::Stream* s, uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
if (s->available() > 0) {
int c;
c = s->read();
if (-1 != c) {
s->write((uint8_t)c);
}
}
}
}
void stream_console_loopback(AP_HAL::Stream* s, AP_HAL::ConsoleDriver* c,
uint32_t time) {
uint32_t end = hal.scheduler->millis() + time;
for(;;) {
if (hal.scheduler->millis() >= end && time != 0) {
return;
}
/* Read the uart, write to the console backend. */
if (s->available() > 0) {
int b;
b = s->read();
if (-1 != b) {
uint8_t tmp[1];
tmp[0] = (uint8_t) b;
c->backend_write(tmp, 1);
}
}
/* Loop back the console upon itself. */
{
int b;
b = c->read();
if (-1 != b) {
c->write((uint8_t)b);
}
}
/* Read the console backend, print to the uart. */
{
uint8_t tmp[1];
int readback = c->backend_read(tmp, 1);
if (readback > 0) {
s->write(tmp[0]);
}
}
}
}
void setup(void)
{
//

Write Preview
Loading…
Cancel
Save