mainscnt/mains-frequency-counter-rpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-10-04 11:52:25 +01:00
parent de23e55290
commit 27dec07ef6
4 changed files with 83 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snippets/test1/test1.c
View File

@ -154,7 +154,7 @@ int main (void) {
my_diff = diff;
pthread_mutex_unlock(&counterMutex);
if (my_diff != lastDiff) {
if (my_diff != lastDiff || 1) {
lastDiff = my_diff;
double f = 1.0 / (((double) my_diff) / 1000000.0);
printf("%d %d %d %f\n", my_ec, my_counter, my_diff, f);

86
src/LS7366R.c
View File

@ -5,37 +5,99 @@
#include "LS7366R.h"
void ls7366rWriteCmd(uint8_t c) {
const uint8_t REG_MDR0 = 0b00001000;
const uint8_t REG_MDR1 = 0b00010000;
const uint8_t REG_DTR = 0b00011000;
const uint8_t REG_CNTR = 0b00100000;
const uint8_t REG_OTR = 0b00101000;
const uint8_t REG_STR = 0b00110000;
const uint8_t CMD_CLR = 0b00000000;
const uint8_t CMD_RD = 0b01000000;
const uint8_t CMD_WR = 0b10000000;
const uint8_t CMD_LOAD = 0b11000000;
const uint8_t STR_CY = 0b10000000;
const uint8_t STR_BW = 0b01000000;
const uint8_t STR_CMP = 0b00100000;
const uint8_t STR_IDX = 0b00010000;
const uint8_t STR_CEN = 0b00001000;
const uint8_t STR_PLS = 0b00000100;
const uint8_t STR_UD = 0b00000010;
const uint8_t STR_S = 0b00000001;
const uint8_t MDR0_NOQ = 0b00000000;
const uint8_t MDR0_Q1 = 0b00000001;
const uint8_t MDR0_Q2 = 0b00000010;
const uint8_t MDR0_Q4 = 0b00000011;
const uint8_t MDR0_FRC = 0b00000000;
const uint8_t MDR0_SCC = 0b00000100;
const uint8_t MDR0_RLC = 0b00001000;
const uint8_t MDR0_MNC = 0b00001100;
const uint8_t MDR0_DI = 0b00000000;
const uint8_t MDR0_ILC = 0b00010000;
const uint8_t MDR0_IRC = 0b00100000;
const uint8_t MDR0_ILO = 0b00110000;
const uint8_t MDR0_AI = 0b00000000;
const uint8_t MDR0_SI = 0b01000000;
const uint8_t MDR0_FC1 = 0b00000000;
const uint8_t MDR0_FC2 = 0b10000000;
const uint8_t MDR1_4CM = 0b00000000;
const uint8_t MDR1_3CM = 0b00000001;
const uint8_t MDR1_2CM = 0b00000010;
const uint8_t MDR1_1CM = 0b00000011;
const uint8_t MDR1_EC = 0b00000000;
const uint8_t MDR1_DC = 0b00000100;
const uint8_t MDR1_F_IDX = 0b00010000;
const uint8_t MDR1_F_CMP = 0b00100000;
const uint8_t MDR1_F_BW = 0b01000000;
const uint8_t MDR1_F_CY = 0b10000000;
uint8_t spiChan = 0;
static void writeCmd(uint8_t c) {
uint8_t buf[1];
buf[0] = c;
wiringPiSPIDataRW(SPI_CHAN, buf, 1);
wiringPiSPIDataRW(spiChan, buf, 1);
}
void ls7366rWriteCmdData(uint8_t c, uint8_t d) {
static void writeCmdData(uint8_t c, uint8_t d) {
uint8_t buf[2];
buf[0] = c;
buf[1] = d;
wiringPiSPIDataRW(SPI_CHAN, buf, 2);
wiringPiSPIDataRW(spiChan, buf, 2);
}
uint8_t ls7366rRead8(uint8_t c) {
/* unused so far */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static uint8_t read8(uint8_t c) {
uint8_t buf[2];
buf[0] = c;
wiringPiSPIDataRW(SPI_CHAN, buf, 2);
wiringPiSPIDataRW(spiChan, buf, 2);
return buf[1];
}
#pragma GCC diagnostic pop
uint32_t ls7366rRead32(uint8_t c) {
static uint32_t read32(uint8_t c) {
uint8_t buf[5];
buf[0] = c;
wiringPiSPIDataRW(SPI_CHAN, buf, 5);
wiringPiSPIDataRW(spiChan, buf, 5);
uint32_t r = ((uint32_t)buf[1] << 24) | ((uint32_t)buf[2] << 16) | ((uint32_t)buf[3] << 8) | ((uint32_t)buf[4]);
return r;
}
void ls7366rInit() {
ls7366rWriteCmd(CMD_CLR | REG_STR);
ls7366rWriteCmd(CMD_CLR | REG_CNTR);
ls7366rWriteCmdData(CMD_WR | REG_MDR0, MDR0_ILO);
void ls7366rInit(uint8_t spiChanIn) {
spiChan = spiChanIn;
writeCmd(CMD_CLR | REG_STR);
writeCmd(CMD_CLR | REG_CNTR);
writeCmdData(CMD_WR | REG_MDR0, MDR0_ILO);
}
uint32_t ls7366rReadOTR() {
return read32(CMD_RD | REG_OTR);
}

58
src/LS7366R.h
View File

@ -4,60 +4,8 @@
#include <stdint.h>
const uint8_t REG_MDR0 = 0b00001000;
const uint8_t REG_MDR1 = 0b00010000;
const uint8_t REG_DTR = 0b00011000;
const uint8_t REG_CNTR = 0b00100000;
const uint8_t REG_OTR = 0b00101000;
const uint8_t REG_STR = 0b00110000;
const uint8_t CMD_CLR = 0b00000000;
const uint8_t CMD_RD = 0b01000000;
const uint8_t CMD_WR = 0b10000000;
const uint8_t CMD_LOAD = 0b11000000;
const uint8_t STR_CY = 0b10000000;
const uint8_t STR_BW = 0b01000000;
const uint8_t STR_CMP = 0b00100000;
const uint8_t STR_IDX = 0b00010000;
const uint8_t STR_CEN = 0b00001000;
const uint8_t STR_PLS = 0b00000100;
const uint8_t STR_UD = 0b00000010;
const uint8_t STR_S = 0b00000001;
const uint8_t MDR0_NOQ = 0b00000000;
const uint8_t MDR0_Q1 = 0b00000001;
const uint8_t MDR0_Q2 = 0b00000010;
const uint8_t MDR0_Q4 = 0b00000011;
const uint8_t MDR0_FRC = 0b00000000;
const uint8_t MDR0_SCC = 0b00000100;
const uint8_t MDR0_RLC = 0b00001000;
const uint8_t MDR0_MNC = 0b00001100;
const uint8_t MDR0_DI = 0b00000000;
const uint8_t MDR0_ILC = 0b00010000;
const uint8_t MDR0_IRC = 0b00100000;
const uint8_t MDR0_ILO = 0b00110000;
const uint8_t MDR0_AI = 0b00000000;
const uint8_t MDR0_SI = 0b01000000;
const uint8_t MDR0_FC1 = 0b00000000;
const uint8_t MDR0_FC2 = 0b10000000;
const uint8_t MDR1_4CM = 0b00000000;
const uint8_t MDR1_3CM = 0b00000001;
const uint8_t MDR1_2CM = 0b00000010;
const uint8_t MDR1_1CM = 0b00000011;
const uint8_t MDR1_EC = 0b00000000;
const uint8_t MDR1_DC = 0b00000100;
const uint8_t MDR1_F_IDX = 0b00010000;
const uint8_t MDR1_F_CMP = 0b00100000;
const uint8_t MDR1_F_BW = 0b01000000;
const uint8_t MDR1_F_CY = 0b10000000;
void ls7366rWriteCmd(uint8_t c);
void ls7366rWriteCmdData(uint8_t c, uint8_t d);
uint8_t ls7366rRead8(uint8_t c);
uint32_t ls7366rRead32(uint8_t c);
void ls7366rInit();
void ls7366rInit(uint8_t spiChanIn);
uint32_t ls7366rReadOTR();
#endif // _LS7366R_H_
#endif // _LS7366R_H_

14
src/counter.c
View File

@ -24,7 +24,7 @@ pthread_cond_t eventSignal = PTHREAD_COND_INITIALIZER;
void isr() {
static uint32_t lastCounter = 0;
uint32_t currentCounter = read32(CMD_RD | REG_OTR);
uint32_t currentCounter = ls7366rReadOTR();
pthread_mutex_lock(&counterMutex);
diff = currentCounter - lastCounter;
@ -53,13 +53,12 @@ void init() {
}
int main (void) {
static uint32_t lastDiff = 0;
uint32_t my_ec = 0;
uint32_t my_counter = 0;
uint32_t my_diff = 0;
init();
initCounter();
ls7366rInit(SPI_CHAN);
while (1) {
pthread_mutex_lock(&eventMutex);
@ -72,10 +71,7 @@ int main (void) {
my_diff = diff;
pthread_mutex_unlock(&counterMutex);
if (my_diff != lastDiff) {
lastDiff = my_diff;
double f = 1.0 / (((double) my_diff) / 1000000.0);
printf("%d %d %d %f\n", my_ec, my_counter, my_diff, f);
}
double f = 1.0 / (((double) my_diff) / 1000000.0);
printf("%d %d %d %f\n", my_ec, my_counter, my_diff, f);
}
}
}