core: code refactoring

Author: redchenjs

main/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(COMPONENT_SRCDIRS src src/user src/board src/chip src/os)
+set(COMPONENT_SRCDIRS src src/user src/board src/chip src/core)
 set(COMPONENT_ADD_INCLUDEDIRS inc)
 set(COMPONENT_EMBED_TXTFILES res/cert/cert0.pem)
 set(COMPONENT_EMBED_FILES res/snd/snd0.mp3 res/snd/snd1.mp3 res/snd/snd2.mp3 res/snd/snd3.mp3 res/snd/snd4.mp3 res/snd/snd5.mp3 res/snd/snd6.mp3 res/snd/snd7.mp3 res/ani/ani0_160x80.gif res/ani/ani1_160x80.gif res/ani/ani2_160x80.gif res/ani/ani3_160x80.gif res/ani/ani4_160x80.gif res/ani/ani5_160x80.gif res/ani/ani6_160x80.gif res/ani/ani7_160x80.gif res/ani/ani8_160x80.gif res/ani/ani0_240x135.gif res/ani/ani1_240x135.gif res/ani/ani2_240x135.gif res/ani/ani3_240x135.gif res/ani/ani4_240x135.gif res/ani/ani5_240x135.gif res/ani/ani6_240x135.gif res/ani/ani7_240x135.gif res/ani/ani8_240x135.gif)

main/Kconfig.projbuild

@@ -203,10 +203,4 @@ config I2S_DOUT_PIN
     depends on ENABLE_AUDIO_PROMPT
 endmenu
 
-config FIRMWARE_VERSION
-    string "Firmware Version"
-    default "v5.6.0"
-    help
-        Set firmware version.
-
 endmenu

main/inc/core/app.h

@@ -0,0 +1,14 @@
+/*
+ * app.h
+ *
+ *  Created on: 2018-04-05 19:09
+ *      Author: Jack Chen <redchenjs@live.com>
+ */
+
+#ifndef INC_CORE_APP_H_
+#define INC_CORE_APP_H_
+
+extern const char *app_get_version(void);
+extern void app_print_version(void);
+
+#endif /* INC_CORE_APP_H_ */

main/inc/os/core.h renamed to main/inc/core/os.h

@@ -1,12 +1,12 @@
 /*
- * core.h
+ * os.h
  *
  *  Created on: 2018-03-04 20:07
  *      Author: Jack Chen <redchenjs@live.com>
  */
 
-#ifndef INC_OS_CORE_H_
-#define INC_OS_CORE_H_
+#ifndef INC_CORE_OS_H_
+#define INC_CORE_OS_H_
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/event_groups.h"
@@ -39,6 +39,6 @@ typedef enum user_event_group_bits {
 extern EventGroupHandle_t os_event_group;
 extern EventGroupHandle_t user_event_group;
 
-extern void os_core_init(void);
+extern void os_init(void);
 
-#endif /* INC_OS_CORE_H_ */
+#endif /* INC_CORE_OS_H_ */

main/inc/os/firmware.h

@@ -5,11 +5,87 @@
  *      Author: Jack Chen <redchenjs@live.com>
  */
 
-#include "os/init.h"
+#include "core/os.h"
+#include "core/app.h"
+
+#include "chip/nvs.h"
+#include "chip/spi.h"
+#include "chip/i2s.h"
+#include "chip/i2c.h"
+#include "chip/wifi.h"
+#include "chip/uart.h"
+
+#include "board/pn532.h"
+
+#include "user/ntp.h"
+#include "user/led.h"
+#include "user/gui.h"
+#include "user/nfc_app.h"
+#include "user/key_scan.h"
+#include "user/http_app.h"
+#include "user/audio_mp3.h"
+
+static void core_init(void)
+{
+    app_print_version();
+
+    os_init();
+}
+
+static void chip_init(void)
+{
+    nvs_init();
+
+    wifi_init();
+
+#ifdef CONFIG_PN532_IFCE_UART
+    uart1_init();
+#else
+    i2c0_init();
+#endif
+
+#ifdef CONFIG_ENABLE_AUDIO_PROMPT
+    i2s0_init();
+#endif
+
+#ifdef CONFIG_ENABLE_GUI
+    hspi_init();
+#endif
+}
+
+static void board_init(void)
+{
+    pn532_init();
+}
+
+static void user_init(void)
+{
+    ntp_init();
+
+    nfc_app_init();
+
+    http_app_init();
+
+#ifdef CONFIG_ENABLE_SMARTCONFIG
+    key_scan_init();
+#endif
+
+#ifdef CONFIG_ENABLE_LED
+    led_init();
+#endif
+
+#ifdef CONFIG_ENABLE_GUI
+    gui_init();
+#endif
+
+#ifdef CONFIG_ENABLE_AUDIO_PROMPT
+    audio_mp3_init();
+#endif
+}
 
 int app_main(void)
 {
-    os_init();          // OS Event
+    core_init();        // App Core
     chip_init();        // OnChip Module
     board_init();       // OnBoard Module
     user_init();        // User Task

main/inc/os/init.h

@@ -0,0 +1,25 @@
+/*
+ * app.c
+ *
+ *  Created on: 2018-04-05 19:09
+ *      Author: Jack Chen <redchenjs@live.com>
+ */
+
+#include <string.h>
+
+#include "esp_log.h"
+#include "esp_ota_ops.h"
+
+#define TAG "app"
+
+const char *app_get_version(void)
+{
+    const esp_app_desc_t *app_desc = esp_ota_get_app_description();
+
+    return (const char *)app_desc->version;
+}
+
+void app_print_version(void)
+{
+    ESP_LOGW(TAG, "current app version is %s", app_get_version());
+}

main/src/app_main.c

@@ -1,5 +1,5 @@
 /*
- * core.c
+ * os.c
  *
  *  Created on: 2018-03-04 20:07
  *      Author: Jack Chen <redchenjs@live.com>
@@ -15,8 +15,7 @@
 
 #include "freertos/event_groups.h"
 
-#include "os/core.h"
-#include "os/firmware.h"
+#include "core/os.h"
 #include "chip/wifi.h"
 #include "user/nfc_app.h"
 #include "user/gui.h"
@@ -25,8 +24,7 @@
 #include "user/audio_mp3.h"
 #include "user/http_app_ota.h"
 
-#define OS_CORE_TAG "os_core"
-#define OS_SC_TAG   "os_sc"
+#define OS_SC_TAG "os_sc"
 
 EventGroupHandle_t os_event_group;
 EventGroupHandle_t user_event_group;
@@ -128,10 +126,8 @@ static void sc_event_handler(void* arg, esp_event_base_t event_base,
     }
 }
 
-void os_core_init(void)
+void os_init(void)
 {
-    ESP_LOGW(OS_CORE_TAG, "current firmware version is %s", os_firmware_get_version());
-
     os_event_group   = xEventGroupCreate();
     user_event_group = xEventGroupCreate();