Merge branch 'develop'

.gitignore

@@ -31,9 +31,25 @@
 *.out
 *.app
 
+#Emacs
+\#*#
+
+#pio
+/.pio/
+
+# Doxygen
+/doc/html
 
 # resources
-ponko_face.cpp
-ponko_mouth_*.cpp
-logo.cpp
+/src/res/*
+!/src/res/resource.h
+!/src/res/u8g2_font_profont22_tr.*
+!/src/res/wifi.cpp
+!/src/res/bt.cpp
+!/src/res/jpmap.cpp
+!/src/res/dummy_face.cpp
+!/src/res/dummy_mo.cpp
+!/src/res/dummy_mc.cpp
+!/src/res/dummy_logo.cpp
+!/src/res/w???.cpp
 

doc/Doxyfile

@@ -900,8 +900,8 @@ INPUT_ENCODING         = UTF-8
 # comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
 # *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = wxbeacon2*.cpp \
-                         wxbeacon2*.hpp
+FILE_PATTERNS          = wxbeacon2.* \
+                         wxbeacon2_ble.*
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.

platformio.ini

@@ -1,87 +1,115 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
-
-
 ;-----------------------------------------------------------------------
 ; M5S_WxBeacon2
 ; NOTE : Please save ssid/pass credential to your M5Stack before invoke this program.
 ; WiFi.begin() use it.
 ;-----------------------------------------------------------------------
 [env]
-platform = espressif32@3.4.0
-;platform = espressif32@4.4.0
+platform = espressif32@4.4.0
+;platform = espressif32
+framework = arduino
 
 board_build.flash_mode = qio
 board_build.f_flash = 80000000L
 board_build.f_cpu = 240000000L
-framework = arduino
 
-;The libraries are shared between ArduinoIDE and PlatformIO.
-;lib_extra_dirs is the ArduinoIDE library directory.
-lib_extra_dirs = ~/projects/M5Stack/libraries/
+; https://www.a-quest.com/download.html Download AquesTalk ESP32 and extract ./lib folder.
 lib_ldf_mode = deep
-;lib_deps=m5stack/M5Unified
-
-monitor_port = /dev/cu.SLAB_USBtoUART
+lib_deps = https://github.com/M5Stack/M5Unified.git @ ^0.1.3
+  h2zero/NimBLE-Arduino @ ^1.4.0
+  https://github.com/GOB52/gob_json.git @ ^0.0.3
+  https://github.com/GOB52/gob_datetime.git @ ^0.1.1
+
 monitor_speed = 115200
-;monitor_filters = time, esp32_exception_decoder
 monitor_filters = esp32_exception_decoder, time
-
 upload_speed = 921600
-upload_port = /dev/cu.SLAB_USBtoUART
-
-; Definition if you want.
-;   M5S_WXBEACON2_GMT_OFFSET_HOUR     : Your time zone(Unit: 1 hour). e.g. +9 (JST)
-;   M5S_WXBEACON2_DAYLIGHT_OFFSET_SEC : Your daylight time (Unit : 1 second). 
-;   M5S_WXBEACON2_WIFI_HOST_NAME      : Your host name for WiFi connection. ("arduino-esp32" as default)
-;
-build_flags = -Wall -Wextra -Wreturn-local-addr
- -D M5S_WXBEACON2_GMT_OFFSET_HOUR=+9
- -D M5S_WXBEACON2_WIFI_HOST_NAME="gob-m5sg"
-
-;-----------------------------------------------------------------------
-[env:release_core2]
-board = m5stack-core2
-build_type = release
-build_flags = ${env.build_flags}
- -DCORE_DEBUG_LEVEL=1
- -DLOG_LOCAL_LEVEL=4
- -DWB2_LOG_LEVEL=5
- -DMYNEWT_VAL_BLE_HS_LOG_LVL=5
 
-[env:release_core]
-board = m5stack-core-esp32
-build_type = release
-build_flags = ${env.build_flags}
- -DCORE_DEBUG_LEVEL=1
+
+; Definition
+;  M5S_WXBEACON2_TIMEZONE_LOCATION : Your time-zone location string. default as "Asia/Tokyo" (e.g. "Asia/Tokyo" "America/Los_Angeles" "Australia/Lord_Howe")
+;  M5S_WXBEACON2_AUTO_REQUEST_INTERVAL_SEC : Auto request interval (Unit: second)
+;  M5S_WXBEACON2_AUTO_TALK_INTERVAL_SEC : Auto talk interval (Unit; second)
+build_flags = -Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr
+  -D M5S_WXBEACON2_TIMEZONE_LOCATION=\"Asia/Tokyo\"
+  -D M5S_WXBEACON2_AUTO_REQUEST_INTERVAL_SEC=300
+  -D M5S_WXBEACON2_AUTO_TALK_INTERVAL_SEC=60
+  -D M5S_WXBEACON2_DEBUG_INFO
+  -D GOB_JSON_LOG_LEVEL=5
+;300,60
+
+; --------------------------------
+;Choose build options
+[option_release]
+build_flags =  -DCORE_DEBUG_LEVEL=1
  -DLOG_LOCAL_LEVEL=4
  -DWB2_LOG_LEVEL=5
  -DMYNEWT_VAL_BLE_HS_LOG_LVL=5
-
-[env:release_log]
-board = m5stack-core-esp32
-build_type = release
-build_flags = ${env.build_flags}
- -DCORE_DEBUG_LEVEL=5
+
+[option_log]
+build_flags =  -DCORE_DEBUG_LEVEL=5
  -DLOG_LOCAL_LEVEL=5
  -DWB2_LOG_LEVEL=5
  -DMYNEWT_VAL_BLE_HS_LOG_LVL=0
 
-
-[env:debug]
-board = m5stack-core-esp32
-build_type = debug
-build_flags = ${env.build_flags}
- -DCORE_DEBUG_LEVEL=5
+[option_debug]
+build_flags =  -DCORE_DEBUG_LEVEL=5
  -DLOG_LOCAL_LEVEL=5
  -DWB2_LOG_LEVEL=5
  -DMYNEWT_VAL_BLE_HS_LOG_LVL=0
 
+; Choose board
+[core2_env]
+board = m5stack-core2
+
+[m5s_env]
+board = m5stack-core-esp32
+board_build.partitions = min_spiffs.csv
+
+;-----------------------------------------------------------------------
+; M5Stack Core2
+[env:core2_master]
+extends = core2_env
+build_type=release
+build_flags=${env.build_flags} ${option_release.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -D NDEBUG
+
+[env:core2_release]
+extends = core2_env
+build_type=release
+build_flags=${env.build_flags} ${option_release.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+
+[env:core2_log]
+extends = core2_env
+build_type=release
+build_flags=${env.build_flags} ${option_log.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+
+[env:core2_debug]
+extends = core2_env
+build_type=debug
+build_flags=${env.build_flags} ${option_debug.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+
+; M5Stack BASIC
+[env:basic_master]
+extends = m5s_env
+build_type=release
+build_flags=${env.build_flags} ${option_release.build_flags} -D NDEBUG
+
+[env:basic_release]
+extends = m5s_env
+build_type=release
+build_flags=${env.build_flags} ${option_release.build_flags}
+
+[env:basic_map]
+extends = m5s_env
+build_type=release
+build_flags=${env.build_flags} ${option_release.build_flags} -Wl,-Map,output.map
+
+[env:basic_log]
+extends = m5s_env
+build_type=release
+build_flags=${env.build_flags} ${option_log.build_flags}
+
+[env:basic_debug]
+extends = m5s_env
+build_type=debug
+build_flags=${env.build_flags} ${option_debug.build_flags}
+