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

[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  7e6d41bbb5241359357c38cde937501c361fc3d0 (commit)
       via  19eb7b0de211b1fa52109356e607bc510f7a567e (commit)
      from  6ce1124621e474f08558dac8d8f526973716bb9c (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 7e6d41bbb5241359357c38cde937501c361fc3d0
Author: Xavier Lagorce <Xav...@cr...>
Date:   Thu Mar 17 00:26:01 2011 +0100

    [Controller_Motor_STM32] More realistic CAN monitor

commit 19eb7b0de211b1fa52109356e607bc510f7a567e
Author: Xavier Lagorce <Xav...@cr...>
Date:   Thu Mar 17 00:24:17 2011 +0100

    [Controller_Motor_STM32] Increased kernel stack to allow more processes

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

Changes:
diff --git a/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/can_monitor.c b/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/can_monitor.c
index ccbd670..a7369a2 100644
--- a/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/can_monitor.c
+++ b/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/can_monitor.c
@@ -31,7 +31,7 @@ void canMonitorInit(void) {
 
   // Configure CAN driver
   cfg.mcr = CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP;
-  cfg.btr = CAN_BTR_SJW(0) | CAN_BTR_TS1(8) | CAN_BTR_TS2(1) | CAN_BTR_BRP(6);// | CAN_BTR_LBKM; // Add LBKM for loopback mode
+  cfg.btr = CAN_BTR_SJW(0) | CAN_BTR_TS1(8) | CAN_BTR_TS2(1) | CAN_BTR_BRP(6);
   cfg.n_filters = 0;
   cfg.filters = NULL;
 
@@ -55,7 +55,7 @@ static void NORETURN canMonitor_process(void) {
   txm.ide = 1;
   txm.sid = 0;
 
-  timer_setDelay(&timer_can, ms_to_ticks(1000));
+  timer_setDelay(&timer_can, ms_to_ticks(10));
   timer_setEvent(&timer_can);
   while(1) {
 
@@ -85,14 +85,6 @@ static void NORETURN canMonitor_process(void) {
 
     // Wait for the next transmission timer
     timer_waitEvent(&timer_can);
-    // blink !
-    if (ind == 0) {
-      LED2_OFF();
-      ind = 1;
-    } else {
-      LED2_ON();
-      ind = 0;
-    }
   }
 }
 
diff --git a/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/cfg/cfg_proc.h b/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/cfg/cfg_proc.h
index 5e521e8..382e0d4 100644
--- a/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/cfg/cfg_proc.h
+++ b/elec/boards/Controller_Motor_STM32/Firmware/controller_motor_stm32/cfg/cfg_proc.h
@@ -86,7 +86,7 @@
  * $WIZ$ type = "int"
  * $WIZ$ min = 0
  */
-#define CONFIG_KERN_HEAP_SIZE 2048L
+#define CONFIG_KERN_HEAP_SIZE 4096L
 
 /**
  * Module logging level.


hooks/post-receive
-- 
krobot