Commit from zer0 on branch b_zer0 (2007-03-30 20:04 CEST)
---------------------------------
nothing
aversive modules/base/list/list.h 1.14.4.3
---------------------------------
aversive/modules/base/list/list.h (1.14.4.2 -> 1.14.4.3)
---------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: list.h,v 1.14.4.2 2007-03-21 20:19:15 zer0 Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: list.h,v 1.14.4.3 2007-03-30 18:04:30 zer0 Exp $
*
*/
Commit from tof on branch b_tof (2007-03-30 22:36 CEST)
-------------------------------
coders eirbot updated so they compile !!! oliv, tu peux commiter dans le
main plz?
aversive modules/devices/encoders/encoders_eirbot/encoders_eirbot.c 1.4.2.3
-------------------------------------------------------------------
aversive/modules/devices/encoders/encoders_eirbot/encoders_eirbot.c (1.4.2.2
-> 1.4.2.3)
-------------------------------------------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: encoders_eirbot.c,v 1.4.2.2 2006-11-25 20:22:50 tof Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: encoders_eirbot.c,v 1.4.2.3 2007-03-30 20:36:04 tof Exp $
*
*/
***************
*** 110,116 ****
for(number = 0 ; number < ENCODERS_NUMBER; number ++)
{
!
lu = get_codeur(number); // lecture
res = lu - g_codeur_preced[number]; // calcul diff
g_codeur_preced[number] = lu; // mise a jour ancienne valeur
--- 110,116 ----
for(number = 0 ; number < ENCODERS_NUMBER; number ++)
{
! uint8_t flags;
lu = get_codeur(number); // lecture
res = lu - g_codeur_preced[number]; // calcul diff
g_codeur_preced[number] = lu; // mise a jour ancienne valeur
***************
*** 119,127 ****
nombre_a_ajouter = ((res >> (ENCODERS_DATA_NBBITS - 1))&1) ?
DIFF_DATA_MASK : 0; // si MSb = 1, on prend mask
res = (res & ~DIFF_DATA_MASK) + nombre_a_ajouter; // bits de poids
faibles = donnees, les autres = signe
! IRQ_LOCK();
g_codeur_valeurs[number] += res;
! IRQ_UNLOCK();
}
}
--- 119,128 ----
nombre_a_ajouter = ((res >> (ENCODERS_DATA_NBBITS - 1))&1) ?
DIFF_DATA_MASK : 0; // si MSb = 1, on prend mask
res = (res & ~DIFF_DATA_MASK) + nombre_a_ajouter; // bits de poids
faibles = donnees, les autres = signe
!
! IRQ_LOCK(flags);
g_codeur_valeurs[number] += res;
! IRQ_UNLOCK(flags);
}
}
***************
*** 129,138 ****
encoders encoders_get_value(uint8_t number)
{
encoders value;
!
! IRQ_LOCK();
value = g_codeur_valeurs[number];
! IRQ_UNLOCK();
return value;
}
--- 130,140 ----
encoders encoders_get_value(uint8_t number)
{
encoders value;
! uint8_t flags;
!
! IRQ_LOCK(flags);
value = g_codeur_valeurs[number];
! IRQ_UNLOCK(flags);
return value;
}
Commit from tof on branch b_tof (2007-03-30 23:39 CEST)
-------------------------------
deactivation possible of errors, for code size opt.
aversive modules/debug/error/error.h 1.11.2.3
aversive modules/debug/error/config/error_config.h 1.4.4.3
------------------------------------
aversive/modules/debug/error/error.h (1.11.2.2 -> 1.11.2.3)
------------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.h,v 1.11.2.2 2006-11-25 20:22:49 tof Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.h,v 1.11.2.3 2007-03-30 21:39:34 tof Exp $
*
*/
***************
*** 153,159 ****
} \
} while(0)
!
!
#endif /* _ERROR_H_ */
--- 153,181 ----
} \
} while(0)
! #ifdef ERROR_DISABLE_DEBUG
! #undef DEBUG
! #define DEBUG(num, text, ...) do {} while(0)
! #endif //ERROR_DISABLE_DEBUG
!
! #ifdef ERROR_DISABLE_NOTICE
! #undef NOTICE
! #define NOTICE(num, text, ...) do {} while(0)
! #endif //ERROR_DISABLE_NOTICE
!
! #ifdef ERROR_DISABLE_WARNING
! #undef WARNING
! #define WARNING(num, text, ...) do {} while(0)
! #endif //ERROR_DISABLE_WARNING
!
! #ifdef ERROR_DISABLE_ERROR
! #undef ERROR
! #define ERROR(num, text, ...) do {} while(0)
! #endif //ERROR_DISABLE_ERROR
!
! #ifdef ERROR_DISABLE_EMERG
! #undef EMERG
! #define EMERG(num, text, ...) do {} while(0)
! #endif //ERROR_DISABLE_EMERG
#endif /* _ERROR_H_ */
--------------------------------------------------
aversive/modules/debug/error/config/error_config.h (1.4.4.2 -> 1.4.4.3)
--------------------------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error_config.h,v 1.4.4.2 2006-11-25 20:22:49 tof Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error_config.h,v 1.4.4.3 2007-03-30 21:39:34 tof Exp $
*
*/
***************
*** 28,31 ****
--- 28,39 ----
/** enable the dump of filename and line number */
#define ERROR_DUMP_FILE_LINE
+ /** enable this to deactivate the error macros. this is useful if you want to
optimize code size !!
+ attention : this makes debug macros inoperative !*/
+ //#define ERROR_DISABLE_DEBUG
+ //#define ERROR_DISABLE_NOTICE
+ //#define ERROR_DISABLE_WARNING
+ //#define ERROR_DISABLE_ERROR
+ //#define ERROR_DISABLE_EMERG
+
#endif
Commit from tof on branch b_tof (2007-03-31 00:09 CEST)
-------------------------------
its better like this to avoid confusion : register functions also
deactivated.
aversive modules/debug/error/error.c 1.10.2.3
aversive modules/debug/error/error.h 1.11.2.4
------------------------------------
aversive/modules/debug/error/error.c (1.10.2.2 -> 1.10.2.3)
------------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.c,v 1.10.2.2 2006-11-25 20:22:49 tof Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.c,v 1.10.2.3 2007-03-30 22:09:23 tof Exp $
*
*/
***************
*** 40,46 ****
IRQ_UNLOCK(flags);
}
!
/** Register log function for EMERG level */
void error_register_emerg(void (*f)(struct error *, ...))
{
--- 40,46 ----
IRQ_UNLOCK(flags);
}
! #ifndef ERROR_DISABLE_EMERG
/** Register log function for EMERG level */
void error_register_emerg(void (*f)(struct error *, ...))
{
***************
*** 49,55 ****
--- 49,57 ----
g_error_fct.emerg = f;
IRQ_UNLOCK(flags);
}
+ #endif //ERROR_DISABLE_EMERG
+ #ifndef ERROR_DISABLE_ERROR
/** Register log function for ERROR level */
void error_register_error(void (*f)(struct error *, ...))
{
***************
*** 58,64 ****
--- 60,68 ----
g_error_fct.error = f;
IRQ_UNLOCK(flags);
}
+ #endif //ERROR_DISABLE_ERROR
+ #ifndef ERROR_DISABLE_WARNING
/** Register log function for WARNING level */
void error_register_warning(void (*f)(struct error *, ...))
{
***************
*** 67,73 ****
--- 71,79 ----
g_error_fct.warning = f;
IRQ_UNLOCK(flags);
}
+ #endif //ERROR_DISABLE_WARNING
+ #ifndef ERROR_DISABLE_NOTICE
/** Register log function for NOTICE level */
void error_register_notice(void (*f)(struct error *, ...))
{
***************
*** 76,82 ****
--- 82,90 ----
g_error_fct.notice = f;
IRQ_UNLOCK(flags);
}
+ #endif //ERROR_DISABLE_NOTICE
+ #ifndef ERROR_DISABLE_DEBUG
/** Register log function for DEBUG level */
void error_register_debug(void (*f)(struct error *, ...))
{
***************
*** 85,88 ****
--- 93,97 ----
g_error_fct.debug = f;
IRQ_UNLOCK(flags);
}
+ #endif //ERROR_DISABLE_DEBUG
------------------------------------
aversive/modules/debug/error/error.h (1.11.2.3 -> 1.11.2.4)
------------------------------------
***************
*** 15,21 ****
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.h,v 1.11.2.3 2007-03-30 21:39:34 tof Exp $
*
*/
--- 15,21 ----
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
! * Revision : $Id: error.h,v 1.11.2.4 2007-03-30 22:09:23 tof Exp $
*
*/
***************
*** 79,100 ****
return e;
}
!
/** Register log function for EMERG level */
void error_register_emerg(void (*f)(struct error *, ...));
/** Register log function for ERROR level */
void error_register_error(void (*f)(struct error *, ...));
/** Register log function for WARNING level */
void error_register_warning(void (*f)(struct error *, ...));
/** Register log function for NOTICE level */
void error_register_notice(void (*f)(struct error *, ...));
/** Register log function for DEBUG level */
void error_register_debug(void (*f)(struct error *, ...));
!
--- 79,108 ----
return e;
}
! #ifndef ERROR_DISABLE_EMERG
/** Register log function for EMERG level */
void error_register_emerg(void (*f)(struct error *, ...));
+ #endif //ERROR_DISABLE_EMERG
+ #ifndef ERROR_DISABLE_ERROR
/** Register log function for ERROR level */
void error_register_error(void (*f)(struct error *, ...));
+ #endif //ERROR_DISABLE_ERROR
+ #ifndef ERROR_DISABLE_WARNING
/** Register log function for WARNING level */
void error_register_warning(void (*f)(struct error *, ...));
+ #endif //ERROR_DISABLE_WARNING
+ #ifndef ERROR_DISABLE_NOTICE
/** Register log function for NOTICE level */
void error_register_notice(void (*f)(struct error *, ...));
+ #endif //ERROR_DISABLE_NOTICE
+ #ifndef ERROR_DISABLE_DEBUG
/** Register log function for DEBUG level */
void error_register_debug(void (*f)(struct error *, ...));
! #endif //ERROR_DISABLE_DEBUG
_______________________________________________
Avr-list mailing list
Avr-list@droids-corp.org
CVSWEB : http://cvsweb.droids-corp.org/cgi-bin/viewcvs.cgi/aversive
WIKI : http://wiki.droids-corp.org/index.php/Aversive
DOXYGEN : http://zer0.droids-corp.org/doxygen_aversive/html/
BUGZILLA : http://bugzilla.droids-corp.org
COMMIT LOGS : http://zer0.droids-corp.org/aversive_commitlog
