diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-07-31 21:00:26 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-07-31 21:00:32 +0200 |
| commit | 455775a4a028c886d4d32dc816d57dff5bfae8aa (patch) | |
| tree | d6e2e1996d90e4df05087d1706b42c75934ba1a2 /trygvisio_soil_moisture.ino | |
| parent | 930b9e23ab981251e0cbd839c5a2f3a769c3fb47 (diff) | |
| download | trygvisio_soil_moisture-455775a4a028c886d4d32dc816d57dff5bfae8aa.tar.gz trygvisio_soil_moisture-455775a4a028c886d4d32dc816d57dff5bfae8aa.tar.bz2 trygvisio_soil_moisture-455775a4a028c886d4d32dc816d57dff5bfae8aa.tar.xz trygvisio_soil_moisture-455775a4a028c886d4d32dc816d57dff5bfae8aa.zip | |
o Adding Board #4.
Diffstat (limited to 'trygvisio_soil_moisture.ino')
| -rw-r--r-- | trygvisio_soil_moisture.ino | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/trygvisio_soil_moisture.ino b/trygvisio_soil_moisture.ino index a43ea26..5c1a152 100644 --- a/trygvisio_soil_moisture.ino +++ b/trygvisio_soil_moisture.ino @@ -123,13 +123,17 @@ static void setup_rf() { else { aci_state.aci_setup_info.services_pipe_type_mapping = NULL; } - aci_state.aci_setup_info.number_of_pipes = NUMBER_OF_PIPES; - aci_state.aci_setup_info.setup_msgs = (hal_aci_data_t*)setup_msgs; - aci_state.aci_setup_info.num_setup_msgs = NB_SETUP_MESSAGES; + aci_state.aci_setup_info.number_of_pipes = NUMBER_OF_PIPES; + aci_state.aci_setup_info.setup_msgs = (hal_aci_data_t*)setup_msgs; + aci_state.aci_setup_info.num_setup_msgs = NB_SETUP_MESSAGES; // Tell the ACI library, the MCU to nRF8001 pin connections. // The Active pin is optional and can be marked UNUSED -// aci_state.aci_pins.board_name = REDBEARLAB_SHIELD_V2; + + // SPI_CLOCK_DIV8 = 2MHz SPI speed + // SPI_CLOCK_DIV16 = 1MHz SPI speed + +#ifdef ARDUINO_BLEND_MICRO aci_state.aci_pins.board_name = REDBEARLAB_SHIELD_V1_1; aci_state.aci_pins.reqn_pin = 6; aci_state.aci_pins.rdyn_pin = 7; @@ -137,15 +141,32 @@ static void setup_rf() { aci_state.aci_pins.miso_pin = MISO; aci_state.aci_pins.sck_pin = SCK; - // SPI_CLOCK_DIV8 = 2MHz SPI speed - // SPI_CLOCK_DIV16 = 1MHz SPI speed aci_state.aci_pins.spi_clock_divider = SPI_CLOCK_DIV8; - aci_state.aci_pins.reset_pin = UNUSED; //4 for Nordic board, UNUSED for REDBEARLAB_SHIELD_V1_1 + aci_state.aci_pins.reset_pin = UNUSED; aci_state.aci_pins.active_pin = UNUSED; aci_state.aci_pins.optional_chip_sel_pin = UNUSED; aci_state.aci_pins.interface_is_interrupt = false; aci_state.aci_pins.interrupt_number = 4; +#error wat +#elif ARDUINO_AVR_LEONARDO // Assumes OLIMEXINO-32U4 and UEXT + aci_state.aci_pins.board_name = BOARD_DEFAULT; + aci_state.aci_pins.reqn_pin = 2; + aci_state.aci_pins.rdyn_pin = 13; + aci_state.aci_pins.mosi_pin = MOSI; + aci_state.aci_pins.miso_pin = MISO; + aci_state.aci_pins.sck_pin = SCK; + + aci_state.aci_pins.spi_clock_divider = SPI_CLOCK_DIV8; + aci_state.aci_pins.reset_pin = 3; + aci_state.aci_pins.active_pin = UNUSED; + aci_state.aci_pins.optional_chip_sel_pin = UNUSED; + + aci_state.aci_pins.interface_is_interrupt = false; +// aci_state.aci_pins.interrupt_number = 4; +#else +#error unknown board type +#endif // We reset the nRF8001 here by toggling the RESET line connected to the nRF8001 // If the RESET line is not available we call the ACI Radio Reset to soft reset the nRF8001 |