Cleanup. Old files moved to abandonedFiles
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
project (humidityserver CXX)
|
||||
|
||||
set(HUMIDITYSERVER_HEADERS humidityserver.h)
|
||||
|
||||
set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||
set(HUMIDITYSERVER_CODEGEN_DIR "${PROJECT_BINARY_DIR}/codegen")
|
||||
|
||||
PREPEND(HUMIDITYSERVER_HEADERS_PATHS ${PROJECT_SOURCE_DIR} ${HUMIDITYSERVER_HEADERS})
|
||||
|
||||
CODEGEN_FILES(HUMIDITYSERVER_CODEGEN_SOURCES ${HUMIDITYSERVER_CODEGEN_DIR} ${HUMIDITYSERVER_HEADERS})
|
||||
|
||||
add_custom_command(OUTPUT ${HUMIDITYSERVER_CODEGEN_SOURCES}
|
||||
COMMAND ${NGREST_BIN_PATH}ngrestcg -i "${PROJECT_SOURCE_DIR}" -o ${HUMIDITYSERVER_CODEGEN_DIR} -t service ${HUMIDITYSERVER_HEADERS}
|
||||
DEPENDS ${HUMIDITYSERVER_HEADERS_PATHS}
|
||||
)
|
||||
|
||||
file(GLOB HUMIDITYSERVER_SOURCES ${PROJECT_SOURCE_DIR}/*.c*)
|
||||
|
||||
list(APPEND HUMIDITYSERVER_SOURCES ${HUMIDITYSERVER_CODEGEN_SOURCES})
|
||||
|
||||
include_directories(${PROJECT_SOURCE_DIR} $ENV{NGREST_EXT_INCLUDES})
|
||||
|
||||
add_library(humidityserver MODULE ${HUMIDITYSERVER_SOURCES})
|
||||
|
||||
set_target_properties(humidityserver PROPERTIES PREFIX "")
|
||||
set_target_properties(humidityserver PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SERVICES_DIR}"
|
||||
)
|
||||
|
||||
target_link_libraries(humidityserver ngrestutils ngrestcommon ngrestjson ngrestengine $ENV{NGREST_EXT_LIBS})
|
||||
@@ -1,80 +0,0 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h> /* link against math lib */
|
||||
#include "calculate.h"
|
||||
|
||||
#define R 8314.3 //J/(kmol*K) (universelle Gaskonstante)
|
||||
#define mw 18.016 //kg/kmol (Molekulargewicht des Wasserdampfes)
|
||||
|
||||
/*
|
||||
Bezeichnungen:
|
||||
r = relative Luftfeuchte
|
||||
T = Temperatur in °C
|
||||
TK = Temperatur in Kelvin (TK = T + 273.15)
|
||||
TD = Taupunkttemperatur in °C
|
||||
DD = Dampfdruck in hPa
|
||||
SDD = Sättigungsdampfdruck in hPa
|
||||
|
||||
Parameter:
|
||||
a = 7.5, b = 237.3 für T >= 0
|
||||
a = 7.6, b = 240.7 für T < 0 über Wasser (Taupunkt)
|
||||
a = 9.5, b = 265.5 für T < 0 über Eis (Frostpunkt)
|
||||
|
||||
R* = 8314.3 J/(kmol*K) (universelle Gaskonstante)
|
||||
mw = 18.016 kg/kmol (Molekulargewicht des Wasserdampfes)
|
||||
AF = absolute Feuchte in g Wasserdampf pro m3 Luft
|
||||
|
||||
Formeln:
|
||||
|
||||
SDD(T) = 6.1078 * 10^((a*T)/(b+T))
|
||||
DD(r,T) = r/100 * SDD(T)
|
||||
r(T,TD) = 100 * SDD(TD) / SDD(T)
|
||||
TD(r,T) = b*v/(a-v) mit v(r,T) = log10(DD(r,T)/6.1078)
|
||||
AF(r,TK) = 10^5 * mw/R* * DD(r,T)/TK; AF(TD,TK) = 10^5 * mw/R* * SDD(TD)/TK
|
||||
*/
|
||||
|
||||
static float sdd(float temperature) {
|
||||
//select constant based on input temperature
|
||||
float a = 7.5, b = 237.3;
|
||||
if (temperature >= 0) {
|
||||
a = 7.6;
|
||||
b = 240.7;
|
||||
}
|
||||
return 6.1078 * pow(10, (a * temperature) / (b + temperature));
|
||||
}
|
||||
|
||||
static float dd(float relativeHumidity, float temperature) {
|
||||
return relativeHumidity / 100 * sdd(temperature);
|
||||
}
|
||||
|
||||
/* CURRENTLY UNUSED
|
||||
|
||||
static float r(float temperature, float dewTemperature) {
|
||||
// This is optional. Necessary with dew point measurements.
|
||||
return 100 * sdd(dewTemperature) / sdd(temperature);
|
||||
}
|
||||
|
||||
static float v(float relativeHumidity, float temperature) {
|
||||
log10(dd(relativeHumidity, temperature)/6.1078);
|
||||
}
|
||||
|
||||
static float td(float relativeHumidity, float temperature) {
|
||||
//select constant based on input temperature
|
||||
float a = 7.5, b = 237.3;
|
||||
if (temperature >= 0) {
|
||||
a = 7.6;
|
||||
b = 240.7;
|
||||
}
|
||||
return b * v(relativeHumidity, temperature) / (a - v(relativeHumidity, temperature));
|
||||
}
|
||||
*/
|
||||
static float af(float relativeHumidity, float temperature) {
|
||||
float tk = temperature + 273.15;
|
||||
return pow(10, 5) * mw/R * dd(relativeHumidity, temperature) / tk;
|
||||
}
|
||||
|
||||
float absoluteHumidityFloat(float temperature, float humidity) {
|
||||
return af(humidity, temperature);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#ifndef calculate_H
|
||||
#define calculate_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
float absoluteHumidityFloat(float temperature, float humidity);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -1,18 +0,0 @@
|
||||
// This file generated by ngrestcg
|
||||
// For more information, please visit: https://github.com/loentar/ngrest
|
||||
|
||||
#include "humidityserver.h"
|
||||
#include "calculate.h"
|
||||
#include <ngrest/common/Nullable.h>
|
||||
|
||||
|
||||
float humidityserver::absolutehumidity(float temperature, float humidity) {
|
||||
|
||||
//Format: node_id, pin, humidity, temperature, gm3, isoutside
|
||||
int node_id = 1;
|
||||
int pin = 0;
|
||||
int isoutside = 0;
|
||||
float absHum = absoluteHumidityFloat(temperature, humidity);
|
||||
|
||||
return absHum;
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
// This file generated by ngrestcg
|
||||
// For more information, please visit: https://github.com/loentar/ngrest
|
||||
|
||||
#ifndef HUMIDITYSERVER_H
|
||||
#define HUMIDITYSERVER_H
|
||||
|
||||
#include <ngrest/common/Service.h>
|
||||
|
||||
//! Dummy description for the service
|
||||
/*! Some detailed description of the service */
|
||||
// '*location' comment sets resource path for this service
|
||||
// *location: humidityserver
|
||||
class humidityserver: public ngrest::Service
|
||||
{
|
||||
public:
|
||||
// *method: GET
|
||||
// *location: /abshum?temperature={temperature}&humidity={humidity}
|
||||
float absolutehumidity(float temperature, float humidity);
|
||||
private:
|
||||
//Format: Table, User, Password
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif // HUMIDITYSERVER_H
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user