one wire renamed to single wire. dallas renamed to one wire

Sensors.c

@@ -1,5 +1,5 @@
 #include "Sensors.h"
-#include "./interfaces/OneWireSensor.h"
+#include "./interfaces/SingleWireSensor.h"
 #include "./interfaces/I2CSensor.h"
 
 #include <furi_hal_power.h>
@@ -192,7 +192,7 @@ bool unitemp_sensors_save(void) {
 
     //Сохранение датчиков
     for(size_t i = 0; i < app->sensors_count; i++) {
-        if(app->sensors[i]->interface == ONE_WIRE) {
+        if(app->sensors[i]->interface == SINGLE_WIRE) {
             stream_write_format(
                 app->file_stream,
                 "%s %d %d\n",

Sensors.h

@@ -34,8 +34,8 @@ typedef enum {
 
 //Типы подключения датчиков
 typedef enum Interface {
-    ONE_WIRE, //Собственный однопроводной протокол датчиков DHTXX и AM23XX
-    DALLAS, //Однопроводной протокол Dallas
+    SINGLE_WIRE, //Собственный однопроводной протокол датчиков DHTXX и AM23XX
+    ONE_WIRE, //Однопроводной протокол Dallas
     I2C,
     SPI,
 

interfaces/OneWireSensor.c → interfaces/SingleWireSensor.c

@@ -1,4 +1,4 @@
-#include "OneWireSensor.h"
+#include "SingleWireSensor.h"
 #include "../Sensors.h"
 
 //Интервал опроса датчиков (мс)
@@ -7,8 +7,8 @@
 #define POLLING_TIMEOUT_TICKS 10000
 
 bool unitemp_oneWire_sensorAlloc(Sensor* sensor, SensorType st, uint16_t* anotherValues) {
-    OneWireSensor* instance = malloc(sizeof(OneWireSensor));
-    instance->interface = ONE_WIRE;
+    SingleWireSensor* instance = malloc(sizeof(SingleWireSensor));
+    instance->interface = SINGLE_WIRE;
     instance->lastPollingTime = 0xFFFFFFFF;
 
     sensor->initializer = unitemp_oneWire_sensorInit;
@@ -27,7 +27,7 @@ bool unitemp_oneWire_sensorAlloc(Sensor* sensor, SensorType st, uint16_t* anothe
 }
 
 bool unitemp_oneWire_sensorInit(void* sensor) {
-    OneWireSensor* instance = ((Sensor*)sensor)->instance;
+    SingleWireSensor* instance = ((Sensor*)sensor)->instance;
     if(instance == NULL || instance->gpio == NULL) {
         FURI_LOG_E(APP_NAME, "Sensor pointer is null!");
         return false;
@@ -44,7 +44,7 @@ bool unitemp_oneWire_sensorInit(void* sensor) {
 }
 
 bool unitemp_oneWire_sensorDeInit(void* sensor) {
-    OneWireSensor* instance = ((Sensor*)sensor)->instance;
+    SingleWireSensor* instance = ((Sensor*)sensor)->instance;
     if(instance == NULL || instance->gpio == NULL) return false;
     //Низкий уровень по умолчанию
     furi_hal_gpio_write(instance->gpio->pin, false);
@@ -59,18 +59,18 @@ bool unitemp_oneWire_sensorDeInit(void* sensor) {
 
 bool unitemp_oneWire_sensorSetGPIO(Sensor* sensor, const GPIO* gpio) {
     if(sensor == NULL || gpio == NULL) return false;
-    OneWireSensor* instance = sensor->instance;
+    SingleWireSensor* instance = sensor->instance;
     instance->gpio = gpio;
     return true;
 }
 const GPIO* unitemp_oneWire_sensorGetGPIO(Sensor* sensor) {
     if(sensor == NULL) return NULL;
-    OneWireSensor* instance = sensor->instance;
+    SingleWireSensor* instance = sensor->instance;
     return instance->gpio;
 }
 
 UnitempStatus unitemp_oneWire_updateData(void* sensor) {
-    OneWireSensor* instance = ((Sensor*)sensor)->instance;
+    SingleWireSensor* instance = ((Sensor*)sensor)->instance;
     //Проверка на допустимость опроса датчика
     if(furi_get_tick() - instance->lastPollingTime < POLLING_INTERVAL) {
         //Возврат ошибки если последний опрос датчика был неудачным

interfaces/OneWireSensor.h → interfaces/SingleWireSensor.h

@@ -1,5 +1,5 @@
-#ifndef UNITEMP_ONE_WIRE
-#define UNITEMP_ONE_WIRE
+#ifndef UNITEMP_SINGLE_WIRE
+#define UNITEMP_SINGLE_WIRE
 
 #include "../unitemp.h"
 
@@ -15,7 +15,7 @@ typedef struct {
     float lastTemp;
     //Последнее успешное значение влажности
     float lastHum;
-} OneWireSensor;
+} SingleWireSensor;
 
 /**
  * @brief Инициализация датчика

unitemp.c

@@ -1,5 +1,5 @@
 #include "unitemp.h"
-#include "interfaces/OneWireSensor.h"
+#include "interfaces/SingleWireSensor.h"
 #include "Sensors.h"
 #include "scenes/Scenes.h"