mirror
/
IonizationChamber
kopia lustrzana https://github.com/RobertGawron/IonizationChamber
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

removed magic numbers

pull/106/head
RobertGawron 2019-08-04 14:49:41 +01:00
rodzic efd3b0d947
commit fc175b8af7
1 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
software/Firmware/Src/VoltageSensorActualValue.c
Wyświetl plik

@ -24,7 +24,10 @@
#define MCP3425_REG_BIT_GAIN_UPPER (1 << 1) #define MCP3425_REG_BIT_GAIN_UPPER (1 << 1)
#define MCP3425_REG_BIT_GAIN_LOWER (1 << 0) #define MCP3425_REG_BIT_GAIN_LOWER (1 << 0)
#define MCP3425_CONFIGURATION (MCP3425_REG_BIT_READY | MCP3425_REG_BIT_SAMPLE_RATE_UPPER) //#define MCP3425_CONFIGURATION (MCP3425_REG_BIT_READY | MCP3425_REG_BIT_SAMPLE_RATE_UPPER)
#define MCP3425_CONFIGURATION (MCP3425_REG_BIT_READY | MCP3425_REG_BIT_SAMPLE_RATE_LOWER)
#define MCP3425_READ_MEASSUREMENT 0x10
static void GPIO_setup(void); static void GPIO_setup(void);
static void I2C_setup(void); static void I2C_setup(void);
@ -44,7 +47,7 @@ bool VoltageSensorActualValue_MeasureValue(VoltageSensorActualValue_MeasurementD
// select adc configuration and start measurement // select adc configuration and start measurement
write(MCP3425_CONFIGURATION); write(MCP3425_CONFIGURATION);
write(0x10); write(MCP3425_READ_MEASSUREMENT);
*measurementData = read(0); *measurementData = read(0);
// getRegisterValue should return false on timeout and this should be later propagated to GUI component // getRegisterValue should return false on timeout and this should be later propagated to GUI component
@ -61,6 +64,7 @@ void GPIO_setup(void)
void I2C_setup(void) void I2C_setup(void)
{ {
// TODO magic numbers
I2C_DeInit(); I2C_DeInit();
I2C_Init(100000, I2C_Init(100000,
I2C_MASTER_ADDRESS, I2C_MASTER_ADDRESS,