From 5ce820bd0f7f29bf0626962e20cb7a75112e16b2 Mon Sep 17 00:00:00 2001
From: Carlo Guarnieri Calo' Carducci <cguarnieri@eonerc.rwth-aachen.de>
Date: Wed, 27 Oct 2021 21:02:40 +0200
Subject: [PATCH] repo: fix power conversion
---
components/branch/src/branch.c | 4 ++--
components/data_center/src/data_center.c | 2 +-
components/ec_station/src/ec_station.c | 2 +-
components/factory/src/factory.c | 2 +-
components/hospital/src/hospital.c | 2 +-
components/house/src/house.c | 2 +-
components/power_plant/src/power_plant.c | 2 +-
components/skyscraper/src/skyscraper.c | 2 +-
components/solar_farm/src/solar_farm.c | 2 +-
components/stadium/src/stadium.c | 2 +-
components/supermarket/src/supermarket.c | 2 +-
components/wind_farm/src/wind_farm.c | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/components/branch/src/branch.c b/components/branch/src/branch.c
index 34fd24c..08ffffe 100644
--- a/components/branch/src/branch.c
+++ b/components/branch/src/branch.c
@@ -779,8 +779,8 @@ esp_err_t branch_init_entity()
esp_err_t branch_http_resp(char* str)
{
sprintf(str, "bus_a|%.2f;bus_b|%.2f",
- entity.bus_a.power*1000,
- entity.bus_b.power*1000);
+ entity.bus_a.power/1000,
+ entity.bus_b.power/1000);
return ESP_OK;
}
diff --git a/components/data_center/src/data_center.c b/components/data_center/src/data_center.c
index e41d65d..038414f 100644
--- a/components/data_center/src/data_center.c
+++ b/components/data_center/src/data_center.c
@@ -513,7 +513,7 @@ esp_err_t datacenter_init_entity()
esp_err_t datacenter_http_resp(char* str)
{
sprintf(str, "power|%.2f;source|%s",
- entity.power_in.power*1000,
+ entity.power_in.power/1000,
entity.power_source?"ups":"grid");
return ESP_OK;
diff --git a/components/ec_station/src/ec_station.c b/components/ec_station/src/ec_station.c
index 18a30c2..19f85b6 100644
--- a/components/ec_station/src/ec_station.c
+++ b/components/ec_station/src/ec_station.c
@@ -641,7 +641,7 @@ esp_err_t ecstation_init_entity()
esp_err_t ecstation_http_resp(char* str)
{
sprintf(str, "power|%.2f;",
- entity.power_in.power*1000);
+ entity.power_in.power/1000);
return ESP_OK;
}
diff --git a/components/factory/src/factory.c b/components/factory/src/factory.c
index ec062c8..6a510d4 100644
--- a/components/factory/src/factory.c
+++ b/components/factory/src/factory.c
@@ -544,7 +544,7 @@ esp_err_t factory_init_entity()
esp_err_t factory_http_resp(char* str)
{
sprintf(str, "power|%.2f;load|%.2f",
- entity.power_in.power*1000,
+ entity.power_in.power/1000,
entity.factory_load);
return ESP_OK;
diff --git a/components/hospital/src/hospital.c b/components/hospital/src/hospital.c
index afa85f6..5e9f35b 100644
--- a/components/hospital/src/hospital.c
+++ b/components/hospital/src/hospital.c
@@ -454,7 +454,7 @@ esp_err_t hospital_init_entity()
esp_err_t hospital_http_resp(char* str)
{
sprintf(str, "power|%.2f;source|%s",
- entity.power_in.power*1000,
+ entity.power_in.power/1000,
entity.power_source?"ups":"grid");
return ESP_OK;
diff --git a/components/house/src/house.c b/components/house/src/house.c
index ec74d19..6ae5974 100644
--- a/components/house/src/house.c
+++ b/components/house/src/house.c
@@ -741,7 +741,7 @@ esp_err_t house_init_entity()
esp_err_t house_http_resp(char* str)
{
sprintf(str, "power|%.2f;load|%.2f;temp|%.1f",
- entity.power_out.power*1000,
+ entity.power_out.power/1000,
entity.power_out.current/1000.0,
entity.temp.inside);
diff --git a/components/power_plant/src/power_plant.c b/components/power_plant/src/power_plant.c
index 1de54af..9bea1b2 100644
--- a/components/power_plant/src/power_plant.c
+++ b/components/power_plant/src/power_plant.c
@@ -540,7 +540,7 @@ esp_err_t powerplant_init_entity()
esp_err_t powerplant_http_resp(char* str)
{
sprintf(str, "power|%.2f;load|%.2f",
- entity.power_out.power*1000,
+ entity.power_out.power/1000,
entity.power_out.current/4000.0);
return ESP_OK;
diff --git a/components/skyscraper/src/skyscraper.c b/components/skyscraper/src/skyscraper.c
index 03ae450..9b8cff2 100644
--- a/components/skyscraper/src/skyscraper.c
+++ b/components/skyscraper/src/skyscraper.c
@@ -555,7 +555,7 @@ esp_err_t skyscraper_init_entity()
esp_err_t skyscraper_http_resp(char* str)
{
sprintf(str, "power|%.2f",
- entity.power_in.power*1000);
+ entity.power_in.power/1000);
return ESP_OK;
}
diff --git a/components/solar_farm/src/solar_farm.c b/components/solar_farm/src/solar_farm.c
index 7d63f7e..0ff17ad 100644
--- a/components/solar_farm/src/solar_farm.c
+++ b/components/solar_farm/src/solar_farm.c
@@ -563,7 +563,7 @@ esp_err_t solarfarm_init_entity()
esp_err_t solarfarm_http_resp(char* str)
{
sprintf(str, "power|%.2f;load|%.2f",
- entity.power_out.power*1000,
+ entity.power_out.power/1000,
entity.power_out.current/1000.0);
return ESP_OK;
diff --git a/components/stadium/src/stadium.c b/components/stadium/src/stadium.c
index 4e9b544..fcce1d3 100644
--- a/components/stadium/src/stadium.c
+++ b/components/stadium/src/stadium.c
@@ -587,7 +587,7 @@ esp_err_t stadium_init_entity()
esp_err_t stadium_http_resp(char* str)
{
sprintf(str, "power|%.2f;",
- entity.power_in.power*1000);
+ entity.power_in.power/1000);
return ESP_OK;
}
diff --git a/components/supermarket/src/supermarket.c b/components/supermarket/src/supermarket.c
index 79e8596..9224776 100644
--- a/components/supermarket/src/supermarket.c
+++ b/components/supermarket/src/supermarket.c
@@ -707,7 +707,7 @@ esp_err_t supermarket_init_entity()
esp_err_t supermarket_http_resp(char* str)
{
sprintf(str, "power|%.2f;chp|%.2f",
- entity.power_in.power*1000,
+ entity.power_in.power/1000,
entity.power_out.power*1000);
return ESP_OK;
diff --git a/components/wind_farm/src/wind_farm.c b/components/wind_farm/src/wind_farm.c
index af4da76..351af21 100644
--- a/components/wind_farm/src/wind_farm.c
+++ b/components/wind_farm/src/wind_farm.c
@@ -563,7 +563,7 @@ esp_err_t windfarm_init_entity()
esp_err_t windfarm_http_resp(char* str)
{
sprintf(str, "power|%.2f;load|%.2f",
- entity.power_out.power*1000,
+ entity.power_out.power/1000,
entity.power_out.current/1000.0);
return ESP_OK;
--
GitLab