Compare commits

..

No commits in common. "a70cc3a1f0be8ce011bbc5513fad36ccdc67c4c8" and "2c611ccc5a94a83e511cb37b562e88878da2de45" have entirely different histories.

5 changed files with 6 additions and 7 deletions

7
.gitmodules vendored
View File

@ -2,7 +2,6 @@
path = bme680-air-meter
url = https://git.shimatta.de/pcb/bme680-air-meter
branch = master
[submodule "bme680-driver-fork"]
path = bme680-driver-fork
url = https://git.shimatta.de/mhu/bme680-driver-fork
branch = master
[submodule "BME680_driver"]
path = BME680_driver
url = https://github.com/BoschSensortec/BME680_driver.git

1
BME680_driver Submodule

@ -0,0 +1 @@
Subproject commit 63bb5336db4659519860832be2738c685133aa33

View File

@ -17,7 +17,7 @@ mapfile = memmap
##Custom Files###
CFILES += bme680-driver-fork/bme680.c
CFILES += BME680_driver/bme680.c
###################################################################################

@ -1 +0,0 @@
Subproject commit 617908cbd42082ea23c38c73cfc9fd0dcd1789b5

2
main.c
View File

@ -1,5 +1,5 @@
#include <stm32f0xx.h>
#include "bme680-driver-fork/bme680.h"
#include "BME680_driver/bme680.h"
unsigned int i = 0x12345678;
unsigned char c = 2;