comparison: main/iotbalkon.c
main/iotbalkon.c
- changeset 16
- b3e96bbe4ce4
- parent 15
- 64028e178ff1
- child 18
- 12506716211c
equal
deleted
inserted
replaced
| 15:64028e178ff1 | 16:b3e96bbe4ce4 |
|---|---|
| 363 | 363 |
| 364 bmp280_init_default_params(&bmp280_params); | 364 bmp280_init_default_params(&bmp280_params); |
| 365 memset(&bmp280_dev, 0, sizeof(bmp280_t)); | 365 memset(&bmp280_dev, 0, sizeof(bmp280_t)); |
| 366 memset(&ina219_b_dev, 0, sizeof(ina219_t)); | 366 memset(&ina219_b_dev, 0, sizeof(ina219_t)); |
| 367 memset(&ina219_s_dev, 0, sizeof(ina219_t)); | 367 memset(&ina219_s_dev, 0, sizeof(ina219_t)); |
| 368 memset(&apds9930_dev, 0, sizeof(i2c_dev_t)); | 368 memset(&apds9930_dev, 0, sizeof(apds9930_t)); |
| 369 | 369 |
| 370 i2c_dev_t dev = { 0 }; | 370 i2c_dev_t dev = { 0 }; |
| 371 dev.cfg.sda_io_num = CONFIG_I2C_MASTER_SDA; | 371 dev.cfg.sda_io_num = CONFIG_I2C_MASTER_SDA; |
| 372 dev.cfg.scl_io_num = CONFIG_I2C_MASTER_SCL; | 372 dev.cfg.scl_io_num = CONFIG_I2C_MASTER_SCL; |
| 373 dev.cfg.master.clk_speed = 1000000; | 373 dev.cfg.master.clk_speed = 400000; |
| 374 | 374 |
| 375 dev.addr = 0x39; | 375 dev.addr = 0x39; |
| 376 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { | 376 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { |
| 377 ESP_LOGI(TAG, "Found ADPS-9930"); | |
| 378 ESP_ERROR_CHECK(apds9930_init_desc(&apds9930_dev, 0x39, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); | 377 ESP_ERROR_CHECK(apds9930_init_desc(&apds9930_dev, 0x39, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); |
| 379 ESP_ERROR_CHECK(apds9930_init(&apds9930_dev)); | 378 ESP_ERROR_CHECK(apds9930_init(&apds9930_dev)); |
| 380 ESP_LOGI(TAG, "Found APDS-9930 id: 0x%02x", apds9930_dev.id); | 379 ESP_LOGI(TAG, "Found APDS-9930 id: 0x%02x", apds9930_dev.id); |
| 381 } | 380 } |
| 382 dev.addr = 0x40; | 381 dev.addr = 0x40; |
| 383 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { | 382 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { |
| 384 ESP_ERROR_CHECK(ina219_init_desc(&ina219_b_dev, 0x40, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); | 383 ESP_ERROR_CHECK(ina219_init_desc(&ina219_b_dev, 0x40, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); |
| 385 ESP_ERROR_CHECK(ina219_init(&ina219_b_dev)); | 384 ESP_ERROR_CHECK(ina219_init(&ina219_b_dev)); |
| 386 ESP_LOGI(TAG, "Found INA219 Battery"); | 385 ESP_LOGI(TAG, "Found INA219 @0x40 Battery"); |
| 387 } | 386 } |
| 388 dev.addr = 0x41; | 387 dev.addr = 0x41; |
| 389 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { | 388 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { |
| 390 ESP_ERROR_CHECK(ina219_init_desc(&ina219_s_dev, 0x41, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); | 389 ESP_ERROR_CHECK(ina219_init_desc(&ina219_s_dev, 0x41, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); |
| 391 ESP_ERROR_CHECK(ina219_init(&ina219_s_dev)); | 390 ESP_ERROR_CHECK(ina219_init(&ina219_s_dev)); |
| 392 ESP_LOGI(TAG, "Found INA219 Solar"); | 391 ESP_LOGI(TAG, "Found INA219 @0x41 Solar"); |
| 393 } | 392 } |
| 394 dev.addr = 0x76; | 393 dev.addr = 0x76; |
| 395 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { | 394 if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) { |
| 396 ESP_ERROR_CHECK(bmp280_init_desc(&bmp280_dev, BMP280_I2C_ADDRESS_0, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); | 395 ESP_ERROR_CHECK(bmp280_init_desc(&bmp280_dev, BMP280_I2C_ADDRESS_0, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL)); |
| 397 ESP_ERROR_CHECK(bmp280_init(&bmp280_dev, &bmp280_params)); | 396 ESP_ERROR_CHECK(bmp280_init(&bmp280_dev, &bmp280_params)); |
| 427 /* | 426 /* |
| 428 * Main application loop. | 427 * Main application loop. |
| 429 */ | 428 */ |
| 430 int State = State_Init; | 429 int State = State_Init; |
| 431 int OldState = State_Init + 1; | 430 int OldState = State_Init + 1; |
| 431 | |
| 432 | |
| 433 while (1) { | |
| 434 // request_ina219(); | |
| 435 request_apds9930(); | |
| 436 vTaskDelay(5000 / portTICK_PERIOD_MS); | |
| 437 } | |
| 432 | 438 |
| 433 while (1) { | 439 while (1) { |
| 434 if (OldState != State) { | 440 if (OldState != State) { |
| 435 ESP_LOGI(TAG, "Switch to state %d", State); | 441 ESP_LOGI(TAG, "Switch to state %d", State); |
| 436 OldState = State; | 442 OldState = State; |
