修改了Web后台的部分界面，增加了HAmqtt中的总电量传感器，后台新增mqtt上报频率设置

mico-os/board/MK3060/MK3060.mk

@@ -0,0 +1,50 @@
+############################################################################### 
+#
+#  The MIT License
+#  Copyright (c) 2016 MXCHIP Inc.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy 
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights 
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is furnished
+#  to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 
+#  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+############################################################################### 
+
+NAME := Board_MK3060
+
+WLAN_CHIP            	:= NONE
+WLAN_CHIP_REVISION   	:= NONE
+WLAN_CHIP_FAMILY     	:= NONE
+WLAN_CHIP_FIRMWARE_VER  := NONE
+
+NO_WIFI_FIRMWARE		:= YES
+
+MODULE              	:= 3060
+HOST_MCU_FAMILY      	:= MOC108
+HOST_MCU_VARIANT     	:= MOC108
+HOST_MCU_PART_NUMBER 	:= MOC108
+
+BUS := NONE
+
+JTAG := jlink
+
+# Global includes
+GLOBAL_INCLUDES  := .
+
+# Components
+$(NAME)_COMPONENTS += drivers/spi_flash
+$(NAME)_COMPONENTS += drivers/MiCOKit_EXT
+
+# Source files
+$(NAME)_SOURCES := platform.c

mico-os/board/MK3060/platform.c

