cleanup pin const
This commit is contained in:
parent
a40c5c366c
commit
f860dc7c19
GPG Key ID:
0DD993BFB2B307DB
@ -5,6 +5,7 @@
|
||||
|
||||
void init_conf_from_nvs(configuration_data_t* conf, nvs_handle_t nvs){
|
||||
conf->leds = get_led_configuration(nvs);
|
||||
nvs_get_u8(nvs, "led_nb", &conf->led_nb);
|
||||
conf->sensor = get_sensor_configuration(nvs);
|
||||
conf->measure = conf->sensor->measure;
|
||||
nvs_get_u8(nvs, "wireless_conf", &conf->wireless);
|
||||
|
||||
@ -11,6 +11,7 @@ struct configuration_data {
|
||||
scd4x_data_t* measure;
|
||||
scd4x_config_t* sensor;
|
||||
led_disp_config_t* leds;
|
||||
uint8_t led_nb;
|
||||
uint8_t wireless;
|
||||
wifi_config_t* wifi_config;
|
||||
char hostname[16];
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
idf_component_register(SRCS "CO2_Sense.c"
|
||||
INCLUDE_DIRS ".")
|
||||
fatfs_create_rawflash_image(http ../webui/dist FLASH_IN_PROJECT)
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
#include "lwip/sys.h"
|
||||
|
||||
#include "esp_log.h"
|
||||
#include "esp_sleep.h"
|
||||
|
||||
#include "ledController.h"
|
||||
#include "scd4x_i2c.h"
|
||||
@ -16,12 +17,6 @@
|
||||
#include "scd4x_data.h"
|
||||
#include "BTlib_nimble.h"
|
||||
|
||||
#define LED1_PIN CONFIG_LED_1_PIN
|
||||
#define LED2_PIN CONFIG_LED_2_PIN
|
||||
#define LED3_PIN CONFIG_LED_3_PIN
|
||||
|
||||
#define LED_NUMBER 3
|
||||
|
||||
void app_main(void){
|
||||
init_nvs();
|
||||
|
||||
@ -30,9 +25,11 @@ void app_main(void){
|
||||
|
||||
configuration_data_t* conf = malloc(sizeof(configuration_data_t));
|
||||
init_conf_from_nvs(conf, nvs_handle);
|
||||
|
||||
|
||||
uint8_t led_nb=0;
|
||||
ESP_ERROR_CHECK(nvs_get_u8(nvs_handle, "led_nb", &led_nb));
|
||||
// init LEDs driver
|
||||
init_led_driver(conf->leds, LED_NUMBER);
|
||||
init_led_driver(conf->leds, conf->led_nb);
|
||||
|
||||
// init BLE
|
||||
initBle(conf);
|
||||
@ -72,7 +69,7 @@ void fetch_sensor_task(void* pvParameters){
|
||||
int16_t error = scd4x_read_measurement(&measures->co2, &measures->temperature, &measures->humidity);
|
||||
if (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, mainConf->led_nb, conf->measure->co2);
|
||||
ble_sensor_notify();
|
||||
ESP_LOGI("MAIN", "co2 : %u ppm, temp : %ld m°C, hum : %ld mRH", conf->measure->co2, conf->measure->temperature, conf->measure->humidity);
|
||||
}
|
||||
@ -89,9 +86,9 @@ void init_nvs(void){
|
||||
|
||||
|
||||
void init_scd4x(){
|
||||
sensirion_i2c_hal_init(10,9);
|
||||
sensirion_i2c_hal_init(CONFIG_SDA_PIN, CONFIG_SCL_PIN);
|
||||
|
||||
scd4x_wake_up();
|
||||
scd4x_stop_periodic_measurement();
|
||||
scd4x_reinit();
|
||||
scd4x_wake_up();
|
||||
scd4x_stop_periodic_measurement();
|
||||
scd4x_reinit();
|
||||
}
|
||||
|
||||
@ -1,24 +1,17 @@
|
||||
menu "CO2Sense config"
|
||||
menu "LED pins"
|
||||
config LED_1_PIN
|
||||
menu "I2C pins"
|
||||
config SDA_PIN
|
||||
int "pin"
|
||||
range 0 10
|
||||
default 4
|
||||
default 10
|
||||
help
|
||||
The pin on which the 1st LED is connected
|
||||
The SDA pin
|
||||
|
||||
config LED_2_PIN
|
||||
config SCL_PIN
|
||||
int "pin"
|
||||
range 0 10
|
||||
default 5
|
||||
default 9
|
||||
help
|
||||
The pin on which the 2nd LED is connected
|
||||
|
||||
config LED_3_PIN
|
||||
int "pin"
|
||||
range 0 10
|
||||
default 6
|
||||
help
|
||||
The pin on which the 3rd LED is connected
|
||||
The SCL pin
|
||||
endmenu
|
||||
endmenu
|
||||
|
||||
46
sdkconfig
46
sdkconfig
@ -97,7 +97,7 @@ CONFIG_SOC_I2S_SUPPORTS_XTAL=y
|
||||
CONFIG_SOC_I2S_SUPPORTS_PCM=y
|
||||
CONFIG_SOC_I2S_SUPPORTS_PDM=y
|
||||
CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y
|
||||
CONFIG_SOC_I2S_SUPPORTS_PDM_CODEC=y
|
||||
CONFIG_SOC_I2S_PDM_MAX_TX_LINES=2
|
||||
CONFIG_SOC_I2S_SUPPORTS_TDM=y
|
||||
CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y
|
||||
CONFIG_SOC_LEDC_SUPPORT_XTAL_CLOCK=y
|
||||
@ -122,7 +122,6 @@ CONFIG_SOC_RMT_SUPPORT_APB=y
|
||||
CONFIG_SOC_RMT_SUPPORT_RC_FAST=y
|
||||
CONFIG_SOC_RTC_CNTL_CPU_PD_DMA_BUS_WIDTH=128
|
||||
CONFIG_SOC_RTC_CNTL_CPU_PD_REG_FILE_NUM=108
|
||||
CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
|
||||
CONFIG_SOC_RTCIO_PIN_COUNT=0
|
||||
CONFIG_SOC_RSA_MAX_BIT_LEN=3072
|
||||
CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968
|
||||
@ -169,6 +168,8 @@ CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=54
|
||||
CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y
|
||||
CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y
|
||||
CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=2
|
||||
CONFIG_SOC_TWAI_CONTROLLER_NUM=1
|
||||
CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y
|
||||
CONFIG_SOC_TWAI_BRP_MIN=2
|
||||
CONFIG_SOC_TWAI_BRP_MAX=16384
|
||||
CONFIG_SOC_TWAI_SUPPORTS_RX_STATUS=y
|
||||
@ -199,6 +200,8 @@ CONFIG_SOC_PM_SUPPORT_BT_WAKEUP=y
|
||||
CONFIG_SOC_PM_SUPPORT_CPU_PD=y
|
||||
CONFIG_SOC_PM_SUPPORT_WIFI_PD=y
|
||||
CONFIG_SOC_PM_SUPPORT_BT_PD=y
|
||||
CONFIG_SOC_CLK_RC_FAST_D256_SUPPORTED=y
|
||||
CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y
|
||||
CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC=y
|
||||
CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL=y
|
||||
CONFIG_SOC_WIFI_HW_TSF=y
|
||||
@ -354,12 +357,11 @@ CONFIG_PARTITION_TABLE_MD5=y
|
||||
#
|
||||
|
||||
#
|
||||
# LED pins
|
||||
# I2C pins
|
||||
#
|
||||
CONFIG_LED_1_PIN=4
|
||||
CONFIG_LED_2_PIN=5
|
||||
CONFIG_LED_3_PIN=6
|
||||
# end of LED pins
|
||||
CONFIG_SDA_PIN=10
|
||||
CONFIG_SCL_PIN=9
|
||||
# end of I2C pins
|
||||
# end of CO2Sense config
|
||||
|
||||
#
|
||||
@ -476,6 +478,7 @@ CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
|
||||
CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0
|
||||
# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
|
||||
CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
|
||||
# CONFIG_BT_NIMBLE_52_FEATURE_SUPPORT is not set
|
||||
CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
|
||||
CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
|
||||
# CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
|
||||
@ -733,6 +736,24 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32
|
||||
# Hardware Settings
|
||||
#
|
||||
|
||||
#
|
||||
# Chip revision
|
||||
#
|
||||
# CONFIG_ESP32C3_REV_MIN_0 is not set
|
||||
# CONFIG_ESP32C3_REV_MIN_1 is not set
|
||||
# CONFIG_ESP32C3_REV_MIN_2 is not set
|
||||
CONFIG_ESP32C3_REV_MIN_3=y
|
||||
# CONFIG_ESP32C3_REV_MIN_4 is not set
|
||||
CONFIG_ESP32C3_REV_MIN_FULL=3
|
||||
CONFIG_ESP_REV_MIN_FULL=3
|
||||
|
||||
#
|
||||
# Maximum Supported ESP32-C3 Revision (Rev v0.99)
|
||||
#
|
||||
CONFIG_ESP32C3_REV_MAX_FULL=99
|
||||
CONFIG_ESP_REV_MAX_FULL=99
|
||||
# end of Chip revision
|
||||
|
||||
#
|
||||
# MAC Config
|
||||
#
|
||||
@ -778,13 +799,6 @@ CONFIG_MMU_PAGE_MODE="64KB"
|
||||
CONFIG_MMU_PAGE_SIZE=0x10000
|
||||
# end of MMU Config
|
||||
|
||||
# CONFIG_ESP32C3_REV_MIN_0 is not set
|
||||
# CONFIG_ESP32C3_REV_MIN_1 is not set
|
||||
# CONFIG_ESP32C3_REV_MIN_2 is not set
|
||||
CONFIG_ESP32C3_REV_MIN_3=y
|
||||
# CONFIG_ESP32C3_REV_MIN_4 is not set
|
||||
CONFIG_ESP32C3_REV_MIN=3
|
||||
|
||||
#
|
||||
# GDMA Configuration
|
||||
#
|
||||
@ -965,7 +979,7 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
|
||||
CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
|
||||
# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
|
||||
# CONFIG_ESP_WIFI_FTM_ENABLE is not set
|
||||
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
|
||||
CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
|
||||
# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set
|
||||
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
|
||||
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
|
||||
@ -1054,6 +1068,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
|
||||
#
|
||||
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
|
||||
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
|
||||
CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
|
||||
# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
|
||||
CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
|
||||
CONFIG_FREERTOS_ISR_STACKSIZE=1536
|
||||
@ -1176,6 +1191,7 @@ CONFIG_LWIP_TCP_SYNMAXRTX=12
|
||||
CONFIG_LWIP_TCP_MSS=1440
|
||||
CONFIG_LWIP_TCP_TMR_INTERVAL=250
|
||||
CONFIG_LWIP_TCP_MSL=60000
|
||||
CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
|
||||
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
|
||||
CONFIG_LWIP_TCP_WND_DEFAULT=5744
|
||||
CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user