diff --git a/conf/firmwares/rotorcraft.makefile b/conf/firmwares/rotorcraft.makefile
index bd5519ef4c..ffbea72141 100644
--- a/conf/firmwares/rotorcraft.makefile
+++ b/conf/firmwares/rotorcraft.makefile
@@ -238,7 +238,7 @@ ap.srcs   += subsystems/electrical.c
 else ifeq ($(BOARD)$(BOARD_TYPE), ardronesdk)
 ap.srcs   += $(SRC_BOARD)/electrical_dummy.c
 else ifeq ($(BOARD)$(BOARD_TYPE), ardroneraw)
-ap.srcs   += $(SRC_ARCH)/subsystems/electrical/electrical_arch.c
+ap.srcs   += $(SRC_BOARD)/electrical_raw.c
 endif
 
 
diff --git a/sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c b/sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
deleted file mode 100644
index 52f1e41ef7..0000000000
--- a/sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Copyright (C) 2009-2013 The Paparazzi Team
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/**
- * @file arch/omap/subsystems/electrical/electrical_arch.c
- * arch specific electrical status readings
- */
-
-#include "subsystems/electrical/electrical_arch.h"
-
-struct Electrical electrical;
-
-void electrical_init(void) { }
-
-void electrical_periodic(void) {
-  electrical.vsupply = 120;
-}
diff --git a/sw/airborne/boards/ardrone/electrical_raw.c b/sw/airborne/boards/ardrone/electrical_raw.c
new file mode 100644
index 0000000000..c327f38f45
--- /dev/null
+++ b/sw/airborne/boards/ardrone/electrical_raw.c
@@ -0,0 +1,102 @@
+/*
+ *
+ * Copyright (C) 2009-2013 The Paparazzi Team
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+/**
+ * @file boards/ardrone/electrical_raw.c
+ * arch specific electrical status readings
+ */
+
+#include "electrical_raw.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <math.h>
+#include "i2c-dev.h"
+
+struct Electrical electrical;
+
+int fd;
+
+void electrical_init(void) {
+
+  fd = open( "/dev/i2c-1", O_RDWR );
+
+
+  if ( ioctl( fd, I2C_SLAVE_FORCE, 0x4a) < 0 ) {
+    fprintf( stderr, "Failed to set slave address: %m\n" );
+  }
+
+  electrical_setup();
+}
+
+void electrical_setup(void) {
+  // Turn on MADC in CTRL1
+  if( i2c_smbus_write_byte_data( fd, 0x00, 0x01))   {
+    fprintf( stderr, "Failed to write to I2C device. 1\n" );
+  }
+  // Select ADCIN0 for conversion in SW1SELECT_LSB
+  if( i2c_smbus_write_byte_data( fd, 0x06, 0xff)){
+    fprintf( stderr, "Failed to write to I2C device. 2\n" );
+  }
+  // Select ADCIN12 for conversion in SW1SELECT_MSB
+  if( i2c_smbus_write_byte_data( fd, 0x07, 0xff))  {
+    fprintf( stderr, "Failed to write to I2C device. 3\n" );
+  }
+  // Setup register for averaging
+  if( i2c_smbus_write_byte_data( fd, 0x08, 0xff))  {
+    fprintf( stderr, "Failed to write to I2C device. 4\n" );
+  }
+  // Start all channel conversion by setting bit 5 to one in CTRL_SW1
+  if( i2c_smbus_write_byte_data( fd, 0x12, 0x20))  {
+    fprintf( stderr, "Failed to write to I2C device. 5\n" );
+  }
+}
+
+void electrical_periodic(void) {
+
+  electrical_setup();
+
+  unsigned char lsb, msb;
+  lsb = i2c_smbus_read_byte_data(fd, 0x37);
+  msb = i2c_smbus_read_byte_data(fd, 0x38);
+
+  int raw_voltage = (lsb >> 6) | (msb << 2);
+
+  // we know from spec sheet that ADCIN0 has no prescaler
+  // so that the max voltage range is 1.5 volt
+  // multiply by ten to get decivolts
+  electrical.vsupply = 10 * electrical_calculate_voltage(raw_voltage, 1.5);
+}
+
+float electrical_calculate_voltage(int raw, float range_max)
+{
+  float step_size = 1.5/(pow(2,10)-1);
+  float R = ( 1.5 / range_max );
+  float output = (float)raw * ( step_size / R );
+
+  return 6.6 + (3 * output);  // todo improve this line to get more accurate voltage readings
+}
diff --git a/sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h b/sw/airborne/boards/ardrone/electrical_raw.h
similarity index 80%
rename from sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
rename to sw/airborne/boards/ardrone/electrical_raw.h
index 450acec3e2..9f6062cb80 100644
--- a/sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
+++ b/sw/airborne/boards/ardrone/electrical_raw.h
@@ -22,13 +22,16 @@
  */
 
 /**
- * @file arch/omap/subsystems/electrical/electrical_arch.h
+ * @file boards/ardrone/electrical_raw.h
  * arch specific electrical status readings
  */
 
-#ifndef ELECTRICAL_ARCH_H_
-#define ELECTRICAL_ARCH_H_
+#ifndef ELECTRICAL_RAW_H_
+#define ELECTRICAL_RAW_H_
 
 #include "subsystems/electrical.h"
 
-#endif /* ELECTRICAL_ARCH_H_ */
+void electrical_setup(void);
+float electrical_calculate_voltage(int raw, float range_max);
+
+#endif /* ELECTRICAL_RAW_H_ */