@@ -0,0 +1,270 @@
+/**
+ ******************************************************************************
+ * @file    platform.c
+ * @author  William Xu
+ * @version V1.0.0
+ * @date    05-May-2014
+ * @brief   This file provides all MICO Peripherals mapping table and platform
+ *          specific functions.
+ ******************************************************************************
+ *
+ *  The MIT License
+ *  Copyright (c) 2014 MXCHIP Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is furnished
+ *  to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ******************************************************************************
+ */
+
+#include "mico_platform.h"
+#include "platform.h"
+#include "platform_config.h"
+#include "platform_peripheral.h"
+#include "platform_config.h"
+#include "platform_logging.h"
+#include "CheckSumUtils.h"
+#include "keypad/gpio_button/button.h"
+
+#ifdef USE_MiCOKit_EXT
+#include "MiCOKit_EXT/micokit_ext.h"
+#endif
+
+/******************************************************
+*                      Macros
+******************************************************/
+
+/******************************************************
+*                    Constants
+******************************************************/
+
+/******************************************************
+*                   Enumerations
+******************************************************/
+
+/******************************************************
+*                 Type Definitions
+******************************************************/
+
+/******************************************************
+*                    Structures
+******************************************************/
+
+/******************************************************
+*               Function Declarations
+******************************************************/
+extern WEAK void PlatformEasyLinkButtonClickedCallback(void);
+extern WEAK void PlatformEasyLinkButtonLongPressedCallback(void);
+
+/******************************************************
+*               Variables Definitions
+******************************************************/
+
+const platform_gpio_t platform_gpio_pins[] =
+{
+    [MICO_GPIO_4] =  { 4},
+    [MICO_GPIO_5] =  {22},
+    [MICO_GPIO_6] =  {23},
+    [MICO_GPIO_7] =  {20},
+    [MICO_GPIO_8] =  {21},
+    [MICO_GPIO_9] =  { 0},
+    [MICO_GPIO_10] = { 1},
+    [MICO_GPIO_12] = {15},
+    [MICO_GPIO_13] = {17},
+    [MICO_GPIO_14] = {16},
+    [MICO_GPIO_15] = {14},
+    [MICO_GPIO_20] = {30},
+    [MICO_GPIO_23] = {29},
+};
+
+const platform_pwm_t platform_pwm_peripherals[] = {};
+
+const platform_i2c_t platform_i2c_peripherals[] =
+{
+    [MICO_I2C_1] =
+    {
+        .pin_scl = &platform_gpio_pins[MICO_GPIO_NONE],
+        .pin_sda = &platform_gpio_pins[MICO_GPIO_NONE],
+    },
+};
+platform_i2c_driver_t platform_i2c_drivers[MICO_I2C_MAX];
+
+const platform_uart_t platform_uart_peripherals[] = 
+{
+	[MICO_UART_1] = {MX_UART_1}, 
+    [MICO_UART_2] = {MX_UART_2}, 
+};
+
+platform_uart_driver_t platform_uart_drivers[MICO_UART_MAX];
+
+const platform_spi_t platform_spi_peripherals[] = {
+    [MICO_SPI_1] = {0},
+};
+platform_spi_driver_t platform_spi_drivers[MICO_SPI_MAX];
+
+/* Flash memory devices */
+const platform_flash_t platform_flash_peripherals[] = {};
+platform_flash_driver_t platform_flash_drivers[MICO_FLASH_MAX];
+
+/* Logic partition on flash devices */
+const mico_logic_partition_t mico_partitions[] = 
+{
+	[MICO_PARTITION_BOOTLOADER] =
+	{
+	    .partition_owner            = MICO_FLASH_EMBEDDED,
+	    .partition_description      = "Bootloader",
+	    .partition_start_addr       = 0x0,
+	    .partition_length           = 0x10000,    //64k bytes
+	    .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+	},
+	[MICO_PARTITION_PARAMETER_1] =
+    {
+        .partition_owner            = MICO_FLASH_EMBEDDED,
+        .partition_description      = "PARAMETER1",
+        .partition_start_addr       = 0x10000,
+        .partition_length           = 0x1000, // 4k bytes
+        .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+    },
+    [MICO_PARTITION_PARAMETER_2] =
+    {
+        .partition_owner            = MICO_FLASH_EMBEDDED,
+        .partition_description      = "PARAMETER2",
+        .partition_start_addr       = 0x11000,
+        .partition_length           = 0x1000, //4k bytes
+        .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+    },
+	[MICO_PARTITION_APPLICATION] =
+	{
+	    .partition_owner            = MICO_FLASH_EMBEDDED,
+	    .partition_description      = "Application",
+	    .partition_start_addr       = 0x12000,
+	    .partition_length           = 0xF6000,   //984k bytes
+	    .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+	},
+    [MICO_PARTITION_OTA_TEMP] =
+    {
+        .partition_owner           = MICO_FLASH_EMBEDDED,
+        .partition_description     = "OTA Storage",
+        .partition_start_addr      = 0x108000,
+        .partition_length          = 0xF5000, //980k bytes
+        .partition_options         = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+    },
+    [MICO_PARTITION_USER] =
+    {
+        .partition_owner            = MICO_FLASH_EMBEDDED,
+        .partition_description      = "USER",
+        .partition_start_addr       = 0x1FD000,
+        .partition_length           = 0x3000, //12k bytes
+        .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+    },
+    [MICO_PARTITION_SYSTEM_DATA] = 
+    {
+        .partition_owner            = MICO_FLASH_EMBEDDED,
+        .partition_description      = "System data",
+        .partition_start_addr       = 0xE000,
+        .partition_length           = 0x2000,    //8k bytes
+        .partition_options          = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+    },
+};
+
+const platform_adc_t platform_adc_peripherals[] = {};
+
+/******************************************************
+*               Function Definitions
+******************************************************/
+
+void init_platform( void )
+{
+  button_init_t init;
+
+  MicoGpioInitialize( (mico_gpio_t)MICO_SYS_LED, OUTPUT_PUSH_PULL );
+  MicoGpioOutputLow( (mico_gpio_t)MICO_SYS_LED );
+  MicoGpioInitialize( (mico_gpio_t)MICO_RF_LED, OUTPUT_OPEN_DRAIN_NO_PULL );
+  MicoGpioOutputHigh( (mico_gpio_t)MICO_RF_LED );
+  
+  MicoGpioInitialize((mico_gpio_t)BOOT_SEL, INPUT_PULL_UP);
+  MicoGpioInitialize((mico_gpio_t)MFG_SEL, INPUT_PULL_UP);
+
+  init.gpio = EasyLink_BUTTON;
+  init.pressed_func = PlatformEasyLinkButtonClickedCallback;
+  init.long_pressed_func = PlatformEasyLinkButtonLongPressedCallback;
+  init.long_pressed_timeout = RestoreDefault_TimeOut;
+
+  button_init( IOBUTTON_EASYLINK, init );
+}
+
+void init_platform_bootloader( void )
+{
+  MicoGpioInitialize( (mico_gpio_t)MICO_SYS_LED, OUTPUT_PUSH_PULL );
+  MicoGpioOutputLow( (mico_gpio_t)MICO_SYS_LED );
+  MicoGpioInitialize( (mico_gpio_t)MICO_RF_LED, OUTPUT_OPEN_DRAIN_NO_PULL );
+  MicoGpioOutputHigh( (mico_gpio_t)MICO_RF_LED );
+  
+  MicoGpioInitialize((mico_gpio_t)BOOT_SEL, INPUT_PULL_UP);
+  MicoGpioInitialize((mico_gpio_t)MFG_SEL, INPUT_PULL_UP);
+
+  return;
+}
+
+void MicoSysLed(bool onoff)
+{
+  if (onoff) {
+    MicoGpioOutputLow( (mico_gpio_t)MICO_SYS_LED );
+  } else {
+    MicoGpioOutputHigh( (mico_gpio_t)MICO_SYS_LED );
+  }
+}
+
+void MicoRfLed(bool onoff)
+{
+  if (onoff) {
+    MicoGpioOutputLow( (mico_gpio_t)MICO_RF_LED );
+  } else {
+    MicoGpioOutputHigh( (mico_gpio_t)MICO_RF_LED );
+  }
+}
+
+#ifdef USE_MiCOKit_EXT
+// add test mode for MiCOKit-EXT board,check Arduino_D5 pin when system startup
+bool MicoExtShouldEnterTestMode(void)
+{
+  if( MicoGpioInputGet((mico_gpio_t)Arduino_D5)==false ){
+    return true;
+  }
+  else{
+    return false;
+  }
+}
+#endif
+
+bool MicoShouldEnterMFGMode(void)
+{
+    return false;
+  if(MicoGpioInputGet((mico_gpio_t)BOOT_SEL)==false && MicoGpioInputGet((mico_gpio_t)MFG_SEL)==false)
+    return true;
+  else
+    return false;
+}
+
+bool MicoShouldEnterBootloader(void)
+{
+    return true;
+  if(MicoGpioInputGet((mico_gpio_t)BOOT_SEL)==false && MicoGpioInputGet((mico_gpio_t)MFG_SEL)==true)
+    return true;
+  else
+    return false;
+}
+

