mirror of https://github.com/arendst/Tasmota.git
Refactor GDK101 driver
This commit is contained in:
Theo Arends
parent
21bb822dec
commit
c1db67ce37
|
|
@ -23,7 +23,7 @@
|
|||
/*********************************************************************************************\
|
||||
* GDK101 gamma radiation sensor ftlab.co.kr
|
||||
*
|
||||
* For background information see http://allsmartlab.com/eng/294-2/
|
||||
* For background information see http://allsmartlab.com/eng/294-2/ and AN_GDK101_V1.1_I2C.pdf
|
||||
*
|
||||
* I2C Address:
|
||||
* A0 Short, A1 Short : 0x18
|
||||
|
|
@ -43,17 +43,15 @@
|
|||
#define GDK101_ADDRESS4 0x1B
|
||||
|
||||
// I2C register
|
||||
#define READ_FIRMWARE 0xB4
|
||||
#define RESET 0xA0
|
||||
#define READ_STATUS 0xB0
|
||||
#define READ_MEASURING_TIME 0xB1
|
||||
#define READ_10MIN_AVG 0xB2
|
||||
#define READ_1MIN_AVG 0xB3
|
||||
#define GDK101_RESET 0xA0
|
||||
#define GDK101_READ_STATUS 0xB0
|
||||
#define GDK101_READ_MEASURING_TIME 0xB1
|
||||
#define GDK101_READ_10MIN_AVG 0xB2
|
||||
#define GDK101_READ_1MIN_AVG 0xB3
|
||||
#define GDK101_READ_FIRMWARE 0xB4
|
||||
|
||||
// gdk101 variables
|
||||
uint8_t gdk101_address;
|
||||
uint8_t gdk101_addresses[] = { GDK101_ADDRESS1, GDK101_ADDRESS2, GDK101_ADDRESS3, GDK101_ADDRESS4 };
|
||||
uint8_t gdk101_discovered = false;
|
||||
|
||||
typedef enum {
|
||||
GDK_STATUS_READY,
|
||||
|
|
@ -82,86 +80,69 @@ typedef struct gdk_avg_dose {
|
|||
uint8_t fractional;
|
||||
} gdk_avg_dose_t;
|
||||
|
||||
bool gdk_ready = false;
|
||||
gdk_fW_version_t fw_version;
|
||||
gdk_avg_dose_t mea_10min_avg;
|
||||
gdk_avg_dose_t mea_1min_avg;
|
||||
gdk_status_data_t gdk_status = {GDK_STATUS_INVALID, false};
|
||||
gdk_measuring_time_t gdk_time = {0, 0};
|
||||
struct GDK {
|
||||
uint32_t time;
|
||||
// gdk_measuring_time_t time = {0, 0};
|
||||
gdk_fW_version_t version;
|
||||
gdk_avg_dose_t ard_10min;
|
||||
gdk_avg_dose_t ard_1min;
|
||||
gdk_status_data_t status = {GDK_STATUS_INVALID, false};
|
||||
uint8_t address;
|
||||
uint8_t evr10 = 0;
|
||||
// uint8_t vibr = 0;
|
||||
bool ready = false;
|
||||
} Gdk;
|
||||
|
||||
#ifdef USE_WEBSERVER
|
||||
const char HTTP_GDK101_FW[] PROGMEM = "{s}%s " "FW Version" "{m}%d.%d{e}";
|
||||
const char HTTP_GDK101_STATUS[] PROGMEM = "{s}%s " "Status" "{m}%d{e}";
|
||||
const char HTTP_GDK101_VIB_STATUS[] PROGMEM = "{s}%s " "Vibration Status" "{m}%d{e}";
|
||||
const char HTTP_GDK101_MEAS_TIME[] PROGMEM = "{s}%s " "Measurement Time" "{m}%d:%02d{e}";
|
||||
#endif // USE_WEBSERVER
|
||||
/********************************************************************************************/
|
||||
|
||||
bool gdk101_reset(bool *reset);
|
||||
|
||||
void gdk101_err_log(bool ret) {
|
||||
void Gdk101ErrLog(bool ret) {
|
||||
if (!ret) {
|
||||
DEBUG_SENSOR_LOG("GDK101: I2C read error");
|
||||
}
|
||||
}
|
||||
|
||||
void gdk101_detect(void)
|
||||
{
|
||||
bool ret = false;
|
||||
bool reset = false;
|
||||
void Gdk101Detect(void) {
|
||||
for (uint32_t i = 0; i < sizeof(gdk101_addresses); i++) {
|
||||
gdk101_address = gdk101_addresses[i];
|
||||
if (!I2cSetDevice(gdk101_address)) {
|
||||
continue; // do not make the next step without a confirmed device on the bus
|
||||
Gdk.address = gdk101_addresses[i];
|
||||
if (!I2cSetDevice(Gdk.address)) {
|
||||
continue; // Do not make the next step without a confirmed device on the bus
|
||||
}
|
||||
ret = gdk101_reset(&reset);
|
||||
bool reset = false;
|
||||
bool ret = Gdk101Reset(&reset);
|
||||
if (ret) {
|
||||
if (reset) {
|
||||
delay(10);
|
||||
I2cSetActiveFound(gdk101_address, "GDK101");
|
||||
ret = gdk101_get_fw_version(&fw_version);
|
||||
gdk101_err_log(ret);
|
||||
gdk_ready = true;
|
||||
I2cSetActiveFound(Gdk.address, "GDK101");
|
||||
ret = Gdk101Firmware(&Gdk.version);
|
||||
Gdk101ErrLog(ret);
|
||||
Gdk.ready = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void gdk101_init() {
|
||||
|
||||
if (gdk_ready) return;
|
||||
|
||||
gdk101_detect();
|
||||
|
||||
}
|
||||
|
||||
bool gdk101_reset(bool *reset) {
|
||||
bool Gdk101Reset(bool *reset) {
|
||||
uint8_t buf;
|
||||
bool ret = false;
|
||||
ret = I2cValidRead8(&buf, gdk101_address, RESET);
|
||||
bool ret = I2cValidRead8(&buf, Gdk.address, GDK101_RESET);
|
||||
if (ret) {
|
||||
*reset = (bool) buf;
|
||||
*reset = (bool) buf; // 0 = Reset fail, 1 = Reset success
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool gdk101_get_fw_version(struct gdk_fW_version *fw) {
|
||||
bool Gdk101Firmware(struct gdk_fW_version *fw) {
|
||||
uint8_t buf[2];
|
||||
bool ret = false;
|
||||
ret = I2cValidRead16LE((uint16_t*) buf, gdk101_address, READ_FIRMWARE);
|
||||
bool ret = I2cValidRead16LE((uint16_t*) buf, Gdk.address, GDK101_READ_FIRMWARE);
|
||||
if (ret) {
|
||||
fw->major = buf[0];
|
||||
fw->minor = buf[1];
|
||||
fw->major = buf[0]; // 0
|
||||
fw->minor = buf[1]; // 6
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool gdk101_get_10min_avg(struct gdk_avg_dose *avg) {
|
||||
bool Gdk101Ard10min(struct gdk_avg_dose *avg) {
|
||||
uint8_t buf[2];
|
||||
bool ret = false;
|
||||
ret = I2cValidRead16LE((uint16_t*) buf, gdk101_address, READ_10MIN_AVG);
|
||||
bool ret = I2cValidRead16LE((uint16_t*) buf, Gdk.address, GDK101_READ_10MIN_AVG);
|
||||
if (ret) {
|
||||
avg->integral = buf[0];
|
||||
avg->fractional = buf[1];
|
||||
|
|
@ -169,10 +150,9 @@ bool gdk101_get_10min_avg(struct gdk_avg_dose *avg) {
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool gdk101_get_1min_avg(struct gdk_avg_dose *avg) {
|
||||
bool Gdk101Ard1min(struct gdk_avg_dose *avg) {
|
||||
uint8_t buf[2];
|
||||
bool ret = false;
|
||||
ret = I2cValidRead16LE((uint16_t*) buf, gdk101_address, READ_1MIN_AVG);
|
||||
bool ret = I2cValidRead16LE((uint16_t*) buf, Gdk.address, GDK101_READ_1MIN_AVG);
|
||||
if (ret) {
|
||||
avg->integral = buf[0];
|
||||
avg->fractional = buf[1];
|
||||
|
|
@ -180,21 +160,20 @@ bool gdk101_get_1min_avg(struct gdk_avg_dose *avg) {
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool gdk101_get_status(struct gdk_status_data *status) {
|
||||
bool Gdk101Status(struct gdk_status_data *status) {
|
||||
uint8_t buf[2];
|
||||
bool ret = false;
|
||||
ret = I2cValidRead16LE((uint16_t*) buf, gdk101_address, READ_STATUS);
|
||||
bool ret = I2cValidRead16LE((uint16_t*) buf, Gdk.address, GDK101_READ_STATUS);
|
||||
if (ret) {
|
||||
status->status = (gdk_status_t) buf[0];
|
||||
status->vibration = (bool) buf[1];
|
||||
status->status = (gdk_status_t) buf[0]; // 0 = Ready, 1 = 10min Waiting, 2 = Normal
|
||||
status->vibration = (bool) buf[1]; // 0 = Off, 1 = On
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool gdk101_get_measuring_time(struct gdk_measuring_time *meas_time) {
|
||||
bool Gdk101MeasuringTime(struct gdk_measuring_time *meas_time) {
|
||||
// Can return 255 minutes and 60 seconds - Not used in Application Note AN_GDK101_V1.1
|
||||
uint8_t buf[2];
|
||||
bool ret = false;
|
||||
ret = I2cValidRead16LE((uint16_t*) buf, gdk101_address, READ_MEASURING_TIME);
|
||||
bool ret = I2cValidRead16LE((uint16_t*) buf, Gdk.address, GDK101_READ_MEASURING_TIME);
|
||||
if (ret) {
|
||||
meas_time->min = buf[0];
|
||||
meas_time->sec = buf[1];
|
||||
|
|
@ -202,99 +181,99 @@ bool gdk101_get_measuring_time(struct gdk_measuring_time *meas_time) {
|
|||
return ret;
|
||||
}
|
||||
|
||||
void every_second(void) {
|
||||
if (!gdk_ready) return;
|
||||
|
||||
gdk101_every_second();
|
||||
|
||||
if (evr10 == 10) {
|
||||
gdk101_every_10_second();
|
||||
evr10 = 1;
|
||||
}
|
||||
else {
|
||||
evr10++;
|
||||
void Gdk101EverySecond(void) {
|
||||
bool ret = Gdk101Status(&Gdk.status);
|
||||
Gdk101ErrLog(ret);
|
||||
if (Gdk.status.status > GDK_STATUS_READY) {
|
||||
Gdk.time++;
|
||||
} else {
|
||||
Gdk.time = 0;
|
||||
}
|
||||
|
||||
Gdk.evr10++;
|
||||
if (10 == Gdk.evr10) {
|
||||
Gdk.evr10 = 0;
|
||||
|
||||
ret = Gdk101Ard10min(&Gdk.ard_10min);
|
||||
Gdk101ErrLog(ret);
|
||||
ret = Gdk101Ard1min(&Gdk.ard_1min);
|
||||
Gdk101ErrLog(ret);
|
||||
// ret = Gdk101MeasuringTime(&Gdk.time);
|
||||
// Gdk101ErrLog(ret);
|
||||
}
|
||||
}
|
||||
|
||||
void gdk101_every_second(void) {
|
||||
bool ret = false;
|
||||
#ifdef USE_WEBSERVER
|
||||
const char HTTP_GDK101_FW[] PROGMEM = "{s}%s " "FW Version" "{m}%d.%d{e}";
|
||||
const char HTTP_GDK101_STATUS[] PROGMEM = "{s}%s " "Status" "{m}%d{e}";
|
||||
const char HTTP_GDK101_VIB_STATUS[] PROGMEM = "{s}%s " "Vibration Status" "{m}%d{e}";
|
||||
//const char HTTP_GDK101_MEAS_TIME[] PROGMEM = "{s}%s " "Measurement Time" "{m}%d:%02d{e}";
|
||||
const char HTTP_GDK101_MEAS_TIME[] PROGMEM = "{s}%s " "Measurement" "{m}%s{e}";
|
||||
#endif // USE_WEBSERVER
|
||||
|
||||
ret = gdk101_get_status(&gdk_status);
|
||||
gdk101_err_log(ret);
|
||||
}
|
||||
|
||||
void gdk101_every_10_second(void) {
|
||||
bool ret = false;
|
||||
|
||||
ret = gdk101_get_10min_avg(&mea_10min_avg);
|
||||
gdk101_err_log(ret);
|
||||
ret = gdk101_get_1min_avg(&mea_1min_avg);
|
||||
gdk101_err_log(ret);
|
||||
ret = gdk101_get_measuring_time(&gdk_time);
|
||||
gdk101_err_log(ret);
|
||||
}
|
||||
|
||||
void gdk101_show(uint8_t json) {
|
||||
void Gdk101Show(uint8_t json) {
|
||||
char types[16];
|
||||
strcpy_P(types, PSTR("GDK101"));
|
||||
|
||||
if (!gdk_ready) return;
|
||||
|
||||
if (json) {
|
||||
ResponseAppend_P(PSTR(",\"%s\":{"), types);
|
||||
ResponseAppend_P(PSTR("\"FW_V\":%i.%i,"), fw_version.major, fw_version.minor);
|
||||
ResponseAppend_P(PSTR("\"10MIN_AVG\":%i.%02i,"), mea_10min_avg.integral, mea_10min_avg.fractional);
|
||||
ResponseAppend_P(PSTR("\"1MIN_AVG\":%i.%02i,"), mea_1min_avg.integral, mea_1min_avg.fractional);
|
||||
ResponseAppend_P(PSTR("\"STATUS\":%i,"), gdk_status.status);
|
||||
ResponseAppend_P(PSTR("\"VIBRATION\":%i,"), gdk_status.vibration);
|
||||
ResponseAppend_P(PSTR("\"MEAS_TIME\":\"%i:%02i\""), gdk_time.min, gdk_time.sec);
|
||||
ResponseAppend_P(PSTR("\"Firmware\":%i.%i,"), Gdk.version.major, Gdk.version.minor);
|
||||
ResponseAppend_P(PSTR("\"RadiationAvg10Min\":%i.%02i,"), Gdk.ard_10min.integral, Gdk.ard_10min.fractional);
|
||||
ResponseAppend_P(PSTR("\"RadiationAvg1Min\":%i.%02i,"), Gdk.ard_1min.integral, Gdk.ard_1min.fractional);
|
||||
ResponseAppend_P(PSTR("\"Status\":%i,"), Gdk.status.status);
|
||||
ResponseAppend_P(PSTR("\"Vibration\":%i,"), Gdk.status.vibration);
|
||||
// ResponseAppend_P(PSTR("\"MeasTime\":\"%i:%02i\""), Gdk.time.min, Gdk.time.sec);
|
||||
ResponseAppend_P(PSTR("\"Measurement\":\"%s\""), GetDuration(Gdk.time).c_str());
|
||||
ResponseJsonEnd();
|
||||
#ifdef USE_WEBSERVER
|
||||
} else {
|
||||
#ifdef GDK101_SHOW_FW_VERSION
|
||||
WSContentSend_PD(HTTP_GDK101_FW, types, fw_version.major, fw_version.minor);
|
||||
WSContentSend_PD(HTTP_GDK101_FW, types, Gdk.version.major, Gdk.version.minor);
|
||||
#endif
|
||||
WSContentSend_PD(HTTP_SNS_AVG_RAD_DOSE, types, "@10", mea_10min_avg.integral, mea_10min_avg.fractional);
|
||||
WSContentSend_PD(HTTP_SNS_AVG_RAD_DOSE, types, "@1", mea_1min_avg.integral, mea_1min_avg.fractional);
|
||||
WSContentSend_PD(HTTP_SNS_AVG_RAD_DOSE, types, "10", Gdk.ard_10min.integral, Gdk.ard_10min.fractional);
|
||||
WSContentSend_PD(HTTP_SNS_AVG_RAD_DOSE, types, "1", Gdk.ard_1min.integral, Gdk.ard_1min.fractional);
|
||||
#ifdef GDK101_SHOW_STATUS
|
||||
WSContentSend_PD(HTTP_GDK101_STATUS, types, gdk_status.status);
|
||||
WSContentSend_PD(HTTP_GDK101_STATUS, types, Gdk.status.status);
|
||||
#endif
|
||||
#ifdef GDK101_SHOW_VIBRATION_STATUS
|
||||
WSContentSend_PD(HTTP_GDK101_VIB_STATUS, types, gdk_status.vibration);
|
||||
#endif
|
||||
#ifdef GDK101_SHOW_MEAS_TIME
|
||||
WSContentSend_PD(HTTP_GDK101_MEAS_TIME, types, gdk_time.min, gdk_time.sec);
|
||||
WSContentSend_PD(HTTP_GDK101_VIB_STATUS, types, Gdk.status.vibration);
|
||||
#endif
|
||||
//#ifdef GDK101_SHOW_MEAS_TIME
|
||||
// WSContentSend_PD(HTTP_GDK101_MEAS_TIME, types, Gdk.time.min, Gdk.time.sec);
|
||||
WSContentSend_PD(HTTP_GDK101_MEAS_TIME, types, GetDuration(Gdk.time).c_str());
|
||||
//#endif
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
}
|
||||
|
||||
/*********************************************************************************************\
|
||||
Interface
|
||||
\*********************************************************************************************/
|
||||
|
||||
bool Xsns106(uint32_t function)
|
||||
{
|
||||
bool result = false;
|
||||
|
||||
bool Xsns106(uint32_t function) {
|
||||
if (!I2cEnabled(XI2C_79)) { return false; }
|
||||
|
||||
bool result = false;
|
||||
|
||||
if (FUNC_INIT == function) {
|
||||
Gdk101Detect();
|
||||
}
|
||||
else if (Gdk.ready) {
|
||||
switch (function) {
|
||||
case FUNC_INIT:
|
||||
gdk101_init();
|
||||
break;
|
||||
case FUNC_EVERY_SECOND:
|
||||
every_second();
|
||||
Gdk101EverySecond();
|
||||
break;
|
||||
case FUNC_JSON_APPEND:
|
||||
gdk101_show(1);
|
||||
Gdk101Show(1);
|
||||
break;
|
||||
#ifdef USE_WEBSERVER
|
||||
case FUNC_WEB_SENSOR:
|
||||
gdk101_show(0);
|
||||
Gdk101Show(0);
|
||||
break;
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue