Merge branch 'master' of http://github.com/epall/OpenChronos

13 years ago · 2142fa5ac3
3 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@
 *.s
 .pida-metadata
 config.h
+build
--- a/4
+++ b/4
@ -18,7 +18,7 @@ Patches for more (more efficient) compilers are welcome :-)

 == HOWTO ==

-Copy intrinsic.h into [msp430-gcc-path]/msp430/include/intrinsics.h
+Copy gcc/intrinsics.h into [msp430-gcc-path]/msp430/include/intrinsics.h

 To configure your image, run:

@ -31,7 +31,7 @@ To compile the image run:
   make


-It is HIGHLY suggested to make a clean build befor you flash the image with:
+It is HIGHLY suggested to make a clean build before you flash the image with:

   make clean main

--- a/logic/clock.c
+++ b/logic/clock.c
@ -80,7 +80,7 @@ void conv_24H_to_12H(u8 * hours24, u8 * hours12, u8 * timeAMorPM);
 struct time sTime;

 // Display values for time format selection
-#ifdef CONFIG_METRIC_ONLY
+#ifndef CONFIG_METRIC_ONLY
 const u8 selection_Timeformat[][4] =
 {
 	"24H", "12H"