[Krobot-commits] [SCM] krobot branch, master, updated. 03e4d8dbf2a8a7216d261348799c2b9b6474ad74

[Olivier B. <Ba...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".

The branch, master has been updated
       via  03e4d8dbf2a8a7216d261348799c2b9b6474ad74 (commit)
      from  bc94b6c746f8ff33a7d448ed453ed0619713d639 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03e4d8dbf2a8a7216d261348799c2b9b6474ad74
Author: Olivier BICHLER <oli...@gm...>
Date:   Tue May 15 15:40:41 2012 +0200

    Bug in get_battery_monitoring()

-----------------------------------------------------------------------

Changes:
diff --git a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/battery_monitoring/battery_monitoring.c b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/battery_monitoring/battery_monitoring.c
index f82f81f..8fc7d4c 100644
--- a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/battery_monitoring/battery_monitoring.c
+++ b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/battery_monitoring/battery_monitoring.c
@@ -39,7 +39,7 @@ int get_battery_monitoring(battery_status *pkt1, battery_status *pkt2) {
 
         // Battery 2
         for (ch = 0; ch < 4; ++ch)
-            pkt2->p.elem[ch] = battery_state[ch];
+            pkt2->p.elem[ch] = battery_state[4+ch];
 
         measure_flag = 0;
         return 0;


hooks/post-receive
-- 
krobot