From f85709d6aed1c914b37d184482163658f1bd287d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 12:00:38 +0800
Subject: [PATCH] 秦工修改协议未通知，为了与硬件端统一，修改fei取值(59位->71+72+73（71位符号位：0正1负）)
---
method.js | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/method.js b/method.js
index 07aa228..1761222 100644
--- a/method.js
+++ b/method.js
@@ -164,7 +164,10 @@
var p3 = this.toDec(fields[47]);
var p4 = this.toDec(fields[48]);
var fei = this.toDec(fields[58]);
- var ferval = this.toDec(fields[59]);
+ //var ferval = this.toDec(fields[59]);
+
+ var feival = this.toDec(fields[71]) == 0 ? (this.toDec(fields[72]) * 256 + this.toDec(fields[73])) : -1 * (this.toDec(fields[72]) * 256 + this.toDec(fields[73]));
+
var t = this.toDec(fields[56]);
var aqi = this.toDec(fields[60]) * 256 + this.toDec(fields[61]); //AQI
@@ -184,7 +187,7 @@
mac: mac,
location: _config.location,
data: {
- x0: ferval,
+ x0: feival,
x1: x1, //PM2.5 - (������:ppm)
x2: x3, //PM2.5 - 0.1���0.3um���
x3: x9, //������
--
Gitblit v1.8.0