alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.7.0 AD985X

Browse Source
This commit is contained in:
Rob Tillaart 2024-02-20 12:14:24 +01:00
parent c8ec50f78e
commit 0a4df20c7e
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AD985X/AD985X.cpp
View File

@ -1,7 +1,7 @@
//
// FILE: AD985X.cpp
// AUTHOR: Rob Tillaart
// VERSION: 0.6.0
// VERSION: 0.7.0
// DATE: 2019-02-08
// PURPOSE: Class for AD9850 and AD9851 function generator
// URL: https://github.com/RobTillaart/AD985X
@ -35,6 +35,7 @@ AD9850::AD9850(uint8_t slaveSelect, uint8_t resetPin, uint8_t FQUDPin, __SPI_CLA
_mySPI = mySPI;
_dataOut = 0;
_clock = spiClock;
_factoryMask = 0xFC;
}
// SOFTWARE SPI
@ -47,6 +48,7 @@ AD9850::AD9850(uint8_t slaveSelect, uint8_t resetPin, uint8_t FQUDPin, uint8_t s
_mySPI = NULL;
_dataOut = spiData;
_clock = spiClock;
_factoryMask = 0xFC;
}
@ -161,7 +163,7 @@ void AD9850::writeData()
data >>= 8;
_mySPI->transfer(data & 0xFF);
_mySPI->transfer(data >> 8);
_mySPI->transfer(_config & 0xFC); // mask factory test bit
_mySPI->transfer(_config & _factoryMask); // mask factory test bits
_mySPI->endTransaction();
}
else
@ -172,7 +174,7 @@ void AD9850::writeData()
data >>= 8;
swSPI_transfer(data & 0xFF);
swSPI_transfer(data >> 8);
swSPI_transfer(_config & 0xFC); // mask factory test bit
swSPI_transfer(_config & _factoryMask); // mask factory test bits
}
digitalWrite(_select, LOW);
@ -265,11 +267,13 @@ void AD9850::update()
AD9851::AD9851(uint8_t slaveSelect, uint8_t resetPin, uint8_t FQUDPin, __SPI_CLASS__ * mySPI, uint8_t spiClock) : AD9850(slaveSelect, resetPin, FQUDPin, mySPI, spiClock)
{
_factoryMask = 0xFD;
}
AD9851::AD9851(uint8_t slaveSelect, uint8_t resetPin, uint8_t FQUDPin, uint8_t spiData, uint8_t spiClock) : AD9850(slaveSelect, resetPin, FQUDPin, spiData, spiClock)
{
_factoryMask = 0xFD;
}

9
libraries/AD985X/AD985X.h
View File

@ -2,7 +2,7 @@
//
// FILE: AD985X.h
// AUTHOR: Rob Tillaart
// VERSION: 0.6.0
// VERSION: 0.7.0
// DATE: 2019-02-08
// PURPOSE: Class for AD9850 and AD9851 function generator
// URL: https://github.com/RobTillaart/AD985X
@ -12,7 +12,7 @@
#include "SPI.h"
#define AD985X_LIB_VERSION (F("0.6.0"))
#define AD985X_LIB_VERSION (F("0.7.0"))
#ifndef __SPI_CLASS__
@ -106,7 +106,10 @@ protected:
uint32_t _factor = 0;
uint8_t _config = 0;
int32_t _offset = 0;
bool _autoUpdate = true;
bool _autoUpdate = true;
// _factoryMask see PR #32,
// 0xFD is safe value for both AD9850/51
uint8_t _factoryMask = 0xFD;
};

8
libraries/AD985X/CHANGELOG.md
View File

@ -6,7 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [0.6.0] - 2024-002-04
## [0.7.0] - 2024-02-20
- Fix #33 AD9851::setRefClockHigh(), thanks to wh201906
- extended PR #32 to be more robust.
----
## [0.6.0] - 2024-02-04
- Fixed SW SPI interface, thanks to wh201906
----

2
libraries/AD985X/library.json
View File

@ -15,7 +15,7 @@
"type": "git",
"url": "https://github.com/RobTillaart/AD985X.git"
},
"version": "0.6.0",
"version": "0.7.0",
"license": "MIT",
"frameworks": "*",
"platforms": "*",

2
libraries/AD985X/library.properties
View File

@ -1,5 +1,5 @@
name=AD985X
version=0.6.0
version=0.7.0
author=Rob Tillaart <rob.tillaart@gmail.com>
maintainer=Rob Tillaart <rob.tillaart@gmail.com>
sentence=Arduino library for AD9850 and AD9851 function generators. Supports both hardware SPI as software SPI.