fan speed can be 16 bit

This commit is contained in:
Skot Croshere 2023-01-19 22:25:19 -05:00 committed by johnny9
parent 4b01c67d50
commit 5ca33a8656
3 changed files with 9 additions and 9 deletions

View File

@ -48,10 +48,10 @@ void EMC2101_set_fan_speed(float percent) {
}
//RPM = 5400000/reading
uint32_t EMC2101_get_fan_speed(void) {
uint16_t EMC2101_get_fan_speed(void) {
uint8_t tach_lsb, tach_msb;
uint16_t reading;
uint32_t RPM;
uint16_t RPM;
ESP_ERROR_CHECK(register_read(EMC2101_TACH_LSB, &tach_lsb, 1));
ESP_ERROR_CHECK(register_read(EMC2101_TACH_MSB, &tach_msb, 1));
@ -61,7 +61,7 @@ uint32_t EMC2101_get_fan_speed(void) {
reading = tach_lsb | (tach_msb << 8);
RPM = 5400000/reading;
ESP_LOGI(TAG, "Fan Speed = %d RPM", RPM);
//ESP_LOGI(TAG, "Fan Speed = %d RPM", RPM);
return RPM;
}

View File

@ -58,7 +58,7 @@ typedef enum {
void EMC2101_set_fan_speed(float);
void EMC2101_read(void);
uint32_t EMC2101_get_fan_speed(void);
uint16_t EMC2101_get_fan_speed(void);
void EMC2101_set_config(uint8_t);
#endif /* EMC2101_H_ */

View File

@ -56,13 +56,13 @@ void app_main(void) {
EMC2101_set_config(0x04); //set the tach input
EMC2101_read();
EMC2101_set_fan_speed(0.5);
vTaskDelay(1000 / portTICK_RATE_MS);
EMC2101_get_fan_speed();
vTaskDelay(500 / portTICK_RATE_MS);
ESP_LOGI(TAG, "Fan Speed: %d RPM", EMC2101_get_fan_speed());
//Current Sensor tests
ESP_LOGI(TAG, "Current: %.2fmA", INA260_read_current());
ESP_LOGI(TAG, "Voltage: %.2fV", INA260_read_voltage());
ESP_LOGI(TAG, "Power: %.2fW", INA260_read_power());
ESP_LOGI(TAG, "Current: %.1f mA", INA260_read_current());
ESP_LOGI(TAG, "Voltage: %.1f mV", INA260_read_voltage());
ESP_LOGI(TAG, "Power: %.1f mW", INA260_read_power());
ESP_ERROR_CHECK(i2c_master_delete());
ESP_LOGI(TAG, "I2C unitialized successfully");