diff --git a/sbs.conf b/sbs.conf index 26cfb6ac6e53bc86336095d6a2a6241073aa696b..b879db4ca58e2ddc186c2f739679543f985d1659 100644 --- a/sbs.conf +++ b/sbs.conf @@ -475,7 +475,6 @@ Include: %shared %spi Defines: Main: drivers/test-l3gd20 -<<<<<<< HEAD [test-lsm9ds1] Type: test BoardId: stm32f407vg_stm32f4discovery @@ -484,14 +483,6 @@ Include: %shared %spi Defines: -DDEBUG Main: drivers/test-lsm9ds1 -[test-lsm9ds1-class] -Type: test -BoardId: stm32f407vg_stm32f4discovery -BinName: test-lsm9ds1-class -Include: %shared %spi -Defines: -DDEBUG -Main: drivers/test-lsm9ds1-class -======= [test-l3gd20-fifo] Type: test BoardId: stm32f429zi_stm32f4discovery @@ -499,7 +490,6 @@ BinName: test-l3gd20-fifo Include: %shared %spi Defines: Main: drivers/test-l3gd20-fifo ->>>>>>> origin/testing [test-rls] Type: test diff --git a/src/shared/sensors/LSM9DS1/LSM9DS1_AxelGyro.h b/src/shared/sensors/LSM9DS1/LSM9DS1_AxelGyro.h index 058bc329825ee0d715806727b26aece1bec03e03..a6a4a393781deceaaa619bea9dbe514ca627cdff 100644 --- a/src/shared/sensors/LSM9DS1/LSM9DS1_AxelGyro.h +++ b/src/shared/sensors/LSM9DS1/LSM9DS1_AxelGyro.h @@ -88,7 +88,7 @@ class LSM9DS1_XLG : public GyroSensor, public AccelSensor, public TemperatureSen ):fifo_enabled(fifo_enabled), fifo_watermark(fifo_watermark), spislave(bus, cs), axelFSR(axelRange), gyroFSR(gyroRange), odr(odr){ //SPI config - spislave.config.br = SPIBaudRate::DIV_64; //baud = fclk/64 + spislave.config.clock_div = SPIClockDivider::DIV64; } LSM9DS1_XLG( diff --git a/src/tests/drivers/test-lsm9ds1-class.cpp b/src/tests/drivers/test-lsm9ds1-class.cpp deleted file mode 100644 index 51c9191f01177bdfa6ec54b047d33e874ea41650..0000000000000000000000000000000000000000 --- a/src/tests/drivers/test-lsm9ds1-class.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/** - * test LSM9DS1 axel + gyro - * Copyright (c) 2020 Skyward Experimental Rocketry - * Authors: Andrea Milluzzo - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - - -#include "drivers/spi/SPIDriver.h" -#include "sensors/LSM9DS1/LSM9DS1_AxelGyro.h" - -using namespace miosix; - -typedef Gpio<GPIOA_BASE, 5> GpioSck; //questi sono i pin SPI per f407_discovery -typedef Gpio<GPIOA_BASE, 6> GpioMiso; -typedef Gpio<GPIOA_BASE, 7> GpioMosi; - -static const bool FIFO_ENABLED = false; - -//SPI -SPIBus bus(SPI1); -SPIBusConfig cfg; -GpioPin cs(GPIOE_BASE, 7); - - - -int main(){ - - cfg.br = SPIBaudRate::DIV_64; //max 10MHz - - { - FastInterruptDisableLock dLock; - - RCC->APB2ENR |= RCC_APB2ENR_SPI1EN; //SPI1 ENABLE - - GpioSck::mode(Mode::ALTERNATE); - GpioMiso::mode(Mode::ALTERNATE); - GpioMosi::mode(Mode::ALTERNATE); - cs.mode(Mode::OUTPUT); - - GpioSck::alternateFunction(5); - GpioMiso::alternateFunction(5); - GpioMosi::alternateFunction(5); - - GpioSck::speed(Speed::_25MHz); - - } - - cs.high(); - - LSM9DS1_XLG sensor1( - bus, - cs, - cfg, - LSM9DS1_XLG::AxelFSR::FS_8, - LSM9DS1_XLG::GyroFSR::FS_245, - LSM9DS1_XLG::ODR::ODR_952 - ); - - - - sensor1.getWhoami(); - - while(1) - { - Thread::sleep(500); - } - - - return 0; -} \ No newline at end of file diff --git a/src/tests/drivers/test-lsm9ds1.cpp b/src/tests/drivers/test-lsm9ds1.cpp index 9b23d2f3177551f329a91da953b5b106645e2270..49a77938285cdf5a021650a8290968a8a0b92039 100644 --- a/src/tests/drivers/test-lsm9ds1.cpp +++ b/src/tests/drivers/test-lsm9ds1.cpp @@ -45,7 +45,7 @@ GpioPin cs(GPIOE_BASE, 7); int main(){ - cfg.br = SPIBaudRate::DIV_64; //max 10MHz + cfg.clock_div=SPIClockDivider::DIV64; { FastInterruptDisableLock dLock; @@ -69,7 +69,6 @@ int main(){ LSM9DS1_XLG lsm9ds1( bus, cs, - cfg, LSM9DS1_XLG::AxelFSR::FS_8, LSM9DS1_XLG::GyroFSR::FS_245, LSM9DS1_XLG::ODR::ODR_952 @@ -85,7 +84,7 @@ int main(){ adata = *(lsm9ds1.accelDataPtr()); gdata = *(lsm9ds1.gyroDataPtr()); tdata = *(lsm9ds1.tempDataPtr()); - TRACE("TIMESTAMP:%lld\t\taxel: %.3f,%.3f,%.3f\t\tgyro: %.3f,%.3f,%.3f\t\ttemp: %.3f\n", + TRACE("TIMESTAMP:%lld\taxel: %.3f,%.3f,%.3f\tgyro: %.3f,%.3f,%.3f\ttemp: %.3f\n", tick-first_tick, adata.getX(), adata.getY(), adata.getZ(), gdata.getX(), gdata.getY(), gdata.getZ(),