sort calibration points

vitotai · Mar 15, 2024 · 22175ae · 22175ae
1 parent ce14288
commit 22175ae
Show file tree

Hide file tree

Showing 127 changed files with 30,764 additions and 30,745 deletions.
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm b/htmljs/dist/chinese/BPLLogViewer.htm
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm.gz b/htmljs/dist/chinese/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm b/htmljs/dist/chinese/BPLogWebViewer.htm
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm.gz b/htmljs/dist/chinese/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/chinese/config.htm b/htmljs/dist/chinese/config.htm
diff --git a/htmljs/dist/chinese/config.htm.gz b/htmljs/dist/chinese/config.htm.gz
diff --git a/htmljs/dist/chinese/control.htm b/htmljs/dist/chinese/control.htm
diff --git a/htmljs/dist/chinese/control.htm.gz b/htmljs/dist/chinese/control.htm.gz
diff --git a/htmljs/dist/chinese/index.htm b/htmljs/dist/chinese/index.htm
diff --git a/htmljs/dist/chinese/index.htm.gz b/htmljs/dist/chinese/index.htm.gz
diff --git a/htmljs/dist/chinese/logging.htm b/htmljs/dist/chinese/logging.htm
diff --git a/htmljs/dist/chinese/logging.htm.gz b/htmljs/dist/chinese/logging.htm.gz
diff --git a/htmljs/dist/english/BPLLogViewer.htm b/htmljs/dist/english/BPLLogViewer.htm
diff --git a/htmljs/dist/english/BPLLogViewer.htm.gz b/htmljs/dist/english/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/english/BPLogWebViewer.htm b/htmljs/dist/english/BPLogWebViewer.htm
diff --git a/htmljs/dist/english/BPLogWebViewer.htm.gz b/htmljs/dist/english/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/english/config.htm b/htmljs/dist/english/config.htm
diff --git a/htmljs/dist/english/config.htm.gz b/htmljs/dist/english/config.htm.gz
diff --git a/htmljs/dist/english/control.htm b/htmljs/dist/english/control.htm
diff --git a/htmljs/dist/english/control.htm.gz b/htmljs/dist/english/control.htm.gz
diff --git a/htmljs/dist/english/index.htm b/htmljs/dist/english/index.htm
diff --git a/htmljs/dist/english/index.htm.gz b/htmljs/dist/english/index.htm.gz
diff --git a/htmljs/dist/english/logging.htm b/htmljs/dist/english/logging.htm
diff --git a/htmljs/dist/english/logging.htm.gz b/htmljs/dist/english/logging.htm.gz
diff --git a/htmljs/dist/italian/BPLLogViewer.htm b/htmljs/dist/italian/BPLLogViewer.htm
diff --git a/htmljs/dist/italian/BPLLogViewer.htm.gz b/htmljs/dist/italian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm b/htmljs/dist/italian/BPLogWebViewer.htm
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm.gz b/htmljs/dist/italian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/italian/config.htm b/htmljs/dist/italian/config.htm
diff --git a/htmljs/dist/italian/config.htm.gz b/htmljs/dist/italian/config.htm.gz
diff --git a/htmljs/dist/italian/control.htm b/htmljs/dist/italian/control.htm
diff --git a/htmljs/dist/italian/control.htm.gz b/htmljs/dist/italian/control.htm.gz
diff --git a/htmljs/dist/italian/index.htm b/htmljs/dist/italian/index.htm
diff --git a/htmljs/dist/italian/index.htm.gz b/htmljs/dist/italian/index.htm.gz
diff --git a/htmljs/dist/italian/logging.htm b/htmljs/dist/italian/logging.htm
diff --git a/htmljs/dist/italian/logging.htm.gz b/htmljs/dist/italian/logging.htm.gz
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm b/htmljs/dist/norwegian/BPLLogViewer.htm
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm.gz b/htmljs/dist/norwegian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm b/htmljs/dist/norwegian/BPLogWebViewer.htm
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm.gz b/htmljs/dist/norwegian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/norwegian/config.htm b/htmljs/dist/norwegian/config.htm
diff --git a/htmljs/dist/norwegian/config.htm.gz b/htmljs/dist/norwegian/config.htm.gz
diff --git a/htmljs/dist/norwegian/control.htm b/htmljs/dist/norwegian/control.htm
diff --git a/htmljs/dist/norwegian/control.htm.gz b/htmljs/dist/norwegian/control.htm.gz
diff --git a/htmljs/dist/norwegian/control_s.htm b/htmljs/dist/norwegian/control_s.htm
diff --git a/htmljs/dist/norwegian/control_s.htm.gz b/htmljs/dist/norwegian/control_s.htm.gz
diff --git a/htmljs/dist/norwegian/index.htm b/htmljs/dist/norwegian/index.htm
diff --git a/htmljs/dist/norwegian/index.htm.gz b/htmljs/dist/norwegian/index.htm.gz
diff --git a/htmljs/dist/norwegian/index_s.htm b/htmljs/dist/norwegian/index_s.htm
diff --git a/htmljs/dist/norwegian/index_s.htm.gz b/htmljs/dist/norwegian/index_s.htm.gz
diff --git a/htmljs/dist/norwegian/logging.htm b/htmljs/dist/norwegian/logging.htm
diff --git a/htmljs/dist/norwegian/logging.htm.gz b/htmljs/dist/norwegian/logging.htm.gz
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm b/htmljs/dist/portuguese-br/BPLLogViewer.htm
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz b/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/portuguese-br/BPLogWebViewer.htm b/htmljs/dist/portuguese-br/BPLogWebViewer.htm
diff --git a/htmljs/dist/portuguese-br/BPLogWebViewer.htm.gz b/htmljs/dist/portuguese-br/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/portuguese-br/config.htm b/htmljs/dist/portuguese-br/config.htm
diff --git a/htmljs/dist/portuguese-br/config.htm.gz b/htmljs/dist/portuguese-br/config.htm.gz
diff --git a/htmljs/dist/portuguese-br/control.htm b/htmljs/dist/portuguese-br/control.htm
diff --git a/htmljs/dist/portuguese-br/control.htm.gz b/htmljs/dist/portuguese-br/control.htm.gz
diff --git a/htmljs/dist/portuguese-br/control_s.htm b/htmljs/dist/portuguese-br/control_s.htm
diff --git a/htmljs/dist/portuguese-br/control_s.htm.gz b/htmljs/dist/portuguese-br/control_s.htm.gz
diff --git a/htmljs/dist/portuguese-br/index.htm b/htmljs/dist/portuguese-br/index.htm
diff --git a/htmljs/dist/portuguese-br/index.htm.gz b/htmljs/dist/portuguese-br/index.htm.gz
diff --git a/htmljs/dist/portuguese-br/index_s.htm b/htmljs/dist/portuguese-br/index_s.htm
diff --git a/htmljs/dist/portuguese-br/index_s.htm.gz b/htmljs/dist/portuguese-br/index_s.htm.gz
diff --git a/htmljs/dist/portuguese-br/logging.htm b/htmljs/dist/portuguese-br/logging.htm
diff --git a/htmljs/dist/portuguese-br/logging.htm.gz b/htmljs/dist/portuguese-br/logging.htm.gz
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm b/htmljs/dist/slovak/BPLLogViewer.htm
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm.gz b/htmljs/dist/slovak/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/slovak/BPLogWebViewer.htm b/htmljs/dist/slovak/BPLogWebViewer.htm
diff --git a/htmljs/dist/slovak/BPLogWebViewer.htm.gz b/htmljs/dist/slovak/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/slovak/config.htm b/htmljs/dist/slovak/config.htm
diff --git a/htmljs/dist/slovak/config.htm.gz b/htmljs/dist/slovak/config.htm.gz
diff --git a/htmljs/dist/slovak/control.htm b/htmljs/dist/slovak/control.htm
diff --git a/htmljs/dist/slovak/control.htm.gz b/htmljs/dist/slovak/control.htm.gz
diff --git a/htmljs/dist/slovak/control_s.htm b/htmljs/dist/slovak/control_s.htm
diff --git a/htmljs/dist/slovak/control_s.htm.gz b/htmljs/dist/slovak/control_s.htm.gz
diff --git a/htmljs/dist/slovak/index.htm b/htmljs/dist/slovak/index.htm
diff --git a/htmljs/dist/slovak/index.htm.gz b/htmljs/dist/slovak/index.htm.gz
diff --git a/htmljs/dist/slovak/index_s.htm b/htmljs/dist/slovak/index_s.htm
diff --git a/htmljs/dist/slovak/index_s.htm.gz b/htmljs/dist/slovak/index_s.htm.gz
diff --git a/htmljs/dist/slovak/logging.htm b/htmljs/dist/slovak/logging.htm
diff --git a/htmljs/dist/slovak/logging.htm.gz b/htmljs/dist/slovak/logging.htm.gz
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm b/htmljs/dist/spanish/BPLLogViewer.htm
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm.gz b/htmljs/dist/spanish/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/spanish/BPLogWebViewer.htm b/htmljs/dist/spanish/BPLogWebViewer.htm
diff --git a/htmljs/dist/spanish/BPLogWebViewer.htm.gz b/htmljs/dist/spanish/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/spanish/config.htm b/htmljs/dist/spanish/config.htm
diff --git a/htmljs/dist/spanish/config.htm.gz b/htmljs/dist/spanish/config.htm.gz
diff --git a/htmljs/dist/spanish/control.htm b/htmljs/dist/spanish/control.htm
diff --git a/htmljs/dist/spanish/control.htm.gz b/htmljs/dist/spanish/control.htm.gz
diff --git a/htmljs/dist/spanish/index.htm b/htmljs/dist/spanish/index.htm
diff --git a/htmljs/dist/spanish/index.htm.gz b/htmljs/dist/spanish/index.htm.gz
diff --git a/htmljs/dist/spanish/logging.htm b/htmljs/dist/spanish/logging.htm
diff --git a/htmljs/dist/spanish/logging.htm.gz b/htmljs/dist/spanish/logging.htm.gz
diff --git a/htmljs/src/js/vendor/chart.js b/htmljs/src/js/vendor/chart.js
@@ -811,6 +811,7 @@ var GravityChangePeriod3 =24 * 3600;
                             var raw = (t.devType == 2)? traw/10000:traw/100;               
                             t.calpoints.push([raw,gravity]);
                         }
