mirror
/
SP8EBC-ParaTNC
kopia lustrzana https://github.com/SP8EBC/ParaTNC
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

merging from sht22 branch

pull/2/head
Mateusz Lubecki 2018-12-29 17:15:42 +01:00
rodzic 538c44352e 8f1b05aa5c
commit 17b504a512
16 zmienionych plików z 653 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.cproject
Wyświetl plik

@ -390,4 +390,4 @@
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
</cproject>

3
.gitignore vendored
Wyświetl plik

@ -1,4 +1,7 @@
*.d
*.o
*.map
station_config.h
Debug/
*.hex
*.elf

9
Debug/system/src/drivers/subdir.mk
Wyświetl plik

@ -4,31 +4,40 @@
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../system/src/drivers/_dht22.c \
../system/src/drivers/dallas.c \
../system/src/drivers/dht22.c \
../system/src/drivers/flash.c \
../system/src/drivers/gpio_conf.c \
../system/src/drivers/i2c.c \
../system/src/drivers/ms5611.c \
../system/src/drivers/sensirion_sht3x.c \
../system/src/drivers/serial.c \
../system/src/drivers/tx20.c \
../system/src/drivers/user_interf.c
OBJS += \
./system/src/drivers/_dht22.o \
./system/src/drivers/dallas.o \
./system/src/drivers/dht22.o \
./system/src/drivers/flash.o \
./system/src/drivers/gpio_conf.o \
./system/src/drivers/i2c.o \
./system/src/drivers/ms5611.o \
./system/src/drivers/sensirion_sht3x.o \
./system/src/drivers/serial.o \
./system/src/drivers/tx20.o \
./system/src/drivers/user_interf.o
C_DEPS += \
./system/src/drivers/_dht22.d \
./system/src/drivers/dallas.d \
./system/src/drivers/dht22.d \
./system/src/drivers/flash.d \
./system/src/drivers/gpio_conf.d \
./system/src/drivers/i2c.d \
./system/src/drivers/ms5611.d \
./system/src/drivers/sensirion_sht3x.d \
./system/src/drivers/serial.d \
./system/src/drivers/tx20.d \
./system/src/drivers/user_interf.d

3
Debug/system/src/stm32f1-stdperiph/subdir.mk
Wyświetl plik

@ -5,6 +5,7 @@
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../system/src/stm32f1-stdperiph/misc.c \
../system/src/stm32f1-stdperiph/stm32f10x_exti.c \
../system/src/stm32f1-stdperiph/stm32f10x_gpio.c \
../system/src/stm32f1-stdperiph/stm32f10x_i2c.c \
../system/src/stm32f1-stdperiph/stm32f10x_iwdg.c \
@ -14,6 +15,7 @@ C_SRCS += \
OBJS += \
./system/src/stm32f1-stdperiph/misc.o \
./system/src/stm32f1-stdperiph/stm32f10x_exti.o \
./system/src/stm32f1-stdperiph/stm32f10x_gpio.o \
./system/src/stm32f1-stdperiph/stm32f10x_i2c.o \
./system/src/stm32f1-stdperiph/stm32f10x_iwdg.o \
@ -23,6 +25,7 @@ OBJS += \
C_DEPS += \
./system/src/stm32f1-stdperiph/misc.d \
./system/src/stm32f1-stdperiph/stm32f10x_exti.d \
./system/src/stm32f1-stdperiph/stm32f10x_gpio.d \
./system/src/stm32f1-stdperiph/stm32f10x_i2c.d \
./system/src/stm32f1-stdperiph/stm32f10x_iwdg.d \

6
WIRING
Wyświetl plik

@ -20,8 +20,12 @@ PB8 - DTR line from TX20 aneometr - green wire in original cable but it can be j
PC6 - Dallas One Wire pin to DS termometer. Only one termometer can be used and it should be powered via separate +5V line,
parasite power is not recommended.
PC4 - DHT22 pin
LEDS:
Blue LED - DCD - lights up while controller is receiving APRS packet from radio.
Green LED - If meteo is enabled this blinks when transmission from TX20 anemometr is correctly received.
In 'non-meteo' mode it works as TX indicator and lights up when controler is transmitting data.
In 'non-meteo' mode it works as TX indicator and lights up when controler is transmitting data.

43
asm 100644
Wyświetl plik

