Updated to work with Arduino Primo
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/f98fec55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/f98fec55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/f98fec55 Branch: refs/heads/develop Commit: f98fec55b2a0ef9e46beeba5139cfc4094d7c929 Parents: bf701fd Author: David G. Simmons <[email protected]> Authored: Fri Jan 13 12:06:15 2017 -0500 Committer: David G. Simmons <[email protected]> Committed: Tue Jan 17 10:02:35 2017 -0500 ---------------------------------------------------------------------- docs/os/tutorials/air_quality_ble.md | 4 ++++ docs/os/tutorials/air_quality_sensor.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/f98fec55/docs/os/tutorials/air_quality_ble.md ---------------------------------------------------------------------- diff --git a/docs/os/tutorials/air_quality_ble.md b/docs/os/tutorials/air_quality_ble.md index c35adb6..7e35660 100644 --- a/docs/os/tutorials/air_quality_ble.md +++ b/docs/os/tutorials/air_quality_ble.md @@ -1,6 +1,10 @@ ## Air quality sensor project via Bluetooth +<<<<<<< HEAD This is a follow-on project to the [Basic Air Quality Sensor](air_quality_esnsor.md) project so it is +======= +This is a follow-on project to the [Basic Air Quality Sensor](air_quality_sensor.md) project so it is +>>>>>>> Updated to work with Arduino Primo assumed that you have worked through that project and have your CO2 sensor working properly with your Arduino Primo board. http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/f98fec55/docs/os/tutorials/air_quality_sensor.md ---------------------------------------------------------------------- diff --git a/docs/os/tutorials/air_quality_sensor.md b/docs/os/tutorials/air_quality_sensor.md index b697401..2881e34 100644 --- a/docs/os/tutorials/air_quality_sensor.md +++ b/docs/os/tutorials/air_quality_sensor.md @@ -502,7 +502,6 @@ for this second UART. Those changes are as follows: UART_0_PIN_RX: 24 ``` - With this in place, you can refer to serial port where your SenseAir sensor by a logical number. This makes the code more platform independent - you could connect this sensor to another board, like Olimex. You will also use the HAL UART abstraction to do the UART port setup and data transfer. That way you don't need to have any platform dependent pieces within your little driver. You will now see what the driver code ends up looking like. Here's the header file, filled in from the stub you created earlier.
