diff --git a/applications/plugins/htu21d_temp_sensor/temperature_sensor.c b/applications/plugins/htu21d_temp_sensor/temperature_sensor.c index 02e662d60..b04e40a7d 100644 --- a/applications/plugins/htu21d_temp_sensor/temperature_sensor.c +++ b/applications/plugins/htu21d_temp_sensor/temperature_sensor.c @@ -36,35 +36,26 @@ // Typedef enums to make everything easier to read -typedef enum -{ - TSSCmdNone, - TSSCmdTemperature, - TSSCmdHumidity -} TSSCmdType; +typedef enum { TSSCmdNone, TSSCmdTemperature, TSSCmdHumidity } TSSCmdType; -typedef enum -{ +typedef enum { TSSInitializing, TSSNoSensor, TSSPendingUpdate, } TSStatus; -typedef enum -{ +typedef enum { TSEventTypeTick, TSEventTypeInput, } TSEventType; -typedef struct -{ +typedef struct { TSEventType type; InputEvent input; } TSEvent; // Possible return values for sensor_cmd -typedef enum -{ +typedef enum { TSCmdRet_Error, TSCmdRet_HTU2XD_SHT2X_SI702X_SI700X, TSCmdRet_SI701X, @@ -97,8 +88,7 @@ char ts_data_buffer_absolute_humidity[DATA_BUFFER_SIZE]; // // true if fetch was successful, false otherwise // -static TSCmdRet temperature_sensor_cmd(TSSCmdType cmd, uint8_t* buffer) -{ +static TSCmdRet temperature_sensor_cmd(TSSCmdType cmd, uint8_t* buffer) { uint32_t timeout = furi_ms_to_ticks(100); TSCmdRet ret = TSCmdRet_Error; @@ -106,47 +96,40 @@ static TSCmdRet temperature_sensor_cmd(TSSCmdType cmd, uint8_t* buffer) furi_hal_i2c_acquire(I2C_BUS); // Check if HTU2XD, SHT2X, SI702X, SI700X sensor is available - uint8_t isAddress40 = furi_hal_i2c_is_device_ready(I2C_BUS, HTU2XD_SHT2X_SI702X_SI700X_ADDRESS, timeout); + uint8_t isAddress40 = + furi_hal_i2c_is_device_ready(I2C_BUS, HTU2XD_SHT2X_SI702X_SI700X_ADDRESS, timeout); uint8_t isAddress41 = 0; // Check if SI701X sensor is available if necessary - if (!isAddress40) - isAddress41 = furi_hal_i2c_is_device_ready(I2C_BUS, SI701X_ADDRESS, timeout); + if(!isAddress40) isAddress41 = furi_hal_i2c_is_device_ready(I2C_BUS, SI701X_ADDRESS, timeout); - if (isAddress40 || isAddress41) - { + if(isAddress40 || isAddress41) { uint8_t address = isAddress40 ? HTU2XD_SHT2X_SI702X_SI700X_ADDRESS : SI701X_ADDRESS; // Better safe than sorry delay furi_delay_ms(15); // Extra delay for the SI70XX - if (isAddress41) - furi_delay_ms(50); + if(isAddress41) furi_delay_ms(50); // Transmit either the temperature or the humidity command depending on TSSCmdType uint8_t c = (cmd == TSSCmdTemperature) ? HTU21D_CMD_TEMPERATURE : HTU21D_CMD_HUMIDITY; - if (furi_hal_i2c_tx(I2C_BUS, address, &c, 1, timeout)) - { + if(furi_hal_i2c_tx(I2C_BUS, address, &c, 1, timeout)) { // Receive data (2 bytes) - if (furi_hal_i2c_rx(I2C_BUS, address, buffer, 2, timeout + 50)) + if(furi_hal_i2c_rx(I2C_BUS, address, buffer, 2, timeout + 50)) ret = isAddress40 ? TSCmdRet_HTU2XD_SHT2X_SI702X_SI700X : TSCmdRet_SI701X; } - } - else - { + } else { // The AM2320 goes to sleep after a period of inactivity, wake it up (check AM2320 datasheet for more info) furi_hal_i2c_is_device_ready(I2C_BUS, AM2320_ADDRESS, timeout); furi_delay_ms(30); // Check if it's really available - if (furi_hal_i2c_is_device_ready(I2C_BUS, AM2320_ADDRESS, timeout)) - { + if(furi_hal_i2c_is_device_ready(I2C_BUS, AM2320_ADDRESS, timeout)) { // {Address, Register, Len} - const uint8_t request[3] = { 0x03, 0x00, 0x04 }; + const uint8_t request[3] = {0x03, 0x00, 0x04}; - if (furi_hal_i2c_tx(I2C_BUS, AM2320_ADDRESS, request, 3, timeout)) - { + if(furi_hal_i2c_tx(I2C_BUS, AM2320_ADDRESS, request, 3, timeout)) { // 6 bytes - usually 8 but we currently don't check the CRC if(furi_hal_i2c_rx(I2C_BUS, (uint8_t)AM2320_ADDRESS, buffer, 6, timeout)) ret = TSCmdRet_AM2320; @@ -176,34 +159,29 @@ static TSCmdRet temperature_sensor_cmd(TSSCmdType cmd, uint8_t* buffer) // // true if fetch was successful, false otherwise // -static bool temperature_sensor_fetch_data(double* temperature, double* humidity) -{ +static bool temperature_sensor_fetch_data(double* temperature, double* humidity) { bool ret = false; uint16_t adc_raw; - uint8_t buffer[DATA_BUFFER_SIZE] = { 0x00 }; + uint8_t buffer[DATA_BUFFER_SIZE] = {0x00}; // Check if the sensor is the HTU21D by attempting to fetch the temperature TSCmdRet cmdRet = temperature_sensor_cmd(TSSCmdTemperature, buffer); - if (cmdRet == TSCmdRet_HTU2XD_SHT2X_SI702X_SI700X || cmdRet == TSCmdRet_SI701X) - { + if(cmdRet == TSCmdRet_HTU2XD_SHT2X_SI702X_SI700X || cmdRet == TSCmdRet_SI701X) { // Calculate temperature adc_raw = ((uint16_t)(buffer[0] << 8) | (buffer[1])); *temperature = (float)(adc_raw * 175.72 / 65536.00) - 46.85; // Fetch humidity - if (temperature_sensor_cmd(TSSCmdHumidity, buffer)) - { + if(temperature_sensor_cmd(TSSCmdHumidity, buffer)) { // Calculate humidity adc_raw = ((uint16_t)(buffer[0] << 8) | (buffer[1])); *humidity = (float)(adc_raw * 125.0 / 65536.00) - 6.0; ret = true; } - } - else if (cmdRet == TSCmdRet_AM2320) - { + } else if(cmdRet == TSCmdRet_AM2320) { // The AM2320 returns all the data immediately so we just process it all // Note: CRC isn't currently present in the buffer @@ -224,16 +202,14 @@ static bool temperature_sensor_fetch_data(double* temperature, double* humidity) // // Draw callback // -static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) -{ +static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) { UNUSED(ctx); canvas_clear(canvas); canvas_set_font(canvas, FontPrimary); // Update title accordingly (this could be improved by checking the hardware id) - switch (temperature_sensor_last_cmd_ret) - { + switch(temperature_sensor_last_cmd_ret) { case TSCmdRet_Error: canvas_draw_str(canvas, 2, 10, "Temperature Sensor"); break; @@ -257,17 +233,14 @@ static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, 2, 62, "Press back to exit."); - switch (temperature_sensor_current_status) - { + switch(temperature_sensor_current_status) { case TSSInitializing: canvas_draw_str(canvas, 2, 30, "Initializing.."); break; case TSSNoSensor: canvas_draw_str(canvas, 2, 30, "No sensor found!"); break; - case TSSPendingUpdate: - { - + case TSSPendingUpdate: { canvas_draw_str(canvas, 3, 24, "Temperature"); canvas_draw_str(canvas, 68, 24, "Humidity"); @@ -287,8 +260,7 @@ static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) canvas_draw_str(canvas, 100, 38, "%"); canvas_draw_str(canvas, 68, 48, ts_data_buffer_absolute_humidity); canvas_draw_str(canvas, 100, 48, "g/m3"); - } - break; + } break; default: break; } @@ -297,31 +269,28 @@ static void temperature_sensor_draw_callback(Canvas* canvas, void* ctx) // // Input callback // -static void temperature_sensor_input_callback(InputEvent* input_event, void* ctx) -{ +static void temperature_sensor_input_callback(InputEvent* input_event, void* ctx) { furi_assert(ctx); FuriMessageQueue* event_queue = ctx; - TSEvent event = { .type = TSEventTypeInput, .input = *input_event }; + TSEvent event = {.type = TSEventTypeInput, .input = *input_event}; furi_message_queue_put(event_queue, &event, FuriWaitForever); } // // Timer callback // -static void temperature_sensor_timer_callback(FuriMessageQueue* event_queue) -{ +static void temperature_sensor_timer_callback(FuriMessageQueue* event_queue) { furi_assert(event_queue); - TSEvent event = { .type = TSEventTypeTick }; + TSEvent event = {.type = TSEventTypeTick}; furi_message_queue_put(event_queue, &event, 0); } // // App entry point // -int32_t temperature_sensor_app(void* p) -{ +int32_t temperature_sensor_app(void* p) { UNUSED(p); // Declare our variables and assign variables a default value @@ -340,7 +309,8 @@ int32_t temperature_sensor_app(void* p) view_port_input_callback_set(view_port, temperature_sensor_input_callback, event_queue); // Create timer and register its callback - FuriTimer* timer = furi_timer_alloc(temperature_sensor_timer_callback, FuriTimerTypePeriodic, event_queue); + FuriTimer* timer = + furi_timer_alloc(temperature_sensor_timer_callback, FuriTimerTypePeriodic, event_queue); furi_timer_start(timer, furi_kernel_get_tick_frequency()); // Register viewport @@ -350,57 +320,49 @@ int32_t temperature_sensor_app(void* p) // Used to notify the user by blinking red (error) or blue (fetch successful) NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION); - while (1) - { - + while(1) { furi_check(furi_message_queue_get(event_queue, &tsEvent, FuriWaitForever) == FuriStatusOk); // Handle events - if (tsEvent.type == TSEventTypeInput) - { - + if(tsEvent.type == TSEventTypeInput) { // Exit on back key - if (tsEvent.input.key == InputKeyBack) // We dont check for type here, we can check the type of keypress like: (event.input.type == InputTypeShort) + if(tsEvent.input.key == + InputKeyBack) // We dont check for type here, we can check the type of keypress like: (event.input.type == InputTypeShort) break; - } - else if (tsEvent.type == TSEventTypeTick) - { - + } else if(tsEvent.type == TSEventTypeTick) { // Update sensor data // Fetch data and set the sensor current status accordingly sensorFound = temperature_sensor_fetch_data(&celsius, &rel_humidity); temperature_sensor_current_status = (sensorFound ? TSSPendingUpdate : TSSNoSensor); - if (sensorFound) - { - + if(sensorFound) { // Blink blue notification_message(notifications, &sequence_blink_blue_100); - if (celsius != TS_DEFAULT_VALUE && rel_humidity != TS_DEFAULT_VALUE) - { - + if(celsius != TS_DEFAULT_VALUE && rel_humidity != TS_DEFAULT_VALUE) { // Convert celsius to fahrenheit fahrenheit = (celsius * 9 / 5) + 32; // Calculate absolute humidity - For more info refer to https://github.com/Mywk/FlipperTemperatureSensor/issues/1 // Calculate saturation vapour pressure first - vapour_pressure = (double)6.11 * pow(10, (double)(((double)7.5 * celsius) / ((double)237.3 + celsius))); + vapour_pressure = + (double)6.11 * + pow(10, (double)(((double)7.5 * celsius) / ((double)237.3 + celsius))); // Then the vapour pressure in Pa vapour_pressure = vapour_pressure * rel_humidity; // Calculate absolute humidity - abs_humidity = (double)2.16679 * (double)(vapour_pressure / ((double)273.15 + celsius)); + abs_humidity = + (double)2.16679 * (double)(vapour_pressure / ((double)273.15 + celsius)); // Fill our buffers here, not on the canvas draw callback snprintf(ts_data_buffer_temperature_c, DATA_BUFFER_SIZE, "%.2f", celsius); snprintf(ts_data_buffer_temperature_f, DATA_BUFFER_SIZE, "%.2f", fahrenheit); - snprintf(ts_data_buffer_relative_humidity, DATA_BUFFER_SIZE, "%.2f", rel_humidity); - snprintf(ts_data_buffer_absolute_humidity, DATA_BUFFER_SIZE, "%.2f", abs_humidity); + snprintf( + ts_data_buffer_relative_humidity, DATA_BUFFER_SIZE, "%.2f", rel_humidity); + snprintf( + ts_data_buffer_absolute_humidity, DATA_BUFFER_SIZE, "%.2f", abs_humidity); } - } - else - { - + } else { // Reset our variables to their default values celsius = fahrenheit = rel_humidity = abs_humidity = TS_DEFAULT_VALUE;