Magn Sens: fix baud rate / F_CPU / fuses

diff --git a/sensors/MagneticFieldSensor/Makefile b/sensors/MagneticFieldSensor/Makefile
index e8d8c75f0add9d288dcfaddd10db4c7339277844..8f3bb5b2dcd2e9ae36f929832f587f8bb3478b98 100644 (file)
--- a/sensors/MagneticFieldSensor/Makefile
+++ b/sensors/MagneticFieldSensor/Makefile
@@ -29,7 +29,7 @@ DEBUG = stabs
 CSTANDARD = -std=gnu99\r
 \r
 # Place -D or -U options here\r
-CDEFS = -DF_CPU=16000000\r
+CDEFS = -DF_CPU=8000000\r
 \r
 # Place -I options here\r
 CINCS =\r
@@ -241,3 +241,6 @@ program_avrisp2: all
 \r
 program_leo: all\r
        avrdude -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D -Uflash:w:$(TARGET).hex:i\r
+\r
+fuses:\r
+       $(AVRDUDE) $(AVRDUDE_FLAGS) -U lfuse:w:0x46:m -U hfuse:w:0xd9:m -U efuse:w:0xff:m\r

diff --git a/sensors/MagneticFieldSensor/main.c b/sensors/MagneticFieldSensor/main.c
index 7959d3bb098d645daccf7a14e8071229b8314e9f..5669d61f2c9b231973ed36c34be3083ba47e5c03 100644 (file)
--- a/sensors/MagneticFieldSensor/main.c
+++ b/sensors/MagneticFieldSensor/main.c
@@ -21,8 +21,8 @@ int main(void)
     float SensZ[4];\r
     \r
     //For CLK setting\r
-    CLKPR = (0<<CLKPCE);  // No prescale\r
-    CLKPR = 0x00; //prescaler 2\r
+    CLKPR = (1<<CLKPCE);  // No prescale\r
+    CLKPR = 0x01; //prescaler 2\r
     PRR  = 0;\r
     //Init UART\r
     uinit(); \r

diff --git a/sensors/MagneticFieldSensor/main.h b/sensors/MagneticFieldSensor/main.h
index 1846ca91bd81075a08827b47de47416e01f550d1..adf1be16ae8d8a75c00e6da2e11eaa03b4ed5a88 100644 (file)
--- a/sensors/MagneticFieldSensor/main.h
+++ b/sensors/MagneticFieldSensor/main.h
@@ -25,11 +25,11 @@
 \r
 \r
 #ifndef F_CPU\r
-#define F_CPU 16000000\r
+#define F_CPU 8000000\r
 #endif\r
 \r
 # define USART_BAUDRATE 19200\r
-# define BAUD_PRESCALE (unsigned int)(1.0 * F_CPU / USART_BAUDRATE / 16 - 0.5);\r
+# define BAUD_PRESCALE (unsigned int)(1.0 * F_CPU / USART_BAUDRATE / 8 - 0.5);\r
 \r
 #define ADDR_MAG_0   0x0C\r
 #define ADDR_MAG_1   0x0D\r