Merge branch 'master' of gitee.com:openLuat/LuatOS

components/mobile/luat_mobile.h

@@ -361,10 +361,10 @@ typedef struct luat_mobile_lte_cell_info
 
 typedef struct luat_mobile_cell_info
 {
-    luat_mobile_gsm_service_cell_info_t gsm_service_info;
-    luat_mobile_gsm_cell_info_t    gsm_info[LUAT_MOBILE_CELL_MAX_NUM];    /**<   GSM cell information (Serving and neighbor. */
-    luat_mobile_lte_service_cell_info_t lte_service_info;
-    luat_mobile_lte_cell_info_t    lte_info[LUAT_MOBILE_CELL_MAX_NUM];    /**<   LTE cell information (Serving and neighbor). */
+    luat_mobile_gsm_service_cell_info_t gsm_service_info;					/**<   GSM cell information (Serving). */
+    luat_mobile_gsm_cell_info_t    gsm_info[LUAT_MOBILE_CELL_MAX_NUM];    /**<   GSM cell information (neighbor). */
+    luat_mobile_lte_service_cell_info_t lte_service_info;					/**<   LTE cell information (Serving). */
+    luat_mobile_lte_cell_info_t    lte_info[LUAT_MOBILE_CELL_MAX_NUM];    /**<   LTE cell information (neighbor). */
     uint32_t 						version;
     uint8_t                         gsm_info_valid;                         /**< Must be set to TRUE if gsm_info is being passed. */
     uint8_t                         gsm_neighbor_info_num;                           /**< Must be set to the number of elements in entry*/

demo/adc/main.lua

@@ -47,6 +47,8 @@ function adc_pin() -- 根据不同开发板，设置ADC编号
         -- 默认不开启分压,范围是0-1.2v精度高
         -- adc.setRange(adc.ADC_RANGE_3_8)
         return 0,1,255,255,adc.CH_CPU ,adc.CH_VBAT 
+    elseif rtos_bsp == "UIS8850BM" then 
+        return 0,255,255,255, adc.CH_CPU ,adc.CH_VBAT 
     else
         log.info("main", "define ADC pin in main.lua")
         return 255,255,255,255, adc.CH_CPU ,adc.CH_VBAT 

luat/include/luat_pm.h

@@ -49,6 +49,17 @@ enum
 enum
 {
 	LUAT_PM_ALL_GPIO,
+	LUAT_PM_LDO_TYPE_VMMC,
+	LUAT_PM_LDO_TYPE_VLCD,
+	LUAT_PM_LDO_TYPE_CAMA,
+	LUAT_PM_LDO_TYPE_CAMD,
+	LUAT_PM_LDO_TYPE_VLP33,//8910没有
+	LUAT_PM_LDO_TYPE_VLP18,//8910没有
+	LUAT_PM_LDO_TYPE_VIO18,
+	LUAT_PM_LDO_TYPE_VIBR,	//8850没有
+	LUAT_PM_LDO_TYPE_KEYLED,
+	LUAT_PM_LDO_TYPE_VSIM1,	//不一定起作用，尽量不要用
+	LUAT_PM_LDO_TYPE_QTY,
 };
 
 int luat_pm_request(int mode);