Mercurial > iotbalkon / file diff

--- a/main/iotbalkon.c	Tue Apr 04 20:57:49 2023 +0200
+++ b/main/iotbalkon.c	Wed Apr 05 20:00:26 2023 +0200
@@ -365,16 +365,15 @@
     memset(&bmp280_dev, 0, sizeof(bmp280_t));
     memset(&ina219_b_dev, 0, sizeof(ina219_t));
     memset(&ina219_s_dev, 0, sizeof(ina219_t));
-    memset(&apds9930_dev, 0, sizeof(i2c_dev_t));
+    memset(&apds9930_dev, 0, sizeof(apds9930_t));
 
     i2c_dev_t dev = { 0 };
     dev.cfg.sda_io_num = CONFIG_I2C_MASTER_SDA;
     dev.cfg.scl_io_num = CONFIG_I2C_MASTER_SCL;
-    dev.cfg.master.clk_speed = 1000000;
+    dev.cfg.master.clk_speed = 400000;
 
     dev.addr = 0x39;
     if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) {
-        ESP_LOGI(TAG, "Found ADPS-9930");
 	ESP_ERROR_CHECK(apds9930_init_desc(&apds9930_dev, 0x39, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL));
 	ESP_ERROR_CHECK(apds9930_init(&apds9930_dev));
 	ESP_LOGI(TAG, "Found APDS-9930 id: 0x%02x", apds9930_dev.id);
@@ -383,13 +382,13 @@
     if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) {
 	ESP_ERROR_CHECK(ina219_init_desc(&ina219_b_dev, 0x40, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL));
 	ESP_ERROR_CHECK(ina219_init(&ina219_b_dev));
-	ESP_LOGI(TAG, "Found INA219 Battery");
+	ESP_LOGI(TAG, "Found INA219 @0x40 Battery");
     }
     dev.addr = 0x41;
     if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) {
 	ESP_ERROR_CHECK(ina219_init_desc(&ina219_s_dev, 0x41, 0, CONFIG_I2C_MASTER_SDA, CONFIG_I2C_MASTER_SCL));
 	ESP_ERROR_CHECK(ina219_init(&ina219_s_dev));
-        ESP_LOGI(TAG, "Found INA219 Solar");
+        ESP_LOGI(TAG, "Found INA219 @0x41 Solar");
     }
     dev.addr = 0x76;
     if (i2c_dev_probe(&dev, I2C_DEV_WRITE) == 0) {
@@ -430,6 +429,13 @@
     int State = State_Init;
     int OldState = State_Init + 1;
 
+
+    while (1) {
+//	request_ina219();
+	request_apds9930();
+	vTaskDelay(5000 / portTICK_PERIOD_MS);
+    }
+
     while (1) {
 	if (OldState != State) {
 	    ESP_LOGI(TAG, "Switch to state %d", State);