generated from hulk/gd32e23x_template
	Merge remote-tracking branch 'origin/feature-tmp112a' into dev
# Conflicts: # src/LDC1612.c # src/main.c
This commit is contained in:
		| @@ -15,6 +15,7 @@ | ||||
| #include <math.h> | ||||
|  | ||||
| #define LDC1612_ADDR         (0x2B << 1) | ||||
| #define TMP112A_ADDR         (0x49 << 1) | ||||
|  | ||||
| /*Register Rddr*/ | ||||
| /***************************************************************************/ | ||||
| @@ -119,4 +120,6 @@ uint8_t ldc1612_iic_read_16bits(uint8_t reg_addr, uint8_t *data); | ||||
|  | ||||
| uint8_t ldc1612_iic_write_16bits(uint8_t reg_addr, uint8_t data[2]); | ||||
|  | ||||
| uint32_t TMP112A_ReadTemperature(void); | ||||
|  | ||||
| #endif //LDC1612_H | ||||
|   | ||||
		Reference in New Issue
	
	Block a user