From 71964b041ec24be413985ec3e7ed084b2677bbb1 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 28 Feb 2023 09:29:11 +0100
Subject: [PATCH] Revert "magnav"

This reverts commit cc57c42a17d44016834cd749a5fe4aba0f10b2b5.
---
 apps/magnav/ChangeLog     |  1 -
 apps/magnav/lib.js        | 16 +++++-----------
 apps/magnav/metadata.json |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/magnav/ChangeLog b/apps/magnav/ChangeLog
index 7b548841a..14a6eb2a2 100644
--- a/apps/magnav/ChangeLog
+++ b/apps/magnav/ChangeLog
@@ -4,4 +4,3 @@
 0.04: Fix Font size
 0.05: Initial portable version
 0.06: Outsource tilt compensation to library
-0.07: Add tiltfix() for compensation on given sensor values
diff --git a/apps/magnav/lib.js b/apps/magnav/lib.js
index 39c51a1e1..e3fe8fccb 100644
--- a/apps/magnav/lib.js
+++ b/apps/magnav/lib.js
@@ -22,10 +22,11 @@ exports.calibrate = () => {
   });
 }
 
-exports.tiltfix = (m,g,O,S) => {
-  if (O & S) {
-    m.dx =(m.x-O.x)*S.x; m.dy=(m.y-O.y)*S.y; m.dz=(m.z-O.z)*S.z;
-  }
+exports.tiltfixread = (O,S) => {
+  "ram"
+  var m = Bangle.getCompass();
+  var g = Bangle.getAccel();
+  m.dx =(m.x-O.x)*S.x; m.dy=(m.y-O.y)*S.y; m.dz=(m.z-O.z)*S.z;
   var d = Math.atan2(-m.dx,m.dy)*180/Math.PI;
   if (d<0) d+=360;
   var phi = Math.atan(-g.x/-g.z);
@@ -38,10 +39,3 @@ exports.tiltfix = (m,g,O,S) => {
   if (psi<0) psi+=360;
   return psi;
 }
-
-exports.tiltfixread = (O,S) => {
-  "ram"
-  var m = Bangle.getCompass({noTiltComp: true});
-  var g = Bangle.getAccel();
-  return exports.tiltfix(m,g,O,S);
-}
diff --git a/apps/magnav/metadata.json b/apps/magnav/metadata.json
index 6bdb9d0b6..bd40a08fd 100644
--- a/apps/magnav/metadata.json
+++ b/apps/magnav/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "magnav",
   "name": "Navigation Compass",
-  "version": "0.07",
+  "version": "0.06",
   "description": "Compass with linear display as for GPSNAV. Has Tilt compensation and remembers calibration.",
   "screenshots": [{"url":"screenshot-b2.png"},{"url":"screenshot-light-b2.png"}],
   "icon": "magnav.png",