v40 (#69)

* start v40 development * CHANGE: CO2 alert lower values to 300 * [Feature] Enter setup mode API Fixes #46 * update readme * [Enhance] Add moving something to Setup mode display Fixes #44 * update readme * [Enhance] mDNS code ESP32 and ESP8266 are duplicated Fixes #60 * [Enhance] Alerts should not occur if no sensor connected Fixes #49 * update readme * fIX: compile error * fix #64 * CHANGE: Dont timer read if sensor not connected * CHANGE: No sensor No alert * FIX: Wait for reconfigure bar length invalid * update readme * refs #54 * [Feature] Air pressure delta Fixes #54 * [Feature] Air pressure delta Fixes #54 bigmode * v40
yakumo-saki · Feb 12, 2021 · 377386d · 377386d
1 parent 293b343
commit 377386d
Show file tree

Hide file tree

Showing 62 changed files with 1,105 additions and 617 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,3 +0,0 @@
-[*.cpp, *.h]
-indent_size = 4
-indent_style = tab

diff --git a/README.md b/README.md
@@ -118,14 +118,18 @@ Maybe I can support ST7789 on ESP8266. but not in TODO.
 
 ### http server
 
-All endpoints are using GET Method
+EnvBoyX has http API.
 
-| ENDPOINT      | description                |
-| ------------- | -------------------------- |
-| /             | returns sensor value as JSON.|
-| /ping         | returns pong. |
-| /brightness?value=<brightness> | set display brightness (0-255) 0 means OFF |
-| /display?value=<1 or 0> | set display power (1 = ON / 0 = OFF) |
+| METHOD | ENDPOINT      | RETURN | description                |
+| ------ | ------------- | -------------------------- |
+| GET | /             | JSON | sensor value as JSON.|
+| GET | /ping         | TEXT | returns pong. |
+| GET | /stastics     | JSON | stastics JSON |
+| GET | /brightness?value=<brightness> | TEXT | set display brightness (0-255) 0 means OFF |
+| GET | /display?value=<1 or 0> | TEXT | set display power (1 = ON / 0 = OFF) |
+| POST | /goto_setup | TEXT | Go to setup mode at next boot |
+
+NOTE: There is no reboot API, because of security reason.
 
 #### note
 
@@ -162,6 +166,27 @@ esptool.py write_flash 0x1000 filename.bin
 
 ## Version History
 
+* BUGFIX: Bug fix
+* FIX: Fix not bug, but not friendly behavior
+* CHANGE: Change some behavior
+* ADD: Add new function
+* DROP: Delete some functions
+* NOTE: other things
+
+### v40
+
+* FIX: CO2 ppm alert value is not good.
+* ADD: Add POST /goto_setup API. 
+* FIX: Delete unused source code.
+* ADD: Add display invert (3sec) on setup mode (ST7789 / SSD1306)
+* NOTE: platformio/espressif8266 @ 2.6.3
+* FIX: MHZ19B RX, TX Pin settings are fixed to GPIO 14,0
+* CHANGE: Stop prefixing "*" when co2ppm below 400 (use alerts for this purpose)
+* FIX: Wait for reconfigure bar length invalid
+* FIX: BME280: improve pressure precision (fix decimal values are truncated)
+* ADD: Pressure delta
+* CHANGE: ST7789: Normal: Dont show co2 when no co2 sensor.
+
 ### v39
 
 * CHANGE: CONFIG: Add SSD1306 / SH1106 switch
@@ -196,12 +221,12 @@ esptool.py write_flash 0x1000 filename.bin
 
 ### v3.5
 
-* Config: version 9 (was 8) and using JSON format
-* Config: Migration between versions
+* CHANGE: Config: version 9 (was 8) and using JSON format
+* ADD: Config: Migration between versions
 
 ### v3.4
 
-* Config: version 8 (was 6)
+* CHANGE: Config: version 8 (was 6)
 * BUGFIX: SSD1306 not shown in Setup Mode
 * ADD: Default Brightness setting
 * ADD: Screen Flip setting
@@ -216,58 +241,56 @@ esptool.py write_flash 0x1000 filename.bin
 
 ### v3.2
 
-* Avoid using delay
+* FIX: Avoid using delay
 * ADD: I2C scan on startup.
 * BUGFIX: ESP8266: I2C not working
 * DROP: ESP8266: ST7789 is not supported (because of Pin config)
 
 ### v3.1
 
-* Add vertical display mode(bigger font. ST7789 only)
-* Refactoring
+* ADD: vertical display mode(bigger font. ST7789 only)
+* FIX: Refactoring
 
 ### v3.0
 
-* Add ST7789 Support (T-Display)
-* ST7789 is initial support, some screens are simplifyed.
-
-### v2.7
+* ADD: ST7789 Support (T-Display)
+* NOTE: ST7789 is initial support, some screens are simplifyed.
 
-Display item change.
+### v2.7: Display item change update
 
-* Delete alive indicator "*" after EnvBoyX string.
-* Add alive indicator. EnvBoyX's "X" character now blinks.
-* Delete prefix "IP:" before IP address
-* Add mDNS name display. IP/mDNS display switches 3 sec interval.
-* Abort TFT display implementation.
+* CHANGE: Delete alive indicator "*" after EnvBoyX string.
+* ADD: alive indicator. EnvBoyX's "X" character now blinks.
+* CHANGE: prefix "IP:" before IP address
+* ADD: mDNS name display. IP/mDNS display switches 3 sec interval.
+* NOTE: Abort TFT display implementation.
 
 ### v2.6
 
-* Fix mDNS not working
+* BUGFIX: Fix mDNS not working
 
 ### v2.5
 
-* Add /display endpoint.
+* ADD: /display endpoint.
 
 ### v2.4
 
-* Add /brightness endpoint.
+* ADD: /brightness endpoint.
 
 ### v2.3
 
-* Unifing EnvBoyX (ESP8266) and EnvBoyX32 (ESP32) again.
+* FIX: Unifing EnvBoyX (ESP8266) and EnvBoyX32 (ESP32) again.
 
 ### v2.2
 
 * missing version due to bug.
 
 ### v2.1
 
-* Split EnvBoyX (8266) and EnvBoyX32 (ESP32)
+* FIX: Split EnvBoyX (8266) and EnvBoyX32 (ESP32)
 
 ### v2.0
 
-* Move to Platform.IO from Arduino IDE 
+* FIX: Move Arduino IDE to Platform.IO
 
 ### before v2.0
 

diff --git a/include/config.h b/include/config.h
@@ -13,7 +13,10 @@ void save_config();
 
 void list_dir();
 
+/** config ok フラグファイルを作成する */
 void create_configure_flag_file();
+
+/** config ok フラグファイルを削除する */
 void remove_configure_flag_file();
 bool has_valid_config_file();
 bool has_valid_config();
@@ -35,4 +38,5 @@ void trim_config();
 void write_config_file(File f);
 
 /** ファイルを読んでconfig値にセット。closeはしない */
-bool read_config_file(File f, bool dump_config = false);
+bool read_config_file(File f, bool dump_config);
+bool read_config_file(File f);
diff --git a/include/display.h → include/display/display.h b/include/display.h → include/display/display.h
@@ -1,5 +1,6 @@
 #include <Arduino.h>
 
+// セットアップモード表示
 void disp_setup_startup_screen(String ipAddr);
 
 void disp_wifi_info(String ip, String mDNS);

diff --git a/include/display_formatter.h → include/display/display_formatter.h b/include/display_formatter.h → include/display/display_formatter.h
diff --git a/include/display_ssd1306.h → include/display/display_ssd1306.h b/include/display_ssd1306.h → include/display/display_ssd1306.h
@@ -1,10 +1,13 @@
 #include <Arduino.h>
 
-void disp_ssd1306_wifi_info(String ip, String mDNS);
+void disp_ssd1306_setup_startup_screen(String ipAddr, int disp_switch);
+
 void disp_ssd1306_normal_startup_screen(String product_long);
-void disp_ssd1306_setup_startup_screen(String ipAddr);
+
 void disp_ssd1306_wait_for_reconfig_init();
 void disp_ssd1306_wait_for_reconfig_bar(int now, const int max);
+
+void disp_ssd1306_wifi_info(String ip, String mDNS);
 void disp_ssd1306_wifi_starting();
 void disp_ssd1306_wifi_error();
 void disp_ssd1306_all_initialize_complete();

diff --git a/include/display_st7789.h → include/display/display_st7789.h b/include/display_st7789.h → include/display/display_st7789.h
@@ -1,10 +1,12 @@
+#pragma once
+
 #include <Arduino.h>
 
 // 使える使えないの判断フラグ ST7789_SUPPORTED -> define.cpp
 // このフラグで呼び出される実態が空っぽなのと実装されているものに分かれる。
 
 /** ST7789V セットアップモード  */
-void disp_st7789_setup_startup_screen(String ipAddr);
+void disp_st7789_setup_startup_screen(String ipAddr, int disp_switch);
 
 void disp_st7789_wifi_info(String ip, String mDNS);
 void disp_st7789_normal_startup_screen(String product_long);

diff --git a/include/display_st7789_big.h → include/display/display_st7789_big.h b/include/display_st7789_big.h → include/display/display_st7789_big.h
diff --git a/include/display_st7789_normal.h → include/display/display_st7789_normal.h b/include/display_st7789_normal.h → include/display/display_st7789_normal.h
diff --git a/include/display/display_util.h b/include/display/display_util.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "structs.h"
+typedef struct {
+    float value;
+    bool positive = false; // 値が0.1以上のプラス。プラスでもマイナスでもない場合に注意
+    bool negative = false; // 絶対値が0.1以上のマイナス。プラスでもマイナスでもない場合に注意
+    bool drawIcon = true;  // 絶対値0.2以上
+    String formattedValue; // プラス・マイナスを除去した数字だけフォーマット
+} pressure_delta_t;
+
+bool has_caution(value_alerts_t alerts);
+bool has_warning(value_alerts_t alerts);
+
+String format_air_pressure_delta(float value);
+pressure_delta_t get_pressure_delta_struct(float pressureDelta);
diff --git a/include/scan_alert.h → include/display/scan_alert.h b/include/scan_alert.h → include/display/scan_alert.h
diff --git a/include/display/st7789_utils.h b/include/display/st7789_utils.h
@@ -0,0 +1,18 @@
+#include <Arduino.h>
+#include <TFT_eSPI.h>
+
+extern TFT_eSPI tft;
+
+enum class ARROW_ICON {
+	NONE = 0, UP = 1, DOWN = 2, PLUS = 3, MINUS = 4
+};
+
+/**
+ * 矢印を書く
+ */
+void draw_arrow(int x, int y, ARROW_ICON type, uint16_t color, int height, int width);
+
+/**
+ * 矢印を書く（12 x 22)
+ */
+void draw_arrow(int x, int y, ARROW_ICON type, uint16_t color);
diff --git a/include/display/u8g2_utils.h b/include/display/u8g2_utils.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Arduino.h>
+
+enum class TextAlign { LEFT = 1 , RIGHT = 2 };
+
+enum class TextDecoration { NONE = 0 , BOX = 2, INVERT = 4 };
+
+void draw_string(int x, int y, String valueString, TextAlign align, const uint8_t *font);
+void draw_string(int x, int y, String valueString, TextAlign align);
+
+uint16_t draw_value(int x, int y, TextDecoration deco, TextAlign align, String valueString, const uint8_t *valueFont, String unitString, const uint8_t *unitFont);
+
+/**
+ * 画面反転切り替え。画面の内容は変更せずに反転する。
+ * @param inverse true　反転する false しない
+ */
+void set_invert(bool inverse);
diff --git a/include/display_util.h b/include/display_util.h
diff --git a/include/global.h b/include/global.h
@@ -58,6 +58,7 @@ extern config_t config;
 // センサー値
 // --------------------------------------------------------------------
 extern sensor_values_t sensorValues;
+extern sensor_characters_t sensorCharacters;
 
 // --------------------------------------------------------------------
 // 統計情報

diff --git a/include/log.h b/include/log.h
@@ -17,6 +17,7 @@ void i2clog(String msg);
 void stlog(String msg);
 void ssdlog(String msg);
 void statlog(String msg);
+void pdeltalog(String msg);
 void haltlog(String msg);
 void debuglog(String msg);
 void sectionlog(String msg);

diff --git a/include/main_normal.h b/include/main_normal.h
@@ -2,4 +2,4 @@ void init_sensors();
 void setup_normal();
 void loop_normal();
 void read_data();
-void init_timer();
+void add_timer_tasks();
diff --git a/include/sensors/adt7410.h b/include/sensors/adt7410.h
@@ -1,2 +1,8 @@
-void adt_setup(void);
+#include "structs.h"
+
+sensor_characters_t adt_characters();
+
+// 初期化
+bool adt_setup(void);
+
 void adt_read_data(void);
diff --git a/include/sensors/am2320.h b/include/sensors/am2320.h
@@ -1,2 +1,9 @@
-void am_setup();
+#include "structs.h"
+
+//
+sensor_characters_t am_characters();
+
+// 初期化
+bool am_setup();
+
 void am_read_data();
diff --git a/include/sensors/bh1750.h b/include/sensors/bh1750.h
@@ -1,2 +1,8 @@
-void bh_setup();
+#include "structs.h"
+
+sensor_characters_t bh_characters();
+
+// 初期化
+bool bh_setup();
+
 void bh_read_data();
diff --git a/include/sensors/bme280.h b/include/sensors/bme280.h
@@ -1,2 +1,7 @@
-void bme_setup();
+#include "structs.h"
+
+sensor_characters_t bme_characters();
+
+bool bme_setup();
+
 void bme_read_data();
diff --git a/include/sensors/lps22hb.h b/include/sensors/lps22hb.h
@@ -1,2 +1,6 @@
-void lps_setup(void);
+#include "structs.h"
+
+sensor_characters_t lps_characters();
+
+bool lps_setup(void);
 void lps_read_data();
diff --git a/include/sensors/mhz19.h b/include/sensors/mhz19.h
@@ -1,2 +1,6 @@
-void mhz_setup();
+#include "structs.h"
+
+sensor_characters_t mhz_characters();
+
+bool mhz_setup();
 void mhz_read_data();
diff --git a/include/sensors/pressure_delta.h b/include/sensors/pressure_delta.h
@@ -0,0 +1,10 @@
+//
+// Air Pressure delta
+//
+
+/**
+ * 差分比較用に今の気圧を蓄積します。
+ */
+void store_air_pressure_history();
+
+void store_air_pressure_delta();
diff --git a/include/sensors/tsl2561.h b/include/sensors/tsl2561.h
@@ -1,2 +1,6 @@
-void tsl_setup();
+#include "structs.h"
+
+sensor_characters_t tsl_characters();
+
+bool tsl_setup();
 void read_data_tsl2561();