mico-os/board/MK3060/platform.h

@@ -0,0 +1,166 @@
+/**
+ ******************************************************************************
+ * @file    platform.h
+ * @author  William Xu
+ * @version V1.0.0
+ * @date    05-May-2014
+ * @brief   This file provides all MICO Peripherals defined for current platform.
+ ******************************************************************************
+ *
+ *  The MIT License
+ *  Copyright (c) 2014 MXCHIP Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is furnished
+ *  to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ******************************************************************************
+ */
+
+#pragma once
+
+#ifndef __PLATFORM_H_
+#define __PLATFORM_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/******************************************************
+ *                      Macros
+ ******************************************************/
+
+/******************************************************
+ *                    Constants
+ ******************************************************/
+  
+
+   
+/******************************************************
+ *                   Enumerations
+ ******************************************************/
+
+typedef enum
+{
+    MICO_GPIO_4,
+    MICO_GPIO_5,
+    MICO_GPIO_6,
+    MICO_GPIO_7,
+    MICO_GPIO_8,
+    MICO_GPIO_9,
+    MICO_GPIO_10,
+    MICO_GPIO_12,
+    MICO_GPIO_13,
+    MICO_GPIO_14,
+    MICO_GPIO_15,
+    MICO_GPIO_20,
+    MICO_GPIO_23,
+    MICO_GPIO_MAX, /* Denotes the total number of GPIO port aliases. Not a valid GPIO alias */
+    MICO_GPIO_NONE,
+    MICO_SYS_LED = MICO_GPIO_NONE, 
+    MICO_RF_LED = MICO_GPIO_NONE, 
+    BOOT_SEL = MICO_GPIO_NONE, 
+    MFG_SEL = MICO_GPIO_NONE, 
+    EasyLink_BUTTON = MICO_GPIO_23,
+    STDIO_UART_RX = MICO_GPIO_NONE,  
+    STDIO_UART_TX = MICO_GPIO_NONE,  
+} mico_gpio_t;
+
+typedef enum
+{
+  MICO_SPI_1,
+  MICO_SPI_MAX, /* Denotes the total number of SPI port aliases. Not a valid SPI alias */
+  MICO_SPI_NONE,
+} mico_spi_t;
+
+typedef enum
+{
+    MICO_IIS_MAX, /* Denotes the total number of IIS port aliases. Not a valid IIS alias */
+    MICO_IIS_NONE,
+} mico_iis_t;
+
+typedef enum
+{
+    MICO_I2C_1,
+    MICO_I2C_2,
+    MICO_I2C_MAX, /* Denotes the total number of I2C port aliases. Not a valid I2C alias */
+    MICO_I2C_NONE,
+} mico_i2c_t;
+
+typedef enum
+{
+    MICO_PWM_MAX, /* Denotes the total number of PWM port aliases. Not a valid PWM alias */
+    MICO_PWM_NONE,
+} mico_pwm_t;
+
+typedef enum
+{
+    MICO_ADC_1,
+    MICO_ADC_2,
+    MICO_ADC_MAX, /* Denotes the total number of ADC port aliases. Not a valid ADC alias */
+    MICO_ADC_NONE,
+} mico_adc_t;
+
+typedef enum
+{
+	MICO_UART_1,
+    MICO_UART_2,
+    MICO_UART_MAX, /* Denotes the total number of UART port aliases. Not a valid UART alias */
+    MICO_UART_NONE,
+} mico_uart_t;
+
+typedef enum
+{
+  MICO_FLASH_EMBEDDED,
+  MICO_FLASH_MAX,
+  MICO_FLASH_NONE,
+} mico_flash_t;
+
+typedef enum
+{
+  MICO_PARTITION_SYSTEM_DATA,
+  MICO_PARTITION_USER,
+  MICO_PARTITION_USER_MAX
+} mico_user_partition_t;
+
+#ifdef BOOTLOADER
+#define STDIO_UART       (MICO_UART_1)
+#define STDIO_UART_BAUDRATE (921600)
+#else
+#define STDIO_UART       (MICO_UART_1)
+#define STDIO_UART_BAUDRATE (921600) 
+#endif
+
+#define UART_FOR_APP     (MICO_UART_2)
+#define MFG_TEST         (MICO_UART_2)
+#define CLI_UART         (MICO_UART_1)
+
+/* Components connected to external I/Os*/
+#define USE_MICO_SPI_FLASH
+
+#ifdef USE_MiCOKit_EXT
+#define MICO_I2C_CP         (Arduino_I2C)
+#include "micokit_ext_def.h"
+#else
+#define MICO_I2C_CP         (MICO_I2C_NONE)
+#endif //USE_MiCOKit_EXT
+
+
+#ifdef __cplusplus
+} /*extern "C" */
+#endif
+
+#endif

