From ff1c09d9f8fa613c67706580ab3a0b0bee528728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Wed, 23 Mar 2016 01:20:49 +0100 Subject: [PATCH] added updated sbmp --- Makefile | 2 +- esp_meas.pro | 6 ++++-- esp_meas.pro.user | 2 +- sbmp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 44a7bd6..a2e86a3 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ LIBS += esphttpd # compiler flags using during compilation of source files CFLAGS = -Os -ggdb -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \ -nostdlib -mlongcalls -mtext-section-literals -D__ets__ -DICACHE_FLASH \ - -Wno-address -ffunction-sections + -Wno-address -ffunction-sections -Wno-strict-aliasing # linker flags used to generate the main object file LDFLAGS = -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static -Wl,--gc-sections diff --git a/esp_meas.pro b/esp_meas.pro index 02e6dc8..d3a506c 100644 --- a/esp_meas.pro +++ b/esp_meas.pro @@ -51,7 +51,8 @@ SOURCES += \ sbmp/library/sbmp_bulk.c \ user/datalink.c \ user/serial.c \ - user/uptime.c + user/uptime.c \ + sbmp/library/payload_parser.c HEADERS += \ include/uart_hw.h \ @@ -124,7 +125,8 @@ HEADERS += \ user/datalink.h \ user/serial.h \ libesphttpd/include/logging.h \ - user/uptime.h + user/uptime.h \ + sbmp/library/payload_parser.h DISTFILES += \ style.astylerc \ diff --git a/esp_meas.pro.user b/esp_meas.pro.user index e8853ba..62babc2 100644 --- a/esp_meas.pro.user +++ b/esp_meas.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/sbmp b/sbmp index 38a9496..7c43fd3 160000 --- a/sbmp +++ b/sbmp @@ -1 +1 @@ -Subproject commit 38a9496e7cabb166fc4d34b3f53558e2394d4091 +Subproject commit 7c43fd3e1a147d24cde05a7ecd3d155e293caa89