diff --git a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/PM2D5空气质量监测.json b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/PM2D5空气质量监测.json index c6dfa788..ff747a2d 100644 --- a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/PM2D5空气质量监测.json +++ b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/PM2D5空气质量监测.json @@ -1 +1 @@ -{"version":"1.0","profile":{"ProductId":"XOEHGW66ZD","CategoryId":"22"},"properties":[{"id":"a","name":"PM1浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"b","name":"PM2d5浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"c","name":"PM10浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"d","name":"PM1浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"e","name":"PM2d5浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"f","name":"PM10浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"g","name":"颗粒物个数_0d3","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"h","name":"颗粒物个数_0d5","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"i","name":"颗粒物个数_1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"j","name":"颗粒物个数_2d5","desc":"","mode":"rw","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"k","name":"颗粒物个数_5","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"l","name":"颗粒物个数_10","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"m","name":"版本号","desc":"","mode":"r","define":{"type":"int","min":"0","max":"255","start":"0","step":"1","unit":""},"required":false},{"id":"n","name":"错误代码","desc":"","mode":"r","define":{"type":"int","min":"0","max":"255","start":"0","step":"1","unit":""},"required":false}],"events":[],"actions":[]} \ No newline at end of file +{"version":"1.0","profile":{"ProductId":"XOEHGW66ZD","CategoryId":"22"},"properties":[{"id":"a","name":"PM1浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"b","name":"PM2d5浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"c","name":"PM10浓度_CF1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"d","name":"PM1浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"e","name":"PM2d5浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"f","name":"PM10浓度","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"μ g/m3"},"required":false},{"id":"g","name":"颗粒物个数_0d3","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"h","name":"颗粒物个数_0d5","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"i","name":"颗粒物个数_1","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"j","name":"颗粒物个数_2d5","desc":"","mode":"rw","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"k","name":"颗粒物个数_5","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"l","name":"颗粒物个数_10","desc":"","mode":"r","define":{"type":"int","min":"0","max":"65535","start":"0","step":"1","unit":"个"},"required":false},{"id":"v","name":"版本号","desc":"","mode":"r","define":{"type":"int","min":"0","max":"255","start":"0","step":"1","unit":""},"required":false},{"id":"ec","name":"错误代码","desc":"","mode":"r","define":{"type":"int","min":"0","max":"255","start":"0","step":"1","unit":""},"required":false}],"events":[],"actions":[]} \ No newline at end of file diff --git a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/mqtt_iot_explorer_tc_pm25_oled.c b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/mqtt_iot_explorer_tc_pm25_oled.c index 70f60f6e..cad8190b 100644 --- a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/mqtt_iot_explorer_tc_pm25_oled.c +++ b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_pm25/demo/mqtt_iot_explorer_tc_pm25_oled.c @@ -5,11 +5,11 @@ #include "oled.h" #include "math.h" -#define WIFI_SSID "MYMi11" -#define WIFI_PASSWD "13975428888" -#define PRODUCT_ID "XOEHGW66ZD" -#define DEVICE_NAME "pm2d5001" -#define DEVICE_KEY "ucAiCMvMdafJ4xgdFLdhiw==" +#define WIFI_SSID "Tencent-GuestWiFi" +#define WIFI_PASSWD "" +#define PRODUCT_ID "ZLC54JVTAH" +#define DEVICE_NAME "node_20DEBC0A8415" +#define DEVICE_KEY "Xqiswx4I1T+bZyHOrHvaqg==" //#define REPORT_DATA_TEMPLATE1 "{\"method\":\"report\",\"clientToken\":\"%s\"," \ // "\"params\":{\"PM1_CF1\":%d," \ @@ -41,8 +41,8 @@ "\"j\":%d," \ "\"k\":%d," \ "\"l\":%d," \ - "\"m\":%d," \ - "\"n\":%d" \ + "\"v\":%d," \ + "\"ec\":%d" \ "}}" void default_message_handler(mqtt_message_t* msg) @@ -182,7 +182,7 @@ void mqtt_demo_task(void) pm2d5_value.pm2d5_data.data7, pm2d5_value.pm2d5_data.data8, pm2d5_value.pm2d5_data.data9, pm2d5_value.pm2d5_data.data10, pm2d5_value.pm2d5_data.data11, pm2d5_value.pm2d5_data.data12, - pm2d5_value.pm2d5_data.version, pm2d5_value.pm2d5_data.err_code); + 2, pm2d5_value.pm2d5_data.err_code); if (tos_tf_module_mqtt_publ(report_topic_name, QOS0, payload) != 0) { report_error_count++;