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

[Xavier L. <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  73a9d3f6a300ae96cc23d523d57126f1885c1fbc (commit)
      from  25db4f2c52fbbb93893caa63239965d6fe4156de (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 73a9d3f6a300ae96cc23d523d57126f1885c1fbc
Author: Xavier Lagorce <Xav...@cr...>
Date:   Tue May 15 02:00:49 2012 +0200

    [Sensor_Actuator] Update switches data

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

Changes:
diff --git a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/main.c b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/main.c
index fc1feda..0ce4d46 100644
--- a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/main.c
+++ b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/main.c
@@ -46,7 +46,7 @@
 #include "switch/switch.h"
 
 PROC_DEFINE_STACK(stack_blinky, KERN_MINSTACKSIZE * 2);
- 
+
 static I2c i2c;
 
 static void init(void)
@@ -88,7 +88,6 @@ static void init(void)
 
     // Initialize the CAN bus processing
     can_processes_init();
-
 }
 
 static void NORETURN blinky_process(void) {
diff --git a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/switch/switch.c b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/switch/switch.c
index 1068008..f2ea524 100644
--- a/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/switch/switch.c
+++ b/elec/boards/Sensor_Actuator/Firmware/sensor_actuator/sensor_actuator/switch/switch.c
@@ -37,10 +37,10 @@ static uint32_t pins[][2] = {
     {GPIOA_BASE, 5},
     {GPIOA_BASE, 6},
     {GPIOA_BASE, 7},
-    {GPIOB_BASE, 5},
-    {GPIOC_BASE, 6},
-    {GPIOC_BASE, 7},
-    {GPIOC_BASE, 8},
+    {GPIOB_BASE, 5}, // Buzzer
+    {GPIOC_BASE, 7}, // Yellow cover-LED
+    {GPIOC_BASE, 8}, // Red cover-LED
+    {GPIOC_BASE, 9}, // Green cover-LED
 };
 
 void switch_init(void) {
@@ -59,15 +59,9 @@ void switch_init(void) {
                         GPIO_MODE_IPU,
                         GPIO_SPEED_50MHZ);
 
-    // Initialize D2_4 PC(9), D2_6 PC(12) as floating inputs
+    // Initialize D2_6 PC(12) as floating inputs
     stm32_gpioPinConfig((struct stm32_gpio *)GPIOC_BASE,
-                        BV(9) | BV(12),
-                        GPIO_MODE_IN_FLOATING,
-                        GPIO_SPEED_50MHZ);
-
-    // Initialize D2_5 PA(8) as floating input
-    stm32_gpioPinConfig((struct stm32_gpio *)GPIOA_BASE,
-                        BV(8),
+                        BV(12),
                         GPIO_MODE_IN_FLOATING,
                         GPIO_SPEED_50MHZ);
 
@@ -83,9 +77,9 @@ void switch_init(void) {
                         GPIO_MODE_OUT_PP,
                         GPIO_SPEED_50MHZ);
 
-    // Initialize D2_1..3 PC(6..8) as output push-pull
+    // Initialize D2_2..4 PC(7..9) as output push-pull
     stm32_gpioPinConfig((struct stm32_gpio *)GPIOC_BASE,
-                        BV(6) | BV(7) | BV(8),
+                        BV(7) | BV(8) | BV(9),
                         GPIO_MODE_OUT_PP,
                         GPIO_SPEED_50MHZ);
 
@@ -95,9 +89,9 @@ void switch_init(void) {
 
 void get_switch_status(switch_status *pkt1, switch_status *pkt2) {
 
-    pkt1->p.sw1 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(4)));
-    pkt1->p.sw2 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(5)));
-    pkt1->p.sw3 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOB_BASE, BV(0)));
+    pkt1->p.sw1 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(4)));   // Start switch
+    pkt1->p.sw2 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(5)));   // Team switch
+    pkt1->p.sw3 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOB_BASE, BV(0)));   // Fault Button
     pkt1->p.sw4 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOB_BASE, BV(1)));
     pkt1->p.sw5 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOB_BASE, BV(12)));
     pkt1->p.sw6 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOB_BASE, BV(15)));
@@ -105,8 +99,8 @@ void get_switch_status(switch_status *pkt1, switch_status *pkt2) {
     pkt2->p.sw1 = 0; //BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(6)));
     pkt2->p.sw2 = 0; //BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(7)));
     pkt2->p.sw3 = 0; //BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(8)));
-    pkt2->p.sw4 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(9)));
-    pkt2->p.sw5 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOA_BASE, BV(8)));
+    pkt2->p.sw4 = 0; //BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(9)));
+    pkt2->p.sw5 = 0; //BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOA_BASE, BV(8)));
     pkt2->p.sw6 = BOOL(stm32_gpioPinRead((struct stm32_gpio *)GPIOC_BASE, BV(12)));
 
 }
@@ -126,7 +120,7 @@ void set_switch(switch_request *pkt) {
 }
 
 void set_buzzer(uint8_t state) {
-    
+
     stm32_gpioPinWrite((struct stm32_gpio *)GPIOB_BASE, BV(5), state);
 }
 


hooks/post-receive
-- 
krobot