Skip to content
Snippets Groups Projects
Commit c3fe4fd0 authored by Jens Nolte's avatar Jens Nolte
Browse files

Move headers to `qthing/` path and move envronment

parent 69627ae1
No related branches found
No related tags found
1 merge request!16Merge dev branch into master
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "lwip/err.h" #include "lwip/err.h"
#include "lwip/sockets.h" #include "lwip/sockets.h"
#include "lwip/sys.h" #include "lwip/sys.h"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
static const char* TAG = "udp-server"; static const char* TAG = "udp-server";
......
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
#include "esp_event_loop.h" #include "esp_event_loop.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_wifi.h" #include "esp_wifi.h"
#include "event.hpp" #include "qthing/event.hpp"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/event_groups.h" #include "freertos/event_groups.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "io.hpp" #include "qthing/io.hpp"
#include "mqtt.hpp" #include "qthing/mqtt.hpp"
#include "network.hpp" #include "qthing/network.hpp"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
#include "string.h" #include "string.h"
namespace qthing { namespace qthing {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "apps/sntp/sntp.h" #include "apps/sntp/sntp.h"
#include "esp_log.h" #include "esp_log.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
#define TAG "NTP" #define TAG "NTP"
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#include "Arduino.h" #include "Arduino.h"
#include "SSD1306Wire.h" #include "SSD1306Wire.h"
#include "event.hpp" #include "qthing/event.hpp"
#include "network.hpp" #include "qthing/network.hpp"
#include "oled_symbols.hpp" #include "qthing/oled_symbols.hpp"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
namespace qthing { namespace qthing {
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include <array> #include <array>
#include <functional> #include <functional>
#include "io.hpp" #include "qthing/io.hpp"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
#define TAG "button_panel" #define TAG "button_panel"
......
#include "led_strip.hpp" #include "qthing/led_strip.hpp"
#include <algorithm> #include <algorithm>
#include "power.hpp" #include "qthing/power.hpp"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
using namespace qthing; using namespace qthing;
......
#include "rc_433.hpp" #include "qthing/rc_433.hpp"
#include <RCSwitch.h> #include <RCSwitch.h>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "esp_log.h" #include "esp_log.h"
#include "mqtt.hpp" #include "qthing/mqtt.hpp"
#define RC_TAG "RC_433" #define RC_TAG "RC_433"
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "mqtt.hpp" #include "qthing/mqtt.hpp"
#include "polyfill.hpp" #include "qthing/polyfill.hpp"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
#define SLEEP_PERIOD 60 * 1000 / portTICK_PERIOD_MS #define SLEEP_PERIOD 60 * 1000 / portTICK_PERIOD_MS
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include "esp_log.h" #include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "io.hpp" #include "qthing/io.hpp"
#include "network.hpp" #include "qthing/network.hpp"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
namespace qthing { namespace qthing {
......
#include "power.hpp" #include "qthing/power.hpp"
#include "esp_pm.h" #include "esp_pm.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
// Power state guard // Power state guard
static bool max_power = false; static bool max_power = false;
......
#include "time.hpp" #include "qthing/time.hpp"
bool qthing::get_localtime(tm& result) { bool qthing::get_localtime(tm& result) {
time_t now = time(NULL); time_t now = time(NULL);
......
#include "util.hpp" #include "qthing/util.hpp"
#include <sstream> #include <sstream>
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "lwip/sockets.h" #include "lwip/sockets.h"
#include "qthing_legacy.hpp" #include "qthing/qthing_legacy.hpp"
unsigned long IRAM_ATTR qthing::millis() { return xTaskGetTickCount() * portTICK_PERIOD_MS; } unsigned long IRAM_ATTR qthing::millis() { return xTaskGetTickCount() * portTICK_PERIOD_MS; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment