Git-Mirrors/OpenModem
1
0
Fork 0
mirror of https://github.com/markqvist/OpenModem.git synced 2025-06-07 06:12:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed BME280 driver init

Browse source
This commit is contained in:
Mark Qvist 2021-03-12 22:22:06 +01:00
parent 596539f0cd
commit 275704b508
4 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hardware/BME280.c
View file

@ -250,7 +250,7 @@ bool bme280_init(uint8_t cs_usrio_pin) {
bme280_temperature_fine_adjust = BME280_TEMPERATURE_ADJUSTMENT; bme280_temperature_fine_adjust = BME280_TEMPERATURE_ADJUSTMENT;
USR_IO_DDR |= bme280_cs_usrio_pin; USR_IO_DDR |= _BV(bme280_cs_usrio_pin);
SPI_DDR |= _BV(SPI_MOSI) | _BV(SPI_CLK); SPI_DDR |= _BV(SPI_MOSI) | _BV(SPI_CLK);
SPI_DDR &= ~(_BV(SPI_MISO)); SPI_DDR &= ~(_BV(SPI_MISO));

4
main.c
View file

@ -104,12 +104,12 @@ void init(void) {
mtime_t sensor_poll_time = 0; mtime_t sensor_poll_time = 0;
void sensor_jobs(void) { void sensor_jobs(void) {
if (rtc_milliseconds() > sensor_poll_time+config_sensor_interval_ms) { if (milliseconds() > sensor_poll_time) {
if (config_sensor_bme280_enabled && bme280_ready) { if (config_sensor_bme280_enabled && bme280_ready) {
bme280_poll(); bme280_poll();
} }
sensor_poll_time = rtc_milliseconds(); sensor_poll_time = milliseconds() + config_sensor_interval_ms;
} }
} }

17
util/Config.h
View file

@ -120,19 +120,4 @@ void EEPROM_updatebyte(uint16_t addr, uint8_t data);
uint8_t EEPROM_readbyte(uint16_t addr); uint8_t EEPROM_readbyte(uint16_t addr);
void EEPROM_writebyte(uint16_t addr, uint8_t data); void EEPROM_writebyte(uint16_t addr, uint8_t data);
#endif #endif
/*
CSMA P
CSMA Slot Time
Preamble
Tail
LED intensity
Output gain
Input gain
Pass-all
Log packets
*/

12
util/time.h
View file

@ -35,6 +35,10 @@ inline mtime_t ticks_to_ms(ticks_t ticks) {
return DIV_ROUND(ticks, DIV_ROUND(CLOCK_TICKS_PER_SEC, 1000)); return DIV_ROUND(ticks, DIV_ROUND(CLOCK_TICKS_PER_SEC, 1000));
} }
static inline mtime_t milliseconds(void) {
return ticks_to_ms(timer_clock());
}
static inline uint32_t rtc_seconds(void) { static inline uint32_t rtc_seconds(void) {
uint32_t result; uint32_t result;
@ -45,6 +49,10 @@ static inline uint32_t rtc_seconds(void) {
return result; return result;
} }
static inline mtime_t rtc_milliseconds(void) {
return ticks_to_ms(timer_clock() % CLOCK_TICKS_PER_SEC);
}
static inline uint32_t rtc_unix_timestamp(void) { static inline uint32_t rtc_unix_timestamp(void) {
uint32_t result; uint32_t result;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
@ -54,10 +62,6 @@ static inline uint32_t rtc_unix_timestamp(void) {
return result+UNIX_EPOCH_OFFSET; return result+UNIX_EPOCH_OFFSET;
} }
static inline mtime_t rtc_milliseconds(void) {
return ticks_to_ms(timer_clock() % CLOCK_TICKS_PER_SEC);
}
static inline void rtc_set_seconds(uint32_t seconds) { static inline void rtc_set_seconds(uint32_t seconds) {
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
_rtc_seconds = seconds; _rtc_seconds = seconds;