chris/Weather_ESP
1
0
Fork 0
Code Releases Activity

Compare commits

base: chris:2421ae31a5b6f7b339368997e7d44ebab8e72ae5
Branches Tags
chris:master
chris:spi_display
..
compare: chris:42af035ae6bcc880326217a8f6de87bc9e4dbfa6
Branches Tags
chris:master
chris:spi_display

No commits in common. "2421ae31a5b6f7b339368997e7d44ebab8e72ae5" and "42af035ae6bcc880326217a8f6de87bc9e4dbfa6" have entirely different histories.
2421ae31a5 ... 42af035ae6

6 changed files with 51 additions and 76 deletions
Show Stats Expand all files Collapse all files

11
components/sensors/sensors.c
View File

@ -122,17 +122,6 @@ void read_sensor2(int32_t* temp, uint32_t* pressure, uint32_t* humidity) {
*humidity = comp_data.humidity; *humidity = comp_data.humidity;
} }
double read_light_sensor() {
uint8_t raw_high = 0;
i2c_read(0x4a, 0x03, &raw_high, 1);
uint8_t exp = raw_high >> 4;
uint8_t mant = raw_high & 0b00001111;
return pow(2, exp) * mant * 0.72;
}
void init_sensors() void init_sensors()
{ {
// INIT SENSOR // INIT SENSOR

2
components/sensors/sensors.h
View File

@ -11,11 +11,9 @@
#include "bme280.h" #include "bme280.h"
#include "bme280_defs.h" #include "bme280_defs.h"
#include "driver/i2c.h" #include "driver/i2c.h"
#include "math.h"
void init_sensors(); void init_sensors();
void read_sensor2(int32_t* temp, uint32_t* pressure, uint32_t* humidity); void read_sensor2(int32_t* temp, uint32_t* pressure, uint32_t* humidity);
void read_sensor(int32_t* temp, uint32_t* pressure, uint32_t* humidity); void read_sensor(int32_t* temp, uint32_t* pressure, uint32_t* humidity);
double read_light_sensor();
#endif /* COMPONENTS_SENSORS_SENSORS_H_ */ #endif /* COMPONENTS_SENSORS_SENSORS_H_ */

2
components/server/CMakeLists.txt
View File

@ -1,3 +1,3 @@
idf_component_register(SRCS "server.c" idf_component_register(SRCS "server.c"
INCLUDE_DIRS "." INCLUDE_DIRS "."
REQUIRES mqtt freertos) REQUIRES esp_http_server freertos)

102
components/server/server.c
View File

@ -8,73 +8,63 @@
#include "server.h" #include "server.h"
static const char *TAG = "server"; static const char *TAG = "server";
esp_mqtt_client_handle_t client; char cur_value_str[255] = "No measurements yet!";
static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) void server_set_values(int32_t temp_raw, uint32_t pressure_raw, uint32_t humidity_raw,
int32_t temp2_raw, uint32_t pressure2_raw, uint32_t humidity2_raw)
{ {
esp_mqtt_client_handle_t client = event->client; sprintf(cur_value_str, "<html><body><p>%d %d %d</p><p>%d %d %d</p></body></html>",
int msg_id; temp_raw, pressure_raw, humidity_raw, temp2_raw, pressure2_raw, humidity2_raw);
// your_context_t *context = event->context; }
switch (event->event_id) {
case MQTT_EVENT_CONNECTED:
ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
break;
case MQTT_EVENT_DISCONNECTED:
ESP_LOGI(TAG, "MQTT_EVENT_DISCONNECTED");
break;
case MQTT_EVENT_SUBSCRIBED:
ESP_LOGI(TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
msg_id = esp_mqtt_client_publish(client, "/topic/qos0", "data", 0, 0, 0);
ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
break;
case MQTT_EVENT_UNSUBSCRIBED:
ESP_LOGI(TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=%d", event->msg_id);
break;
case MQTT_EVENT_PUBLISHED:
ESP_LOGI(TAG, "MQTT_EVENT_PUBLISHED, msg_id=%d", event->msg_id);
break;
case MQTT_EVENT_DATA:
ESP_LOGI(TAG, "MQTT_EVENT_DATA");
printf("TOPIC=%.*s\r\n", event->topic_len, event->topic);
printf("DATA=%.*s\r\n", event->data_len, event->data);
break;
case MQTT_EVENT_ERROR:
ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
/*if (event->error_handle->error_type == MQTT_ERROR_TYPE_TCP_TRANSPORT) {
log_error_if_nonzero("reported from esp-tls", event->error_handle->esp_tls_last_esp_err);
log_error_if_nonzero("reported from tls stack", event->error_handle->esp_tls_stack_err);
log_error_if_nonzero("captured as transport's socket errno", event->error_handle->esp_transport_sock_errno);
ESP_LOGI(TAG, "Last errno string (%s)", strerror(event->error_handle->esp_transport_sock_errno));
}*/ static esp_err_t get_handler(httpd_req_t *req)
break; {
default: char* buf;
ESP_LOGI(TAG, "Other event id:%d", event->event_id); size_t buf_len;
break;
/* Get header value string length and allocate memory for length + 1,
* extra byte for null termination */
buf_len = httpd_req_get_hdr_value_len(req, "Host") + 1;
if (buf_len > 1) {
buf = malloc(buf_len);
/* Copy null terminated value string into buffer */
if (httpd_req_get_hdr_value_str(req, "Host", buf, buf_len) == ESP_OK) {
ESP_LOGI(TAG, "Found header => Host: %s", buf);
}
free(buf);
} }
const char* resp_str = cur_value_str;
httpd_resp_send(req, resp_str, strlen(resp_str));
return ESP_OK; return ESP_OK;
} }
static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) { static httpd_uri_t uri = {
ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id); .uri = "/",
mqtt_event_handler_cb(event_data); .method = HTTP_GET,
} .handler = get_handler,
};
void send_mqtt_update(double lux, const char* topic) static httpd_handle_t start_webserver(void)
{ {
char lux_str[317] = "\0"; httpd_handle_t server = NULL;
snprintf(lux_str, 317, "%f", lux); httpd_config_t config = HTTPD_DEFAULT_CONFIG();
esp_mqtt_client_publish(client, topic, lux_str, 0, 0, 0);
// Start the httpd server
ESP_LOGI(TAG, "Starting server on port: '%d'", config.server_port);
if (httpd_start(&server, &config) == ESP_OK) {
// Set URI handlers
ESP_LOGI(TAG, "Registering URI handlers");
httpd_register_uri_handler(server, &uri);
return server;
}
ESP_LOGI(TAG, "Error starting server!");
return NULL;
} }
void init_server() void init_server()
{ {
//start_webserver(); start_webserver();
esp_mqtt_client_config_t mqtt_cfg = {
.uri = "mqtt://192.168.0.101",
};
client = esp_mqtt_client_init(&mqtt_cfg);
esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID, mqtt_event_handler, client);
esp_mqtt_client_start(client);
} }

6
components/server/server.h
View File

@ -13,11 +13,11 @@
#include <freertos/task.h> #include <freertos/task.h>
#include <esp_event.h> #include <esp_event.h>
#include <esp_log.h> #include <esp_log.h>
#include <esp_http_server.h>
#include <sys/param.h> #include <sys/param.h>
#include "mqtt_client.h"
void init_server(); void init_server();
void server_set_values(int32_t temp_raw, uint32_t pressure_raw, uint32_t humidity_raw,
void send_mqtt_update(double lux, const char* topic); int32_t temp2_raw, uint32_t pressure2_raw, uint32_t humidity2_raw);
#endif /* COMPONENTS_SERVER_SERVER_H_ */ #endif /* COMPONENTS_SERVER_SERVER_H_ */

4
main/main.c
View File

@ -31,10 +31,8 @@ void app_main(void)
get_time(&time); get_time(&time);
read_sensor(&temp, &pressure, &humidity); read_sensor(&temp, &pressure, &humidity);
read_sensor2(&temp2, &pressure2, &humidity2); read_sensor2(&temp2, &pressure2, &humidity2);
//server_set_values(temp, pressure, humidity, temp2, pressure2, humidity2); server_set_values(temp, pressure, humidity, temp2, pressure2, humidity2);
update_data(temp, pressure, humidity, temp2, pressure2, humidity2, time); update_data(temp, pressure, humidity, temp2, pressure2, humidity2, time);
double lux = read_light_sensor();
send_mqtt_update(lux, "wzHelligkeit");
vTaskDelay(500 / portTICK_PERIOD_MS); vTaskDelay(500 / portTICK_PERIOD_MS);
} }
} }