Auto-removal of debugger messages on build in release profile

Sensors.c

@@ -281,9 +281,7 @@ void unitemp_sensors_add(Sensor* sensor) {
 }
 
 bool unitemp_sensors_load(void) {
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(APP_NAME, "Loading sensors...");
-#endif
+    UNITEMP_DEBUG("Loading sensors...");
 
     //Выделение памяти на поток
     app->file_stream = file_stream_alloc(app->storage);
@@ -392,9 +390,7 @@ bool unitemp_sensors_load(void) {
 }
 
 bool unitemp_sensors_save(void) {
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(APP_NAME, "Saving sensors...");
-#endif
+    UNITEMP_DEBUG("Saving sensors...");
 
     //Выделение памяти для потока
     app->file_stream = file_stream_alloc(app->storage);
@@ -540,15 +536,12 @@ void unitemp_sensor_free(Sensor* sensor) {
     bool status = false;
     //Высвобождение памяти под инстанс
     status = sensor->type->interface->mem_releaser(sensor);
-    UNUSED(status);
-#ifdef UNITEMP_DEBUG
 
     if(status) {
-        FURI_LOG_D(APP_NAME, "Sensor %s memory successfully released", sensor->name);
+        UNITEMP_DEBUG("Sensor %s memory successfully released", sensor->name);
     } else {
         FURI_LOG_E(APP_NAME, "Sensor %s memory is not released", sensor->name);
     }
-#endif
     free(sensor->name);
     //free(sensor);
 }
@@ -569,9 +562,7 @@ bool unitemp_sensors_init(void) {
         //Может пропасть при отключении USB
         if(furi_hal_power_is_otg_enabled() != true) {
             furi_hal_power_enable_otg();
-#ifdef UNITEMP_DEBUG
-            FURI_LOG_D(APP_NAME, "OTG enabled");
-#endif
+            UNITEMP_DEBUG("OTG enabled");
         }
         if(!(*app->sensors[i]->type->initializer)(app->sensors[i])) {
             FURI_LOG_E(
@@ -580,9 +571,7 @@ bool unitemp_sensors_init(void) {
                 app->sensors[i]->name);
             result = false;
         }
-#ifdef UNITEMP_DEBUG
-        FURI_LOG_D(APP_NAME, "Sensor %s successfully initialized", app->sensors[i]->name);
-#endif
+        UNITEMP_DEBUG("Sensor %s successfully initialized", app->sensors[i]->name);
     }
     app->sensors_ready = true;
     return result;
@@ -593,9 +582,7 @@ bool unitemp_sensors_deInit(void) {
     //Выключение 5 В если до этого оно не было включено
     if(app->settings.lastOTGState != true) {
         furi_hal_power_disable_otg();
-#ifdef UNITEMP_DEBUG
-        FURI_LOG_D(APP_NAME, "OTG disabled");
-#endif
+        UNITEMP_DEBUG("OTG disabled");
     }
 
     //Перебор датчиков из списка
@@ -631,10 +618,9 @@ UnitempStatus unitemp_sensor_updateData(Sensor* sensor) {
 
     sensor->status = sensor->type->interface->updater(sensor);
 
-#ifdef UNITEMP_DEBUG
-    if(sensor->status != UT_SENSORSTATUS_OK && sensor->status != UT_SENSORSTATUS_POLLING)
-        FURI_LOG_D(APP_NAME, "Sensor %s update status %d", sensor->name, sensor->status);
-#endif
+    if(sensor->status != UT_SENSORSTATUS_OK && sensor->status != UT_SENSORSTATUS_POLLING) {
+        UNITEMP_DEBUG("Sensor %s update status %d", sensor->name, sensor->status);
+    }
 
     if(app->settings.temp_unit == UT_TEMP_FAHRENHEIT && sensor->status == UT_SENSORSTATUS_OK)
         uintemp_celsiumToFarengate(sensor);

interfaces/OneWireSensor.c

@@ -58,9 +58,7 @@ OneWireBus* uintemp_onewire_bus_alloc(const GPIO* gpio) {
     bus->device_count = 0;
     bus->gpio = gpio;
     bus->powerMode = PWR_PASSIVE;
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(APP_NAME, "one wire bus (port %d) allocated", gpio->num);
-#endif
+    UNITEMP_DEBUG("one wire bus (port %d) allocated", gpio->num);
 
     return bus;
 }
@@ -84,9 +82,7 @@ bool unitemp_onewire_bus_init(OneWireBus* bus) {
     return true;
 }
 bool unitemp_onewire_bus_deinit(OneWireBus* bus) {
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(APP_NAME, "devices on wire %d: %d", bus->gpio->num, bus->device_count);
-#endif
+    UNITEMP_DEBUG("devices on wire %d: %d", bus->gpio->num, bus->device_count);
     bus->device_count--;
     if(bus->device_count <= 0) {
         bus->device_count = 0;
@@ -236,15 +232,11 @@ void unitemp_onewire_bus_enum_init(void) {
 uint8_t* unitemp_onewire_bus_enum_next(OneWireBus* bus) {
     furi_delay_ms(10);
     if(!onewire_enum_fork_bit) { // Если на предыдущем шаге уже не было разногласий
-#ifdef UNITEMP_DEBUG
-        FURI_LOG_D(APP_NAME, "All devices on wire %d is found", unitemp_gpio_toInt(bus->gpio));
-#endif
+        UNITEMP_DEBUG("All devices on wire %d is found", unitemp_gpio_toInt(bus->gpio));
         return 0; // то просто выходим ничего не возвращая
     }
     if(!unitemp_onewire_bus_start(bus)) {
-#ifdef UNITEMP_DEBUG
-        FURI_LOG_D(APP_NAME, "Wire %d is empty", unitemp_gpio_toInt(bus->gpio));
-#endif
+        UNITEMP_DEBUG("Wire %d is empty", unitemp_gpio_toInt(bus->gpio));
         return 0;
     }
     uint8_t bp = 8;
@@ -278,9 +270,8 @@ uint8_t* unitemp_onewire_bus_enum_next(OneWireBus* bus) {
             if(!not1) { // Присутствует единица
                 next |= 0x80;
             } else { // Нет ни нулей ни единиц - ошибочная ситуация
-#ifdef UNITEMP_DEBUG
-                FURI_LOG_D(APP_NAME, "Wrong wire %d situation", unitemp_gpio_toInt(bus->gpio));
-#endif
+
+                UNITEMP_DEBUG("Wrong wire %d situation", unitemp_gpio_toInt(bus->gpio));
                 return 0;
             }
         }
@@ -421,9 +412,7 @@ UnitempStatus unitemp_onewire_sensor_update(Sensor* sensor) {
             unitemp_onewire_bus_send_byte(instance->bus, 0xBE); // Read Scratch-pad
             unitemp_onewire_bus_read_byteArray(instance->bus, buff, 9);
             if(!unitemp_onewire_CRC_check(buff, 9)) {
-#ifdef UNITEMP_DEBUG
-                FURI_LOG_D(APP_NAME, "Sensor %s is not found", sensor->name);
-#endif
+                UNITEMP_DEBUG("Sensor %s is not found", sensor->name);
                 return UT_SENSORSTATUS_TIMEOUT;
             }
         }
@@ -462,9 +451,7 @@ UnitempStatus unitemp_onewire_sensor_update(Sensor* sensor) {
         unitemp_onewire_bus_send_byte(instance->bus, 0xBE); // Read Scratch-pad
         unitemp_onewire_bus_read_byteArray(instance->bus, buff, 9);
         if(!unitemp_onewire_CRC_check(buff, 9)) {
-#ifdef UNITEMP_DEBUG
-            FURI_LOG_D(APP_NAME, "Failed CRC check: %s", sensor->name);
-#endif
+            UNITEMP_DEBUG("Failed CRC check: %s", sensor->name);
             return UT_SENSORSTATUS_BADCRC;
         }
         int16_t raw = buff[0] | ((int16_t)buff[1] << 8);

sensors/BMP180.c

@@ -101,9 +101,8 @@ bool unitemp_BMP180_init(Sensor* sensor) {
     bmp180_instance->bmp180_cal.MC = (buff[18] << 8) | buff[19];
     bmp180_instance->bmp180_cal.MD = (buff[20] << 8) | buff[21];
 
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(
-        APP_NAME,
+
+UNITEMP_DEBUG(
         "Sensor BMP180 (0x%02X) calibration values: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",
         i2c_sensor->currentI2CAdr,
         bmp180_instance->bmp180_cal.AC1,
@@ -117,7 +116,6 @@ bool unitemp_BMP180_init(Sensor* sensor) {
         bmp180_instance->bmp180_cal.MB,
         bmp180_instance->bmp180_cal.MC,
         bmp180_instance->bmp180_cal.MD);
-#endif
     return true;
 }
 

sensors/BMx280.c

@@ -180,22 +180,19 @@ static bool bmx280_readCalValues(I2CSensor* i2c_sensor) {
     if(!unitemp_i2c_readRegArray(
            i2c_sensor, TEMP_CAL_START_ADDR, 6, (uint8_t*)&bmx280_instance->temp_cal))
         return false;
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(
-        APP_NAME,
+
+    UNITEMP_DEBUG(
         "Sensor BMx280 (0x%02X) T1-T3: %d, %d, %d",
         i2c_sensor->currentI2CAdr,
         bmx280_instance->temp_cal.dig_T1,
         bmx280_instance->temp_cal.dig_T2,
         bmx280_instance->temp_cal.dig_T3);
-#endif
 
     if(!unitemp_i2c_readRegArray(
            i2c_sensor, PRESS_CAL_START_ADDR, 18, (uint8_t*)&bmx280_instance->press_cal))
         return false;
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(
-        APP_NAME,
+
+    UNITEMP_DEBUG(
         "Sensor BMx280 (0x%02X): P1-P9: %d, %d, %d, %d, %d, %d, %d, %d, %d",
         i2c_sensor->currentI2CAdr,
         bmx280_instance->press_cal.dig_P1,
@@ -207,7 +204,6 @@ static bool bmx280_readCalValues(I2CSensor* i2c_sensor) {
         bmx280_instance->press_cal.dig_P7,
         bmx280_instance->press_cal.dig_P8,
         bmx280_instance->press_cal.dig_P9);
-#endif
 
     if(bmx280_instance->chip_id == BME280_ID) {
         uint8_t buff[7] = {0};
@@ -221,9 +217,7 @@ static bool bmx280_readCalValues(I2CSensor* i2c_sensor) {
         bmx280_instance->hum_cal.dig_H5 = (buff[4] & 0x0F) | ((int16_t)buff[5] << 4);
         bmx280_instance->hum_cal.dig_H6 = buff[6];
 
-#ifdef UNITEMP_DEBUG
-        FURI_LOG_D(
-            APP_NAME,
+        UNITEMP_DEBUG(
             "Sensor BMx280 (0x%02X): H1-H6: %d, %d, %d, %d, %d, %d",
             i2c_sensor->currentI2CAdr,
             bmx280_instance->hum_cal.dig_H1,
@@ -232,7 +226,6 @@ static bool bmx280_readCalValues(I2CSensor* i2c_sensor) {
             bmx280_instance->hum_cal.dig_H4,
             bmx280_instance->hum_cal.dig_H5,
             bmx280_instance->hum_cal.dig_H6);
-#endif
     }
 
     bmx280_instance->last_cal_update_time = furi_get_tick();

unitemp.c

@@ -78,9 +78,7 @@ bool unitemp_saveSettings(void) {
 }
 
 bool unitemp_loadSettings(void) {
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(APP_NAME, "Loading settings...");
-#endif
+    UNITEMP_DEBUG("Loading settings...");
 
     //Выделение памяти на поток
     app->file_stream = file_stream_alloc(app->storage);

unitemp.h

@@ -39,19 +39,25 @@
 /* Объявление макроподстановок */
 //Имя приложения
 #define APP_NAME "Unitemp"
+//Версия приложения
+#define UNITEMP_APP_VER "1.0.1-dev"
 //Путь хранения файлов плагина
 #define APP_PATH_FOLDER "/ext/unitemp"
 //Имя файла с настройками
 #define APP_FILENAME_SETTINGS "settings.cfg"
 //Имя файла с датчиками
 #define APP_FILENAME_SENSORS "sensors.cfg"
-//Версия приложения
-#define UNITEMP_APP_VER "1.0"
 
 //Размер буффера текста
 #define BUFF_SIZE 32
 
-#define UNITEMP_DEBUG
+#define UNITEMP_D
+
+#ifdef FURI_DEBUG
+#define UNITEMP_DEBUG(msg, ...) FURI_LOG_D(APP_NAME, msg, ##__VA_ARGS__)
+#else
+#define UNITEMP_DEBUG(msg, ...)
+#endif
 
 /* Объявление перечислений */
 //Единицы измерения температуры

views/SensorEdit_view.c

@@ -63,13 +63,9 @@ bool _onewire_id_exist(uint8_t* id) {
 
 static void _onewire_scan(void) {
     OneWireSensor* ow_sensor = editable_sensor->instance;
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(
-        APP_NAME,
-        "devices on wire %d: %d",
-        ow_sensor->bus->gpio->num,
-        ow_sensor->bus->device_count);
-#endif
+
+    UNITEMP_DEBUG(
+        "devices on wire %d: %d", ow_sensor->bus->gpio->num, ow_sensor->bus->device_count);
 
     //Сканирование шины one wire
     unitemp_onewire_bus_init(ow_sensor->bus);
@@ -101,9 +97,8 @@ static void _onewire_scan(void) {
 
     memcpy(ow_sensor->deviceID, id, 8);
     ow_sensor->familyCode = id[0];
-#ifdef UNITEMP_DEBUG
-    FURI_LOG_D(
-        APP_NAME,
+
+    UNITEMP_DEBUG(
         "Found sensor's ID: %02X%02X%02X%02X%02X%02X%02X%02X",
         id[0],
         id[1],
@@ -113,7 +108,6 @@ static void _onewire_scan(void) {
         id[5],
         id[6],
         id[7]);
-#endif
 
     if(ow_sensor->familyCode != 0) {
         char id_buff[10];