commit - a5b1c04dac7ff5afdb3cc3d65b322552bf9986f3
commit + 21f3bf63097ed697b8c994dd4bb0322dd885375e
blob - 0a89f840dbe236951e36fabf3c60ced4f182b7ac
blob + 3b2c10fea424562fdebf6b966208d19048c27b12
--- am2315.cpp
+++ am2315.cpp
config = (struct env *) malloc(sizeof(struct env *));
- config->i2c_addr = AM2315_ADDR;
+ /*config->i2c_addr = AM2315_ADDR;*/
+ config->i2c_addr = AM2315C_ADDR;
config->i2c_channel = I2C0;
config->i2c_speed = 400000;
config->started = false;
while(1) {
am.read_all(config);
+ printf("%.2fc, %.2f%%\n", am.temperature, am.humidity);
am.temperature *= 1.8;
am.temperature += 32;
printf("%.2ff, %.2f%%\n", am.temperature, am.humidity);
blob - 0f003d7ae87b4afabd889e15cccc7beda3db11aa
blob + 351476d4ead43371bd84f5fa74c8a4b012386496
--- libam2315.cpp
+++ libam2315.cpp
#include "libam2315.h"
-#define DEBUG 0
+#define DEBUG 1
#define DPRINTF(x,y) do { if (DEBUG) { printf("%s", x); sleep_ms(y); }} \
while(0)
if (DEBUG)
DPRINTF("Initializing I2C\n", 500);
+ if (config->i2c_addr == AM2315C_ADDR)
+ config->c_sensor = true;
+ else
+ config->c_sensor = false;
+
switch(config->i2c_channel) {
case I2C1:
config->i2c = i2c1;
AM2315::read_all(struct env *config)
{
uint8_t data[8];
- int ret;
+ bool ready = false;
+ uint32_t humidity_data = 0, temp_data = 0;
memset(&data, 0, sizeof(data));
write(config, &data[0], 1, false);
sleep_ms(50);
- data[0] = AM2315_REGISTER_READ;
- data[1] = 0x00;
- data[2] = 0x04;
+ if (config->i2c_addr == AM2315C_ADDR) {
+ data[0] = AM2315C_REGISTER_READ;
+ data[1] = 0x33;
+ data[2] = 0x00;
+ } else {
+ data[0] = AM2315_REGISTER_READ;
+ data[1] = 0x00;
+ } data[2] = 0x04;
write(config, data, 3, false);
- read(config, data, 8, true);
- if (data[0] != AM2315_REGISTER_READ) {
- if(DEBUG)
- DPRINTF("Didn't Read\n", 1000);
- }
- if (data[1] != 4) {
+ if (config->i2c_addr == AM2315C_ADDR) {
+ sleep_us(80);
+
if (DEBUG)
- DPRINTF("Short Read\n", 1000);
- }
+ DPRINTF("Read AM2315C\n", 0);
- humidity = data[2];
- humidity *= 256;
- humidity += data[3];
- humidity /= 10;
+ while (ready == false) {
+ read(config, data, 1, true);
+ if (data[0] & AM2315C_REGISTER_BUSY)
+ sleep_us(100);
+ else
+ ready = true;
+ }
+ read(config, data, 6, true);
+ humidity_data |= (data[1] << 16);
+ humidity_data |= (data[2] << 8);
+ humidity_data |= data[3];
+ humidity_data = humidity_data >> 4;
- temperature = data[4] & 0x7F;
- temperature *= 256;
- temperature += data[5];
- temperature /= 10;
+ humidity = ((float)humidity_data * 100) / 0x100000;
- if (data[4] >> 7)
- temperature = -temperature;
+ temp_data = (data[3] << 16);
+ temp_data |= (data[4] << 8);
+ temp_data |= data[5];
+ temp_data = temp_data & ~(0xFFF00000);
+
+ /* clear all data bits > 20 */
+ temperature = ((float)temp_data * 200 / 0x100000) - 50;
+ } else {
+ if (DEBUG)
+ DPRINTF("Read AM2315\n", 0);
+ read(config, data, 8, true);
+
+ if (data[0] != AM2315_REGISTER_READ) {
+ if(DEBUG)
+ DPRINTF("Didn't Read\n", 1000);
+ }
+ if (data[1] != 4) {
+ if (DEBUG)
+ DPRINTF("Short Read\n", 1000);
+ }
+
+ humidity = data[2];
+ humidity *= 256;
+ humidity += data[3];
+ humidity /= 10;
+
+ temperature = data[4] & 0x7F;
+ temperature *= 256;
+ temperature += data[5];
+ temperature /= 10;
+
+ if (data[4] >> 7)
+ temperature = -temperature;
+ }
}
static void
/* give device some init time */
sleep_ms(150);
config->started = true;
+
+ /* init AM2315C devices */
+ if (config->c_sensor) {
+ uint8_t data[8];
+ bool ready = false;
+
+ data[0] = AM2315C_REGISTER_INIT;
+ data[1] = 0x08;
+ data[2] = 0x00;
+
+ memset(&data, 0, sizeof(data));
+ write(config, &data[0], 1, false);
+ sleep_ms(50);
+ while (ready == false) {
+ read(config, data, 1, true);
+ if (data[0] & AM2315C_REGISTER_BUSY)
+ sleep_us(100);
+ else
+ ready = true;
+ }
+
+ read(config, data, 1, true);
+ if (!(data[0] & AM2315C_REGISTER_CALD)) {
+ if (DEBUG)
+ DPRINTF("CONFIGURATION FAILED!\n", 0);
+ while(1);
+ }
+ }
}
blob - 9a364ad56c15da96ce4b3adbe64bdc2f8911994c
blob + 437ebde063e3231fbfb17275eb9808596c20346e
--- libam2315.h
+++ libam2315.h
uint32_t i2c_speed;
i2c_inst_t *i2c;
bool started;
+ bool c_sensor;
};
enum I2C_t {
};
/* change to what you want */
-#define PICO_I2C0_SDA_PIN 16
-#define PICO_I2C0_SCL_PIN 17
+#define PICO_I2C0_SDA_PIN 4
+#define PICO_I2C0_SCL_PIN 5
#define PICO_I2C1_SDA_PIN 2
#define PICO_I2C1_SCL_PIN 3
/* AM2315 Address */
#define AM2315_ADDR 0x5C
+/* AM2315C Address */
+#define AM2315C_ADDR 0x38
+
/*AM2315 Register */
#define AM2315_REGISTER_READ 0x03
+/*AM2315C Registers */
+#define AM2315C_REGISTER_INIT 0xBE
+#define AM2315C_REGISTER_READ 0xAC
+#define AM2315C_REGISTER_RESET 0xBA
+
+#define AM2315C_REGISTER_BUSY 0x80
+#define AM2315C_REGISTER_CALD 0x08
+
#define READ_WAIT 5000
class