ALPAKA/driver-w25qxxx
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/driver-w25qxxx.git synced 2025-08-02 04:21:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some driver updates to work for the W25Q128

Browse Source
This commit is contained in:
dario 2024-04-13 17:53:22 +02:00
parent 28f1f1ecce
commit b6122a2dd8
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sta/sensors/w25qxx.hpp → include/sta/drivers/w25qxx.hpp
View File

@ -2,7 +2,7 @@
#define STA_SENSORS_W25Q128_HPP #define STA_SENSORS_W25Q128_HPP
#include <sta/bus/spi/device.hpp> #include <sta/bus/spi/device.hpp>
#include <sta/sensors/w25qxx_defs.hpp> #include <sta/drivers/w25qxx_defs.hpp>
namespace sta namespace sta

0
include/sta/sensors/w25qxx_defs.hpp → include/sta/drivers/w25qxx_defs.hpp
View File

25
src/w25qxx.cpp
View File

@ -1,9 +1,8 @@
#include <sta/sensors/w25qxx.hpp>
#include <string.h> #include <string.h>
#include <sta/debug/assert.hpp> #include <sta/debug/assert.hpp>
#include <sta/debug/debug.hpp> #include <sta/debug/debug.hpp>
#include <sta/drivers/w25qxx.hpp>
namespace sta namespace sta
@ -18,6 +17,13 @@ namespace sta
uint8_t W25Qxx::init() uint8_t W25Qxx::init()
{ {
powerDown();
if (!releasePowerDown())
{
return 0;
}
// Check if the chip returns the correct device id. // Check if the chip returns the correct device id.
if (getManufacturerID() != W25QXX_DEVICE_ID_RESULT) if (getManufacturerID() != W25QXX_DEVICE_ID_RESULT)
{ {
@ -33,11 +39,6 @@ namespace sta
} }
} }
if (!releasePowerDown())
{
return 0;
}
return 1; return 1;
} }
@ -69,11 +70,11 @@ namespace sta
uint8_t W25Qxx::getManufacturerID() uint8_t W25Qxx::getManufacturerID()
{ {
uint8_t dummy[3] = {0, 0, 0}; uint8_t dummy[3] = {0, 0, 0};
uint8_t id; uint8_t id[2] = {0, 0};
busRead(W25QXX_DEVICE_ID, &id, 1, dummy, 3); busRead(W25QXX_DEVICE_ID, id, 2, dummy, 3);
return id; return id[0];
} }
uint64_t W25Qxx::getUniqueID() uint64_t W25Qxx::getUniqueID()
@ -98,7 +99,7 @@ namespace sta
uint8_t status = 0; uint8_t status = 0;
readStatusRegister(1, &status); readStatusRegister(1, &status);
return (0x01 && status) == 0x01; return (0x01 & status) == 0x01;
} }
uint8_t W25Qxx::readData(uint32_t address, uint8_t * buffer, size_t length, bool fast /* = true */) uint8_t W25Qxx::readData(uint32_t address, uint8_t * buffer, size_t length, bool fast /* = true */)
@ -293,7 +294,7 @@ namespace sta
uint8_t status = 0; uint8_t status = 0;
readStatusRegister(1, &status); readStatusRegister(1, &status);
return (0x02 && status) == 0x02; return (0x02 & status) == 0x02;
} }
uint8_t W25Qxx::sectorErase(uint32_t address) uint8_t W25Qxx::sectorErase(uint32_t address)