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

[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  eb72aa7c7f83dd70e1003b7c9b5259b2a472f922 (commit)
      from  810825d539e39f8a50b858b13092c5e1674f3acc (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 eb72aa7c7f83dd70e1003b7c9b5259b2a472f922
Author: Olivier BICHLER <oli...@cr...>
Date:   Mon May 10 17:01:09 2010 +0200

    Inverted arguments in servo_set_state for security

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

Changes:
diff --git a/elec/boards/Interface_Robot/Firmware/main.c b/elec/boards/Interface_Robot/Firmware/main.c
index d582e71..57e7b25 100644
--- a/elec/boards/Interface_Robot/Firmware/main.c
+++ b/elec/boards/Interface_Robot/Firmware/main.c
@@ -867,8 +867,10 @@ void ProcessIO(void) {
                     break;

 

                     case SET_SERVO_CONFIG:

-                        glbServoEnabled&= ~ReceivedDataBuffer.DATA[1];        // Servo ctiver

-                        glbServoEnabled|= ReceivedDataBuffer.DATA[2];        // Servo ctiver

+                        // On active d'abord puis on dctive. Ainsi si on demande a fois d'activer et dctiver

+                        // un m servo, celui-ci reste dctivpar mesure de srit

+                        glbServoEnabled|= ReceivedDataBuffer.DATA[1];        // Servo ctiver

+                        glbServoEnabled&= ~ReceivedDataBuffer.DATA[2];        // Servo ctiver

                     break;

 

                     case SET_SERVO_STATE:

diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof
index ba95004..56dfdb9 100644
Binary files a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof and b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof differ
diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
index ba9c59c..2c46e52 100644
--- a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
+++ b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
@@ -134,8 +134,8 @@
 :100FF00005010A1D8A1605010B1D8B1605010C1D26

 :101000008C1605010D1D8D1655D00501095189124B

 :1010100005010A518A1205010B518B1205010C5171

-:101020008C1205010D518D1245D00501091D0101DC

-:101030001F1705010A5101011F133CD0050109A129

+:101020008C1205010D518D1245D0050109510101A8

+:101030001F1305010A1D01011F173CD0050109A15D

 :1010400007D00AC5E6FFE66AA3EC1BF0E552E552BD

 :10105000050109A308D00BC5E6FF010EE66EA3EC5F

 :101060001BF0E552E552050109A508D00CC5E6FFC5

@@ -954,7 +954,7 @@
 :10421000E2CFDAFFFD0EDB50C96EC6AE02D0FF0E54

 :1042200009D0C7B0FED763EC22F0C5AC02D0FE0EB9

 :1042300001D0000EE552E5CFDAFFE7CFD9FF12003B

-:1042400031363A35323A31330020004D6179203130

+:1042400031373A30303A30350020004D6179203135

 :1042500030203230313000526F626F7420496E74FA

 :1042600065726661636520312E300A4F6C6976692C

 :0B427000657220424943484C45520053

diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
index 902112a..a00e148 100644
--- a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
+++ b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
@@ -1,5 +1,5 @@
 MPLINK 4.21, Linker

-Linker Map File - Created Mon May 10 16:52:18 2010

+Linker Map File - Created Mon May 10 17:00:10 2010

 

                                  Section Info

                   Section       Type    Address   Location Size(Bytes)



hooks/post-receive
-- 
krobot