maj PCB v2 & esp-idf5
This commit is contained in:
parent
8324df6420
commit
2e39c666da
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,3 +1,6 @@
|
|||||||
build
|
build
|
||||||
sdkconfig
|
|
||||||
sdkconfig.old
|
sdkconfig.old
|
||||||
|
.cache/
|
||||||
|
dependencies.lock
|
||||||
|
main/idf_component.yml
|
||||||
|
managed_components/
|
@ -1,6 +1,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <esp_wifi.h>
|
#include "esp_wifi.h"
|
||||||
#include "esp_event.h"
|
#include "esp_event.h"
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
#include "esp_mac.h"
|
#include "esp_mac.h"
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
idf_component_register(SRCS "APlib.c"
|
idf_component_register(SRCS "APlib.c"
|
||||||
INCLUDE_DIRS "include"
|
INCLUDE_DIRS "include"
|
||||||
REQUIRES nvs_flash)
|
REQUIRES nvs_flash esp_wifi)
|
||||||
|
@ -254,7 +254,7 @@ void initBle(configuration_data_t* main_conf){
|
|||||||
main_app_conf = main_conf;
|
main_app_conf = main_conf;
|
||||||
adv_fields.name = (uint8_t*)&main_conf->hostname;
|
adv_fields.name = (uint8_t*)&main_conf->hostname;
|
||||||
adv_fields.name_len = strlen(main_conf->hostname);
|
adv_fields.name_len = strlen(main_conf->hostname);
|
||||||
ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
|
//ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
|
||||||
nimble_port_init();
|
nimble_port_init();
|
||||||
|
|
||||||
ble_hs_cfg.sync_cb = ble_on_sync;
|
ble_hs_cfg.sync_cb = ble_on_sync;
|
||||||
|
@ -99,7 +99,7 @@ void fetch_sensor_task(void* pvParameters){
|
|||||||
ESP_LOGE("sensor fetch", "Error executing scd4x_read_measurement(): %i\n", error);
|
ESP_LOGE("sensor fetch", "Error executing scd4x_read_measurement(): %i\n", error);
|
||||||
update_led_status(mainConf->leds, LED_NUMBER, conf->measure->co2);
|
update_led_status(mainConf->leds, LED_NUMBER, conf->measure->co2);
|
||||||
ble_sensor_notify();
|
ble_sensor_notify();
|
||||||
ESP_LOGI("MAIN", "co2 : %u ppm, temp : %d m°C, hum : %d mRH", conf->measure->co2, conf->measure->temperature, conf->measure->humidity);
|
ESP_LOGI("MAIN", "co2 : %u ppm, temp : %ld m°C, hum : %ld mRH", conf->measure->co2, conf->measure->temperature, conf->measure->humidity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,7 +140,7 @@ void init_http_server(configuration_data_t* main_conf){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void init_scd4x(){
|
void init_scd4x(){
|
||||||
sensirion_i2c_hal_init(0,1);
|
sensirion_i2c_hal_init(10,9);
|
||||||
|
|
||||||
scd4x_wake_up();
|
scd4x_wake_up();
|
||||||
scd4x_stop_periodic_measurement();
|
scd4x_stop_periodic_measurement();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user