Co-authored-by: clajimbus <clajimbus@users.noreply.github.com>
This commit is contained in:
@@ -4,5 +4,4 @@
|
||||
#define I2C_BMP280_ADDRESS 0x76
|
||||
|
||||
void BMP280_Init();
|
||||
uint8_t BMP280_DataReady();
|
||||
void BMP280_Read();
|
||||
bool BMP280_Read(float &temperature, float &pressure, float &altitude);
|
||||
@@ -1,23 +1,14 @@
|
||||
<<<<<<< HEAD
|
||||
#include <Arduino.h>
|
||||
|
||||
#include "json.hpp"
|
||||
#include "rest.hpp"
|
||||
#include "wifi.hpp"
|
||||
#include "test.hpp"
|
||||
#include "mqtt.hpp"
|
||||
|
||||
#define LED 2
|
||||
#define SERVER_IP "192.168.1.178"
|
||||
#define REST_PORT 80
|
||||
#define MQTT_PORT 1883
|
||||
=======
|
||||
#include <Arduino.h>
|
||||
|
||||
#include "JsonTools.hpp"
|
||||
#include "RestClient.hpp"
|
||||
#include "WifiConnection.hpp"
|
||||
#include "MqttClient.hpp"
|
||||
|
||||
uint32_t getChipID();
|
||||
>>>>>>> main
|
||||
|
||||
#include "JsonTools.hpp"
|
||||
#include "RestClient.hpp"
|
||||
#include "WifiConnection.hpp"
|
||||
#include "MqttClient.hpp"
|
||||
#include "BMP280.hpp"
|
||||
|
||||
uint32_t getChipID();
|
||||
Reference in New Issue
Block a user