private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major updates:

Browse Source 
- added DAConverter(s)
- added ADConverter(s)
- Fixed some display issues
- Made repair process and signalProfileGenerator calculate with voltages (signed) instead of DAC/ADC values
- Fixed several bugs in task handlings
- Put display data mirror into dedicated file displaycontent

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@261 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-10-24 13:56:55 +00:00
parent e3ca058c96
commit bb08cae83a
35 changed files with 1689 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/ADCDevice.h
View File

@@ -31,22 +31,71 @@
// Include files
// -----------------------------------------------------------------------------
#include <stdbool.h>
#include "stm32f10x.h"
// -----------------------------------------------------------------------------
// Constant and macro definitions
// -----------------------------------------------------------------------------
struct ADCDevice;
typedef uint32_t (*ADCReadFunction)(const struct ADCDevice* self);
struct ADCDevice
{
ADCReadFunction _read;
bool initialized;
unsigned int resolutionInBits;
};
// -----------------------------------------------------------------------------
// Type definitions.
// Function declarations
// -----------------------------------------------------------------------------
/** ----------------------------------------------------------------------------
* ADCDevice_construct
* Constructor for ADC device
*
* @param self ADC object
* @param read Pointer to read function
*
* @return ErrorStatus SUCCESS if construction was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus ADCDevice_construct(struct ADCDevice* self, ADCReadFunction read, unsigned int resolutionInBits);
// -----------------------------------------------------------------------------
// Function declarations
// -----------------------------------------------------------------------------
/** ----------------------------------------------------------------------------
* ADCDevice_destruct
* Destructor for ADC device
*
* @param self ADC object
*
* @return void
*
* @todo
* -----------------------------------------------------------------------------
*/
extern void ADCDevice_destruct(struct ADCDevice* self);
/** ----------------------------------------------------------------------------
* ADCDevice_read
* Reads a value from the ADC device input
*
* @param self ADC object
* @param voltage value in volt (signed) to write to output
*
* @return ErrorStatus
*
* @todo
* -----------------------------------------------------------------------------
*/
extern uint32_t ADCDevice_read(const struct ADCDevice* self);
#endif /* INC_ADCDEVICE_H_ */

57
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/DACDevice.h
View File

@@ -31,6 +31,10 @@
// Include files
// -----------------------------------------------------------------------------
#include <stdbool.h>
#include "stm32f10x.h"
// -----------------------------------------------------------------------------
// Constant and macro definitions
@@ -42,11 +46,64 @@
// Type definitions.
// -----------------------------------------------------------------------------
struct DACDevice;
typedef ErrorStatus (*DACWriteFunction)(const struct DACDevice* self, uint32_t voltage);
struct DACDevice
{
DACWriteFunction _write;
bool initialized;
unsigned int resolutionInBits;
};
// -----------------------------------------------------------------------------
// Function declarations
// -----------------------------------------------------------------------------
/** ----------------------------------------------------------------------------
* DACDevice_construct
* Constructor for DAC device
*
* @param self DAC object
* @param write Pointer to write function
*
* @return ErrorStatus SUCCESS if construction was successful
* ERROR otherwise
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus DACDevice_construct(struct DACDevice* self, DACWriteFunction write, unsigned int resolutionInBits);
/** ----------------------------------------------------------------------------
* DACDevice_destruct
* Destructor for DAC device
*
* @param self DAC object
*
* @return void
*
* @todo
* -----------------------------------------------------------------------------
*/
extern void DACDevice_destruct(struct DACDevice* self);
/** ----------------------------------------------------------------------------
* DACDevice_construct
* Writes a value to the DAC device output
*
* @param self DAC object
* @param voltage value in volt (signed) to write to output
*
* @return ErrorStatus
*
* @todo
* -----------------------------------------------------------------------------
*/
extern ErrorStatus DACDevice_write(const struct DACDevice* self, uint32_t voltage);
#endif /* INC_DACDEVICE_H_ */

5
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/MAX5715.h
View File

@@ -31,6 +31,9 @@
// Include files
// -----------------------------------------------------------------------------
#include <stdbool.h>
#include "DACDevice.h"
#include "IODevice.h"
#include "spi.h"
@@ -38,6 +41,7 @@
// Constant and macro definitions
// -----------------------------------------------------------------------------
#define MAX5715_NUMBER_OF_DACS (4)
#define MAX5715_RESOLUTION_IN_BITS (12)
#define MAX5715_SPI_MAX_CLK_HZ (50000000)
// SPI settings
@@ -120,6 +124,7 @@ struct MAX5715;
struct MAX5715_DAC
{
struct DACDevice dacDevice;
struct MAX5715* parent;
uint8_t id;
uint16_t value;