From: Kevin Townsend <kevin@ktownsend.com>
Date: Sat, 24 Mar 2012 23:28:28 +0000 (+0100)
Subject: v1.0.0
X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/8a8270d96b06be7c6aec0d99b080c6607b00450e?ds=inline

v1.0.0
---

diff --git a/.cproject b/.cproject
index 3d04d01..972f2bf 100644
--- a/.cproject
+++ b/.cproject
@@ -160,7 +160,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LPC1343_CodeBase_GIT.null.1796537098" name="LPC1343_CodeBase_GIT"/>
+		<project id="LPC1343_CodeBase.null.1796537098" name="LPC1343_CodeBase"/>
 	</storageModule>
 	<storageModule moduleId="com.crt.config">
 		<projectStorage>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&#13;
diff --git a/.project b/.project
index 64d7eb7..25d4b59 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>LPC1343_CodeBase_GIT</name>
+	<name>LPC1343_CodeBase</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/build/crossworks/LPC1343_CodeBase.hzs b/build/crossworks/LPC1343_CodeBase.hzs
index 8676df3..7de72dc 100644
--- a/build/crossworks/LPC1343_CodeBase.hzs
+++ b/build/crossworks/LPC1343_CodeBase.hzs
@@ -24,8 +24,6 @@
   <ProjectSessionItem path="LPC1343_CodeBase" name="unnamed" />
   <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase" name="unnamed" />
   <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files" name="unnamed" />
-  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers" name="unnamed" />
-  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;sensors" name="unnamed" />
  </Project>
  <Register1>
   <RegisterWindow openNodes="CPU;CoreDebug" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU;CoreDebug" decimalNodes="" octalNodes="" asciiNodes="" />
@@ -45,10 +43,10 @@
  </TraceWindow>
  <Watch1>
   <Watches active="1" update="Each Second" >
-   <Watchpoint linenumber="66" radix="10" name="msTicks" expression="msTicks" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/systick/systick.c" />
-   <Watchpoint linenumber="138" radix="16" name="timer32_0_counter" expression="timer32_0_counter" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/timer32/timer32.c" />
-   <Watchpoint linenumber="155" radix="-1" name="xTickCount" expression="xTickCount" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
    <Watchpoint linenumber="155" radix="16" name="Tick" expression="Tick" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
+   <Watchpoint linenumber="155" radix="-1" name="xTickCount" expression="xTickCount" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
+   <Watchpoint linenumber="138" radix="16" name="timer32_0_counter" expression="timer32_0_counter" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/timer32/timer32.c" />
+   <Watchpoint linenumber="66" radix="10" name="msTicks" expression="msTicks" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/systick/systick.c" />
   </Watches>
  </Watch1>
  <Watch2>
@@ -61,7 +59,7 @@
   <Watches active="0" update="Never" />
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="72" debugPath="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" y="26" path="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" left="0" selected="1" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" y="65" path="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" left="0" selected="1" name="unnamed" top="36" />
  </Files>
  <ARMCrossStudioWindow activeProject="LPC1343_CodeBase" autoConnectTarget="SEGGER J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\drivers\displays\tft" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Flash Release" />
 </session>
diff --git a/main.c b/main.c
index b4e63e7..8ca68e0 100644
--- a/main.c
+++ b/main.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 #include "projectconfig.h"
 #include "sysinit.h"
diff --git a/sysinit.c b/sysinit.c
index 6d8d385..0385a21 100644
--- a/sysinit.c
+++ b/sysinit.c
@@ -103,8 +103,16 @@
 
   DWORD get_fattime ()
   {
-    // ToDo!
-    return 0;
+    DWORD tmr = 0;
+
+    // tmr =  (((DWORD)rtcYear - 80) << 25)
+	//      | ((DWORD)rtcMon << 21)
+    //      | ((DWORD)rtcMday << 16)
+    //      | (WORD)(rtcHour << 11)
+    //      | (WORD)(rtcMin << 5)
+    //      | (WORD)(rtcSec >> 1);
+
+    return tmr;
   }
 #endif
 
@@ -356,4 +364,4 @@ signed int printf(const char *pFormat, ...)
     return result;
 }
 
-#endif
\ No newline at end of file
+#endif