@ -0,0 +1,43 @@
ConfigPath:
0800242c: push {r4, lr}
0800242e: mov r4, r0
14 memcpy(p[0].call, "AKLPRZ", 6), p[0].ssid = 0;
08002430: movs r2, #6
08002432: ldr r1, [pc, #44] ; (0x8002460 <ConfigPath+52>)
08002434: bl 0x8005d90 <memcpy>
08002438: movs r3, #0
0800243a: strb r3, [r4, #6]
20 memcpy(p[1].call, _CALL, 6), p[1].ssid = _SSID;
0800243c: movs r2, #6
0800243e: ldr r1, [pc, #36] ; (0x8002464 <ConfigPath+56>)
08002440: adds r0, r4, #7
08002442: bl 0x8005d90 <memcpy>
08002446: movs r3, #12
08002448: strb r3, [r4, #13]
21 memcpy(p[2].call, "WIDE2", 6), p[2].ssid = 1;
0800244a: movs r2, #6
0800244c: ldr r1, [pc, #24] ; (0x8002468 <ConfigPath+60>)
0800244e: add.w r0, r4, #14
08002452: bl 0x8005d90 <memcpy>
08002456: movs r3, #1
08002458: strb r3, [r4, #20]
30 }
0800245a: movs r0, #3
0800245c: pop {r4, pc}
0800245e: nop
08002460: strh r4, [r5, #26]
08002462: lsrs r0, r0, #32
08002464: strh r0, [r3, #22]
08002466: lsrs r0, r0, #32
08002468: strh r4, [r6, #26]
0800246a: lsrs r0, r0, #32
path_len = ConfigPath(path);
0800278e: ldr.w r8, [pc, #428] ; 0x800293c <main(int, char**)+468>
08002792: mov r0, r8
08002794: bl 0x800242c <ConfigPath>
08002798: ldr r3, [pc, #332] ; (0x80028e8 <main(int, char**)+384>)
0800279a: strb r0, [r3, #0]
98 LedConfig();
0800279c: bl 0x80023c8 <LedConfig>

13
src/it_handlers.c
Wyświetl plik

@ -9,6 +9,7 @@
#include "drivers/dallas.h"
#include "drivers/tx20.h"
#include "drivers/ms5611.h"
#include "drivers/_dht22.h"
#include "aprs/wx.h"
#include "aprs/telemetry.h"
#include "aprs/beacon.h"
@ -89,6 +90,18 @@ void TIM3_IRQHandler(void) {
// wysylanie wlasnej pozycji i danych WX
TIM3->SR &= ~(1<<0);
#ifdef _METEO
temperature = SensorBringTemperature();
td = DallasQuery();
#ifdef _DBG_TRACE
trace_printf("temperatura DS: %d\r\n", (int)td);
#endif
pressure = (float)SensorBringPressure();
#ifdef _DBG_TRACE
trace_printf("cisnienie MS: %d\r\n", (int)pressure);
#endif
if (dht22State == DHT22_STATE_DONE || dht22State == DHT22_STATE_TIMEOUT)
dht22State = DHT22_STATE_IDLE;
#ifndef _MUTE_OWN
if (WXInterval != 0 && WXI >= WXInterval) {
trace_printf("Pogoda\r\n");

40
src/main.cpp
Wyświetl plik

@ -36,6 +36,7 @@
#include "drivers/ms5611.h"
#include "drivers/i2c.h"
#include "drivers/tx20.h"
#include "drivers/_dht22.h"
#include "aprs/wx.h"
#endif
@ -77,6 +78,8 @@ float temperature;
float td;
double pressure = 0.0;
dht22Values dht, dht_valid;
static void message_callback(struct AX25Msg *msg) {
}
@ -97,6 +100,7 @@ main(int argc, char* argv[])
path_len = ConfigPath(path);
#ifdef _METEO
// DHT22_Init();
i2cConfigure();
#endif
LedConfig();
@ -104,8 +108,8 @@ main(int argc, char* argv[])
ax25_init(&ax25, &a, 0, 0x00);
DA_Init();
TimerConfig();
#ifdef _METEO
dht22_init();
DallasInit(GPIOC, GPIO_Pin_6, GPIO_PinSource6);
TX20Init();
#endif
@ -114,7 +118,7 @@ main(int argc, char* argv[])
#endif
SrlConfig();
td = 0.0;
td = 0.0f;
temperature = 0.0f;
BcnInterval = _BCN_INTERVAL;
@ -122,10 +126,10 @@ main(int argc, char* argv[])
TelemInterval = 10;
#ifdef _METEO
SensorReset(0xEC);
td = DallasQuery();
SensorReadCalData(0xEC, SensorCalData);
SensorStartMeas(0);
SensorReset(0xEC);
td = DallasQuery();
SensorReadCalData(0xEC, SensorCalData);
SensorStartMeas(0);
#endif
aprs_msg_len = sprintf(aprs_msg, "=%07.2f%c%c%08.2f%c%c %s\0", (float)_LAT, _LATNS, _SYMBOL_F, (float)_LON, _LONWE, _SYMBOL_S, _COMMENT);
@ -157,6 +161,8 @@ main(int argc, char* argv[])
GPIO_ResetBits(GPIOC, GPIO_Pin_8 | GPIO_Pin_9);
TimerConfig();
#ifdef _BCN_ON_STARTUP
SendOwnBeacon();
#endif
@ -168,12 +174,13 @@ main(int argc, char* argv[])
SendSimpleTelemetry(1);
}
else {
;
}
if(new_msg_rx == 1) {
memset(srlTXData, 0x00, sizeof(srlTXData));
SrlStartTX(SendKISSToHost(0x00, msg.raw_data, (msg.raw_msg_len - 2), srlTXData));
ax25.dcd = false;
#ifdef _DBG_TRACE
trace_printf("APRS-RF:RadioPacketFrom=%.6s-%d,FirstPathEl=%.6s-%d\r\n", msg.src.call, msg.src.ssid, msg.rpt_lst[0].call, msg.rpt_lst[0].ssid);
@ -193,6 +200,25 @@ main(int argc, char* argv[])
SrlReceiveData(120, FEND, FEND, 0, 0, 0);
}
dht22_timeout_keeper();
switch (dht22State) {
case DHT22_STATE_IDLE:
dht22_comm(&dht);
break;
case DHT22_STATE_DATA_RDY:
dht22_decode(&dht);
break;
case DHT22_STATE_DATA_DECD:
dht_valid = dht; // powrot do stanu DHT22_STATE_IDLE jest w TIM3_IRQHandler
dht22State = DHT22_STATE_DONE;
#ifdef _DBG_TRACE
trace_printf("DHT22: temperature=%d,humi=%d\r\n", dht_valid.scaledTemperature, dht_valid.humidity);
#endif
break;
default: break;
}
}
// Infinite loop, never return.
}

54
system/include/drivers/_dht22.h 100644
Wyświetl plik

@ -0,0 +1,54 @@
/*
* _dht22.h
*
* Created on: 17.04.2018
* Author: mateusz
*/
#ifndef INCLUDE_DRIVERS__DHT22_H_
#define INCLUDE_DRIVERS__DHT22_H_
#define DHT22_START_SIG_DURATION 200
#define DHT22_WAITING_FOR_START_RESP_DURATION 12
#define DHT22_LOW_LEVEL_BEFORE_BIT 10
#define DHT22_MAX_ZERO_DURATION 20
#define DHT22_INTERRUPT_DURATION 40
#define DHT22_PIN_PORT GPIOC
#define DHT22_PIN_CLOCK RCC_APB2Periph_GPIOC
#define DHT22_PIN_PIN GPIO_Pin_4
#define DHT22_STATE_IDLE 10
#define DHT22_STATE_COMMS 11
#define DHT22_STATE_DATA_RDY 12
#define DHT22_STATE_DATA_DECD 13
#define DHT22_STATE_TIMEOUT 14
#define DHT22_STATE_DONE 15
#define DHT22_STATE_COMMS_IRQ 16
typedef enum dht22QF {
DHT22_QF_FULL,
DHT22_QF_DEGRADATED,
DHT22_QF_UNAVALIABLE
} dht22QF;
typedef struct dht22Values {
uint8_t humidity;
uint16_t scaledTemperature;
dht22QF qf;
}dht22Values;
extern uint8_t dht22State;
#ifdef __cplusplus
extern "C" {
#endif
void dht22_init(void);
void dht22_comm(dht22Values *data);
void dht22_decode(dht22Values *data);
void dht22_timeout_keeper(void);
#ifdef __cplusplus
}
#endif
#endif /* INCLUDE_DRIVERS__DHT22_H_ */

23
system/include/drivers/dht22.h 100644
Wyświetl plik

@ -0,0 +1,23 @@
/* Port and pin with DHT22 sensor*/
#define DHT22_GPIO_PORT GPIOC
#define DHT22_GPIO_CLOCK RCC_APB2Periph_GPIOC
#define DHT22_GPIO_PIN GPIO_Pin_4
/* DHT22_GetReadings response codes */
#define DHT22_RCV_OK 0 // Return with no error
#define DHT22_RCV_NO_RESPONSE 1 // No response from sensor
#define DHT22_RCV_BAD_ACK1 2 // Bad first half length of ACK impulse
#define DHT22_RCV_BAD_ACK2 3 // Bad second half length of ACK impulse
#define DHT22_RCV_RCV_TIMEOUT 4 // It was timeout while receiving bits
#ifdef __cplusplus
extern "C" {
#endif
void DHT22_Init(void);
uint32_t DHT22_GetReadings(void);
uint16_t DHT22_DecodeReadings(void);
uint16_t DHT22_GetHumidity(void);
uint16_t DHT22_GetTemperature(void);
#ifdef __cplusplus
}
#endif

32
system/include/drivers/sensirion_sht3x.h 100644
Wyświetl plik

@ -0,0 +1,32 @@
/*
* sensirion_sht3x.h
*
* Created on: 02.01.2018
* Author: mateusz
*/
#ifndef INCLUDE_DRIVERS_SENSIRION_SHT3X_H_
#define INCLUDE_DRIVERS_SENSIRION_SHT3X_H_
#include "drivers/i2c.h"
#include <stdint.h>
#define SHT3X_RADDR ((0x44 << 1) | 1 )
#define SHT3X_WADDR (0x44 << 1)
#define SHT3X_SS_LOW_NOSTREACH 0x2416
/* C++ detection */
#ifdef __cplusplus
extern "C" {
#endif
void sht3x_start_measurement(void);
void sht3x_read_measurements(uint16_t *temperature, uint16_t *humidity);
/* C++ detection */
#ifdef __cplusplus
}
#endif
#endif /* INCLUDE_DRIVERS_SENSIRION_SHT3X_H_ */

178
system/src/drivers/_dht22.c 100644
Wyświetl plik

@ -0,0 +1,178 @@
/*
* _dht22.c
*
* Created on: 17.04.2018
* Author: mateusz
*/
#include <stm32f10x_gpio.h>
#include <stm32f10x_exti.h>
#include "../drivers/_dht22.h"
#include "../drivers/dallas.h" // for delay
#include <stdint.h>
#include <stdio.h>
uint8_t bitsDuration[41];
uint8_t currentBit;
uint8_t bytes[5];
uint8_t dht22State = 0;
GPIO_InitTypeDef PORT_out, PORT_in;
EXTI_InitTypeDef exti, exti_disable;
void dht22_init(void) {
memset(bitsDuration, 0x00, 41);
memset(bytes, 0x00, 5);
currentBit = 0;
/*
* Initializing of the GPIO pin used to communicatie with sensor
*/
GPIO_StructInit(&PORT_out);
GPIO_StructInit(&PORT_in);
PORT_out.GPIO_Mode = GPIO_Mode_Out_OD;
PORT_out.GPIO_Pin = DHT22_PIN_PIN;
PORT_out.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(DHT22_PIN_PORT,&PORT_out);
GPIO_SetBits(DHT22_PIN_PORT, DHT22_PIN_PIN);
PORT_in.GPIO_Mode = GPIO_Mode_IN_FLOATING;
PORT_in.GPIO_Pin = DHT22_PIN_PIN;
PORT_in.GPIO_Speed = GPIO_Speed_50MHz;
EXTI_StructInit(&exti);
exti.EXTI_Line = EXTI_Line4;
exti.EXTI_Mode = EXTI_Mode_Interrupt;
exti.EXTI_Trigger = EXTI_Trigger_Falling;
exti.EXTI_LineCmd = ENABLE;
EXTI_StructInit(&exti_disable);
exti.EXTI_Line = EXTI_Line4;
exti.EXTI_Mode = EXTI_Mode_Interrupt;
exti.EXTI_Trigger = EXTI_Trigger_Falling;
exti.EXTI_LineCmd = DISABLE;
dht22State = DHT22_STATE_IDLE;
}
void dht22_comm(dht22Values *in) {
dht22_init();
dht22State = DHT22_STATE_COMMS;
GPIO_Init(DHT22_PIN_PORT,&PORT_out);
GPIO_SetBits(DHT22_PIN_PORT, DHT22_PIN_PIN);
DallasConfigTimer();
/*
* Setting pin logic-low to initialize transfer.
*/
GPIO_ResetBits(DHT22_PIN_PORT, DHT22_PIN_PIN);
delay_5us = DHT22_START_SIG_DURATION;
while (delay_5us != 0);
GPIO_SetBits(DHT22_PIN_PORT, DHT22_PIN_PIN);
/*
* Waiting for the response pulse from sensor
*/
GPIO_Init(DHT22_PIN_PORT,&PORT_in);
delay_5us = DHT22_WAITING_FOR_START_RESP_DURATION;
while (delay_5us != 0);
uint8_t sensorResp = GPIO_ReadInputDataBit(DHT22_PIN_PORT, DHT22_PIN_PIN);
if (sensorResp == Bit_SET) {
dht22State = DHT22_STATE_TIMEOUT;
DallasDeConfigTimer();
if (in != 0x00)
in->qf = DHT22_QF_UNAVALIABLE;
return; // if pin is still high it usually means that there is a problem with comm with the sensor
}
else;
/*
* Starting the edge detected interrupt on this pin (EXTI)
*/
GPIO_EXTILineConfig(GPIO_PortSourceGPIOC, GPIO_PinSource4);
EXTI_Init(&exti);
EXTI->FTSR |= 1 << 4;
EXTI->IMR |= 1 << 4;
NVIC_EnableIRQ(EXTI4_IRQn);
dht22State = DHT22_STATE_COMMS_IRQ;
delay_5us = DHT22_INTERRUPT_DURATION;
return;
/*
* Now
*/
}
void EXTI4_IRQHandler(void) {
EXTI->PR |= EXTI_PR_PR4;
if (dht22State == DHT22_STATE_COMMS_IRQ) {
bitsDuration[currentBit++] = DHT22_INTERRUPT_DURATION - delay_5us;
delay_5us = DHT22_INTERRUPT_DURATION;
if (currentBit >= 41) {
EXTI->FTSR &= (0xFFFFFFFF ^ (1 << 4));
EXTI->IMR &= (0xFFFFFFFF ^ (1 << 4));
NVIC_DisableIRQ(EXTI4_IRQn);
currentBit = 0;
GPIO_Init(DHT22_PIN_PORT,&PORT_out);
GPIO_SetBits(DHT22_PIN_PORT, DHT22_PIN_PIN);
dht22State = DHT22_STATE_DATA_RDY;
DallasDeConfigTimer();
}
}
}
void dht22_decode(dht22Values *data) {
if (data == 0x00)
return;
for (int i = 0; i < 41; i++) {
if (bitsDuration[i] > DHT22_MAX_ZERO_DURATION)
bitsDuration[i] = 1;
else
bitsDuration[i] = 0;
}
bytes[0] = (bitsDuration[1] << 7) | (bitsDuration[2] << 6) | (bitsDuration[3] << 5) | (bitsDuration[4] << 4) | (bitsDuration[5] << 3) | (bitsDuration[6] << 2) | (bitsDuration[7] << 1) | (bitsDuration[8]);
bytes[1] = (bitsDuration[9] << 7) | (bitsDuration[10] << 6) | (bitsDuration[11] << 5) | (bitsDuration[12] << 4) | (bitsDuration[13] << 3) | (bitsDuration[14] << 2) | (bitsDuration[15] << 1) | (bitsDuration[16]);
bytes[2] = (bitsDuration[17] << 7) | (bitsDuration[18] << 6) | (bitsDuration[19] << 5) | (bitsDuration[20] << 4) | (bitsDuration[21] << 3) | (bitsDuration[22] << 2) | (bitsDuration[23] << 1) | (bitsDuration[24]);
bytes[3] = (bitsDuration[25] << 7) | (bitsDuration[26] << 6) | (bitsDuration[27] << 5) | (bitsDuration[28] << 4) | (bitsDuration[29] << 3) | (bitsDuration[30] << 2) | (bitsDuration[31] << 1) | (bitsDuration[32]);
bytes[4] = (bitsDuration[33] << 7) | (bitsDuration[34] << 6) | (bitsDuration[35] << 5) | (bitsDuration[36] << 4) | (bitsDuration[37] << 3) | (bitsDuration[38] << 2) | (bitsDuration[39] << 1) | (bitsDuration[40]);
uint8_t checksum = 0xFF & (uint32_t)(bytes[0] + bytes[1] + bytes[2] + bytes[3]);
data->humidity = (bytes[0] << 8 | bytes[1]) / 10;
data->scaledTemperature = ((bytes[2] & 0x7F) << 8 | bytes[3]);
if ((bytes[2] & 0x80) > 0)
data->scaledTemperature *= -1;
else;
if (checksum == bytes[4]) {
data->qf = DHT22_QF_FULL;
dht22State = DHT22_STATE_DATA_DECD;
}
else {
data->qf = DHT22_QF_DEGRADATED;
dht22State = DHT22_STATE_IDLE;
}
}
void dht22_timeout_keeper(void) {
if (dht22State == DHT22_STATE_COMMS) {
if (delay_5us == 0) {
dht22State = DHT22_STATE_TIMEOUT;
dht22_init();
EXTI_Init(&exti_disable);
DallasDeConfigTimer();
}
}
}

124
system/src/drivers/dht22.c 100644
Wyświetl plik

@ -0,0 +1,124 @@
#include <stm32f10x_rcc.h>
#include <stm32f10x_gpio.h>
#include "../drivers/dallas.h"
#include "../drivers/dht22.h"
uint16_t bits[40];
uint8_t hMSB = 0;
uint8_t hLSB = 0;
uint8_t tMSB = 0;
uint8_t tLSB = 0;
uint8_t parity_rcv = 0;
static GPIO_InitTypeDef PORT;
void DHT22_Init(void) {
RCC_APB2PeriphClockCmd(DHT22_GPIO_CLOCK,ENABLE);
PORT.GPIO_Mode = GPIO_Mode_Out_PP;
PORT.GPIO_Pin = DHT22_GPIO_PIN;
PORT.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(DHT22_GPIO_PORT,&PORT);
}
uint32_t DHT22_GetReadings(void) {
uint32_t wait;
uint8_t i;
DallasConfigTimer();
// Generate start impulse for sensor
DHT22_GPIO_PORT->BRR = DHT22_GPIO_PIN; // Pull down SDA (Bit_SET)
delay_5us = 175; // delay 875us
while (delay_5us != 0);
DHT22_GPIO_PORT->BSRR = DHT22_GPIO_PIN; // Release SDA (Bit_RESET)
// Switch pin to input with Pull-Up
PORT.GPIO_Mode = GPIO_Mode_IPU;
GPIO_Init(DHT22_GPIO_PORT,&PORT);
// Wait for AM2302 to start communicate
delay_5us = 80;
while ((DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
if (delay_5us < 10) return DHT22_RCV_NO_RESPONSE;
// Check ACK strobe from sensor
delay_5us = 20;
while (!(DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
if ((delay_5us > 1) || (delay_5us < 3)) return DHT22_RCV_BAD_ACK1;
delay_5us = 20;
while ((DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
if ((wait > 1) || (wait < 3)) return DHT22_RCV_BAD_ACK2;
// ACK strobe received --> receive 40 bits
i = 0;
while (i < 40) {
// Measure bit start impulse (T_low = 50us)
delay_5us = 4;
while (!(DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
if (delay_5us <= 3) {
// invalid bit start impulse length
bits[i] = 0xffff;
delay_5us = 4;
while ((DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
} else {
// Measure bit impulse length (T_h0 = 25us, T_h1 = 70us)
delay_5us = 4;
while ((DHT22_GPIO_PORT->IDR & DHT22_GPIO_PIN) && (delay_5us > 0));
bits[i] = (delay_5us <= 3) ? delay_5us * 5 : 0xffff;
}
i++;
}
DallasDeConfigTimer();
for (i = 0; i < 40; i++) if (bits[i] == 0xffff) return DHT22_RCV_RCV_TIMEOUT;
return DHT22_RCV_OK;
}
uint16_t DHT22_DecodeReadings(void) {
uint8_t parity;
uint8_t i = 0;
hMSB = 0;
for (; i < 8; i++) {
hMSB <<= 1;
if (bits[i] > 7) hMSB |= 1;
}
hLSB = 0;
for (; i < 16; i++) {
hLSB <<= 1;
if (bits[i] > 7) hLSB |= 1;
}
tMSB = 0;
for (; i < 24; i++) {
tMSB <<= 1;
if (bits[i] > 7) tMSB |= 1;
}
tLSB = 0;
for (; i < 32; i++) {
tLSB <<= 1;
if (bits[i] > 7) tLSB |= 1;
}
for (; i < 40; i++) {
parity_rcv <<= 1;
if (bits[i] > 7) parity_rcv |= 1;
}
parity = hMSB + hLSB + tMSB + tLSB;
return (parity_rcv << 8) | parity;
}
uint16_t DHT22_GetHumidity(void) {
return (hMSB << 8) + hLSB;
}
uint16_t DHT22_GetTemperature(void) {
return (tMSB << 8) + tLSB;
}

98
system/src/drivers/ms5611.c
Wyświetl plik

@ -1,5 +1,6 @@
#include "drivers/ms5611.h"
#include "drivers/i2c.h"
#include "drivers/dallas.h"
// adres do zapisu: 0xEC
// adres do oczytu: 0xED
@ -16,12 +17,26 @@ double SensorDT = 0.0;
// resetowanie sensora i pobieranie jego danych kalibracyjnych
void SensorReset(int addr) {
DallasConfigTimer();
delay_5us = 5000;
int txbuf[] = {0x1E, '\0' }; // komenda 0x1E resetuj<75>ca czujnik
while(i2cTXing != 0 && i2cRXing !=0); // je<6A>eli magistala i2c nie jest zaj<61>ta, tj nie nadaj<61> i nie odbiera
while(i2cTXing != 0 && i2cRXing !=0) {
if (delay_5us == 0) {
DallasDeConfigTimer();
return;
}
};
i2cSendData(0xEC, txbuf, 0); // wys<79>anie danych pod adres 0xEC czyli do czujnika
while(i2cTXing != 0); // czekanie na zako<6B>czenie transmisji
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return;
}
}; // czekanie na zako<6B>czenie transmisji
// Delay10ms(); // oczekiwanie 10ms, tyle miej wi<77>cej trwa resetowanie czujnika
// SensorReadCalData(0xEC, SensorCalData); // odczytywanie danych kalibracyjnych
DallasDeConfigTimer();
return;
}
int SensorReadCalData(int addr, int* cal_data) {
@ -29,17 +44,35 @@ int SensorReadCalData(int addr, int* cal_data) {
int txbuf[2];
int rxbuf[] = {0x00, 0x00};
j = 0;
DallasConfigTimer();
delay_5us = 5000;
for (i=0; i<=0xE; i+=2) {
while(i2cTXing != 0 && i2cRXing !=0); // je<6A>eli magistrala nie jest zaj<61>ta
while(i2cTXing != 0 && i2cRXing !=0) {
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
txbuf[0] = 0xA0 + i; // 0xA0 to adres pierwszej sta<74>ej kalibracyjnej, ka<6B>da z nich ma 16 bit<69>w
txbuf[1] = '\0';
i2cSendData(0xEC, txbuf, 0); // wysy<73>anie adresu do odczytania
while(i2cTXing != 0); // oczekiwanie na zako<6B>czenie transmisji
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
i2cReceiveData(0xED, rxbuf, 2); // odbi<62>r danych z czujnika
while(i2cRXing != 0);
while(i2cRXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
*(cal_data + j) = ((i2cRXData[0] << 8) | i2cRXData[1]); // przepisywanie danych z bufor<6F>w do tablicy
j++;
}
DallasDeConfigTimer();
if (crc4(cal_data) == 0x08) // sprawdzanie poprawno<6E>ci odebranych danych
return 0;
else
@ -49,13 +82,21 @@ int SensorReadCalData(int addr, int* cal_data) {
long int SensorStartMeas(int param_to_meas) {
int txbuf[] = { 0x00, 0x00};
long int output;
delay_5us = 5000;
DallasConfigTimer();
if(param_to_meas == 0x00) {
////////////////////////////
//// POMIAR TEMPERATURY ////
////////////////////////////
txbuf[0] = 0x54; // oversampling 1024
i2cSendData(0xEC,txbuf, 0); // wys<79>anie rozkazu rozpocz<63>cia pomiaru
while (i2cTXing != 0);
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
DallasDeConfigTimer();
return 0;
}
else if(param_to_meas == 0x01) { // pomiar D1
@ -64,17 +105,33 @@ long int SensorStartMeas(int param_to_meas) {
////////////////////////////
txbuf[0] = 0x00;
i2cSendData(0xEC,txbuf, 0x01); // wys<79>anie rozkazu odczytu wyniku
while (i2cTXing != 0);
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
i2cReceiveData(0xED, txbuf, 3);
while (i2cRXing != 0);
while(i2cRXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
output = ((i2cRXData[0] << 16) | (i2cRXData[1] << 8) | i2cRXData[2]);
////////////////////////////
//// POMIAR CI<43>NIENIA ////
////////////////////////////
txbuf[0] = 0x44; // oversampling 1024
i2cSendData(0xEC,txbuf, 0); // wys<79>anie rozkazu rozpocz<63>cia pomiaru
while (i2cTXing != 0);
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
// Delay10ms(); // oczekiwanie na zako<6B>czenie pomiaru
DallasDeConfigTimer();
return output;
}
else if(param_to_meas == 0x02) { // pomiar D2
@ -83,19 +140,36 @@ long int SensorStartMeas(int param_to_meas) {
//////////////////////////
txbuf[0] = 0x00;
i2cSendData(0xEC,txbuf, 0x01); // wys<79>anie rozkazu odczytu wyniku
while (i2cTXing != 0);
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
i2cReceiveData(0xED, txbuf, 3);
while (i2cRXing != 0);
while(i2cRXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
output = ((i2cRXData[0] << 16) | (i2cRXData[1] << 8) | i2cRXData[2]);
////////////////////////////
//// POMIAR TEMPERATURY ////
////////////////////////////
txbuf[0] = 0x54; // oversampling 1024
i2cSendData(0xEC,txbuf, 0); // wys<79>anie rozkazu rozpocz<63>cia pomiaru
while (i2cTXing != 0);
while(i2cTXing != 0){
if (delay_5us == 0) {
DallasDeConfigTimer();
return -2;
}
};
// Delay10ms(); // oczekiwanie na zako<6B>czenie pomiaru
DallasDeConfigTimer();
return output;
}
DallasDeConfigTimer();
return -1;
}

44
system/src/drivers/sensirion_sht3x.c 100644
Wyświetl plik

@ -0,0 +1,44 @@
/*
* sensirion_sht3x.c
*
* Created on: 02.01.2018
* Author: mateusz
*/
#include "drivers/sensirion_sht3x.h"
void sht3x_start_measurement(void) {
uint32_t txbuff[3] = {0, 0, 0};
txbuff[0] = (uint32_t)(SHT3X_SS_LOW_NOSTREACH & 0xFF00) >> 8;
txbuff[1] = (uint32_t)SHT3X_SS_LOW_NOSTREACH & 0xFF;
while(i2cTXing != 0 && i2cRXing !=0); // je<6A>eli magistala i2c nie jest zaj<61>ta, tj nie nadaj<61> i nie odbiera
i2cSendData(SHT3X_WADDR, txbuff, 0); // wys<79>anie danych pod adres 0xEC czyli do czujnika
while(i2cTXing != 0);
}
void sht3x_read_measurements(uint16_t *temperature, uint16_t *humidity) {
// int rxbuff[6];
// memset(rxbuff, 0x00, 6);
uint16_t temperature_raw = 0;
uint16_t humidity_raw = 0;
float temperature_phy = 0;
float himidity_phy = 0;
while(i2cTXing != 0 && i2cRXing !=0); // je<6A>eli magistala i2c nie jest zaj<61>ta, tj nie nadaj<61> i nie odbiera
i2cReceiveData(SHT3X_RADDR, 0, 9); // odbi<62>r danych z czujnika
while(i2cRXing !=0); // je<6A>eli magistala i2c nie jest zaj<61>ta, tj nie nadaj<61> i nie odbiera
temperature_raw = ((i2cRXData[0] << 8) | i2cRXData[1]);
humidity_raw = ((i2cRXData[3] << 8) | i2cRXData[4]);
temperature_phy = -45.0f + 175.0f * (float)( temperature_raw / 65535.0f);
*temperature = (uint16_t)temperature_phy;
return;
}

4
system/src/drivers/serial.c
Wyświetl plik

@ -35,8 +35,8 @@ void SrlConfig(void) {
Configure_GPIO(GPIOA,10,PUD_INPUT); // RX
Configure_GPIO(GPIOA,9,AFPP_OUTPUT_2MHZ); // TX
Configure_GPIO(GPIOB,6,AFPP_OUTPUT_2MHZ); // TX-remap
Configure_GPIO(GPIOB,7,PUD_INPUT); // RX-remap
// Configure_GPIO(GPIOB,6,AFPP_OUTPUT_2MHZ); // TX-remap
// Configure_GPIO(GPIOB,7,PUD_INPUT); // RX-remap
// AFIO->MAPR |= AFIO_MAPR_USART2_REMAP;
RCC->APB2ENR |= RCC_APB2ENR_USART1EN; // wġṗczanie zegara dla USART