mico-os/board/MK3060/platform_config.h

@@ -0,0 +1,91 @@
+/**
+******************************************************************************
+* @file    platform_config.h
+* @author  William Xu
+* @version V1.0.0
+* @date    05-May-2014
+* @brief   This file provides common configuration for current platform.
+******************************************************************************
+*
+*  The MIT License
+*  Copyright (c) 2014 MXCHIP Inc.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy 
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights 
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is furnished
+*  to do so, subject to the following conditions:
+*
+*  The above copyright notice and this permission notice shall be included in
+*  all copies or substantial portions of the Software.
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+*  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 
+*  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************
+*/ 
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/******************************************************
+*                      Macros
+******************************************************/
+
+/******************************************************
+*                    Constants
+******************************************************/
+
+#define HARDWARE_REVISION   "1.0"
+#define DEFAULT_NAME        "MiCOKit-108"
+#define MODEL               "MK108_1"
+
+/* MICO RTOS tick rate in Hz */
+#define MICO_DEFAULT_TICK_RATE_HZ                   (500)
+
+  /************************************************************************
+ * Uncomment to disable watchdog. For debugging only */
+//#define MICO_DISABLE_WATCHDOG
+
+/************************************************************************
+ * Uncomment to disable standard IO, i.e. printf(), etc. */
+//#define MICO_DISABLE_STDIO
+
+/************************************************************************
+ * Uncomment to disable MCU powersave API functions */
+//#define MICO_DISABLE_MCU_POWERSAVE
+
+/************************************************************************
+ * Uncomment to enable MCU real time clock */
+#define MICO_ENABLE_MCU_RTC
+
+/************************************************************************
+ * Restore default and start easylink after press down EasyLink button for 3 seconds. */
+#define RestoreDefault_TimeOut                      (3000)
+
+/************************************************************************
+ * CPU clock. */
+#define MCU_CLOCK_HZ            (120000000)
+
+/************************************************************************
+ * How many bits are used in NVIC priority configuration */
+#define CORTEX_NVIC_PRIO_BITS   (4)
+
+/************************************************************************
+ * MICO_ENABLE_STDIO_TO_BOOT = 1 */
+#define MICO_ENABLE_STDIO_TO_BOOT 1
+
+#ifdef __cplusplus
+} /*extern "C" */
+#endif
+
+