Diff: settings/settings.c

Revision:

16:3d40d832dc70

Parent:

14:1bce51823be0

Child:

17:1dcc58dac445

--- a/settings/settings.c	Sat Dec 15 17:46:35 2018 +0000
+++ b/settings/settings.c	Sat Dec 29 19:09:25 2018 +0000
@@ -31,40 +31,35 @@
 #include       "http.h"
 #include       "tftp.h"
 
-#define GPREG1 (*((volatile unsigned *) 0x40024048))
 #define GPREG2 (*((volatile unsigned *) 0x4002404C))
 #define GPREG3 (*((volatile unsigned *) 0x40024050))
 #define GPREG4 (*((volatile unsigned *) 0x40024054))
 #define ALMON  (*((volatile unsigned *) 0x40024078))
 #define ALYEAR (*((volatile unsigned *) 0x4002407C))
-#define ALDOY  (*((volatile unsigned *) 0x40024074))
+#define ALDOM  (*((volatile unsigned *) 0x4002406C))
 
 /*
-ALSEC   6 Alarm value for Seconds      R/W 0x4002 4060
-ALMIN   6 Alarm value for Minutes      R/W 0x4002 4064
+ALSEC   6 Alarm value for Seconds      R/W 0x4002 4060 - 
+ALMIN   6 Alarm value for Minutes      R/W 0x4002 4064 - 
 ALHOUR  5 Alarm value for Hours        R/W 0x4002 4068
-ALDOM   5 Alarm value for Day of Month R/W 0x4002 406C
+ALDOM   5 Alarm value for Day of Month R/W 0x4002 406C *
 ALDOW   3 Alarm value for Day of Week  R/W 0x4002 4070
-ALDOY   9 Alarm value for Day of Year  R/W 0x4002 4074
-ALMON   4 Alarm value for Months       R/W 0x4002 4078
-ALYEAR 12 Alarm value for Years        R/W 0x4002 407C
+ALDOY   9 Alarm value for Day of Year  R/W 0x4002 4074 -
+ALMON   4 Alarm value for Months       R/W 0x4002 4078 *
+ALYEAR 12 Alarm value for Years        R/W 0x4002 407C *
 */
 
 enum { iLogUart, iNetStack, iNetNewLine, iNetVerbose, iLink, iDnsName, iDnsQuery, iDnsReply, iDnsServer,
        iNtp, iDhcp, iNsRecvSol, iNsRecvAdv, iNsSendSol, iNr4, iNr6, iNtpClient, iClkSync, iEcho4, iEcho6,
        iDest6, iRa, iRs, iAr4, iAr6, iArp, iIp4, iIp6, iUdp, iTcp, iHttp, iTftp };
 
-int GetGpsLat()   { return GPREG1; } void SetGpsLat  (int value) { GPREG1 = value; }
-int GetGpsLng()   { return GPREG2; } void SetGpsLng  (int value) { GPREG2 = value; }
-int GetGpsHgt()   { return GPREG3; } void SetGpsHgt  (int value) { GPREG3 = value; }
-
 int GetSensorHeight()
 {
-    return ALDOY; //9 bits
+    return ALDOM; //9 bits
 }
 void SetSensorHeight(int value)
 {
-    ALDOY = value & 0x01FF; //9 bits
+    ALDOM = value & 0x001F; //5 bits +32
 }
 
 static bool getBit(int bit)