+                        t.calpoints.sort(function(a,b){return a[0]-b[0];});
                     }
                 } else if (d0 == 0xF4) { // mode
                     //console.log(""+t.ctime/t.interval +" Stage:"+d1);

diff --git a/src/ExternalData.cpp b/src/ExternalData.cpp
@@ -329,13 +329,17 @@ bool ExternalData::processGravityReport(char data[],size_t length, bool authenti
   			return false;
   		}		
 		float  gravity = root["gravity"];
+		float tilt = -100;
+
+		if(root.containsKey("raw")){
+			tilt = root["raw"];
+		}
 
 		if(root.containsKey("og")){
 			_setOriginalGravity(gravity);
 
 		}else{
 			// gravity data from user
-			float tilt = -100;
 			userSetGravity(gravity,tilt);
 		}
 	}else if(root.containsKey("name") && root.containsKey("temperature") && root.containsKey("angle") && root.containsKey("battery")&& root.containsKey("RSSI")){

diff --git a/src/FormulaKeeper.cpp b/src/FormulaKeeper.cpp
@@ -69,10 +69,21 @@ bool FormulaKeeper::addGravity(float sg){
 }
 
 void FormulaKeeper::addPoint(float tilt,float sg){
-        DBG_PRINTF("*** addPoint:%.4f,%f.4f\n",tilt,sg);
-        _calTilts[_numberOfPoints]= tilt;
-        _calGravities[_numberOfPoints] = sg;
+        if(_numberOfPoints >= MaxNumberCalibrationPoints) return;
+        int pos=0;
+
+        while(pos<_numberOfPoints && _calTilts[pos]< tilt) pos++;
+
+        if(pos < _numberOfPoints){
+            for(int i=_numberOfPoints; i> pos;i--){
+                _calTilts[i]= _calTilts[i-1];
+                _calGravities[i] =_calGravities[i-1];
+            }
+        }
+        _calTilts[pos]= tilt;
+        _calGravities[pos] = sg;
         _numberOfPoints ++;        
+        DBG_PRINTF("*** addPoint:%.4f,%f.4f @%d\n",tilt,sg,pos);
 }
 
 #endif
diff --git a/wdoc/chinese_config_htm.h b/wdoc/chinese_config_htm.h
diff --git a/wdoc/chinese_control_htm.h b/wdoc/chinese_control_htm.h
diff --git a/wdoc/chinese_index_htm.h b/wdoc/chinese_index_htm.h
diff --git a/wdoc/chinese_log_htm.h b/wdoc/chinese_log_htm.h
diff --git a/wdoc/english_config_htm.h b/wdoc/english_config_htm.h
diff --git a/wdoc/english_control_htm.h b/wdoc/english_control_htm.h
diff --git a/wdoc/english_index_htm.h b/wdoc/english_index_htm.h
diff --git a/wdoc/english_log_htm.h b/wdoc/english_log_htm.h
diff --git a/wdoc/italian_config_htm.h b/wdoc/italian_config_htm.h
diff --git a/wdoc/italian_control_htm.h b/wdoc/italian_control_htm.h
diff --git a/wdoc/italian_index_htm.h b/wdoc/italian_index_htm.h
diff --git a/wdoc/italian_log_htm.h b/wdoc/italian_log_htm.h
diff --git a/wdoc/norwegian_config_htm.h b/wdoc/norwegian_config_htm.h
diff --git a/wdoc/norwegian_control_htm.h b/wdoc/norwegian_control_htm.h
diff --git a/wdoc/norwegian_index_htm.h b/wdoc/norwegian_index_htm.h
diff --git a/wdoc/norwegian_log_htm.h b/wdoc/norwegian_log_htm.h
diff --git a/wdoc/portuguese-br_config_htm.h b/wdoc/portuguese-br_config_htm.h
diff --git a/wdoc/portuguese-br_control_htm.h b/wdoc/portuguese-br_control_htm.h
diff --git a/wdoc/portuguese-br_index_htm.h b/wdoc/portuguese-br_index_htm.h
diff --git a/wdoc/portuguese-br_log_htm.h b/wdoc/portuguese-br_log_htm.h
diff --git a/wdoc/slovak_config_htm.h b/wdoc/slovak_config_htm.h
diff --git a/wdoc/slovak_control_htm.h b/wdoc/slovak_control_htm.h
diff --git a/wdoc/slovak_index_htm.h b/wdoc/slovak_index_htm.h
diff --git a/wdoc/slovak_log_htm.h b/wdoc/slovak_log_htm.h
diff --git a/wdoc/spanish_config_htm.h b/wdoc/spanish_config_htm.h
diff --git a/wdoc/spanish_control_htm.h b/wdoc/spanish_control_htm.h
diff --git a/wdoc/spanish_index_htm.h b/wdoc/spanish_index_htm.h
diff --git a/wdoc/spanish_log_htm.h b/wdoc/spanish_log_htm.h