Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 16:58:48 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

updates review Felix: 05-10-2012

Browse Source
This commit is contained in:
Gerard Toonstra
2012-10-07 11:59:00 -03:00
committed by Felix Ruess
parent 30d0ea0b1a
commit 61f79db1a6
4 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/ezcurrent.xml
+3 -2
View File
@@ -6,8 +6,8 @@
<module name="ezcurrent" dir="sensors">
<doc>
<description>EzOSD Current sensor (I2C)</description>
<define name="EZCURRENT_I2C_DEV" value="i2cX" description="change default i2c peripheral"/>
<description>EzOSD Current sensor (I2C).</description>
<define name="EZCURRENT_I2C_DEV" value="i2c1" description="change default i2c peripheral to i2c1"/>
</doc>
<header>
@@ -19,6 +19,7 @@
<makefile>
<file name="ezcurrent.c"/>
<!-- This disables the standard electrical monitoring system -->
<define name="DISABLE_ELECTRICAL" description="Disable default electrical handling"/>
</makefile>
sw/airborne/firmwares/fixedwing/main_fbw.c
+2 -2
View File
@@ -64,7 +64,7 @@ void init_fbw( void ) {
mcu_init();
#ifndef DISABLE_ELECTRICAL
#if !(DISABLE_ELECTRICAL)
electrical_init();
#endif
@@ -215,7 +215,7 @@ void handle_periodic_tasks_fbw(void) {
if (sys_time_check_and_ack_timer(fbw_periodic_tid))
periodic_task_fbw();
#ifndef DISABLE_ELECTRICAL
#if !(DISABLE_ELECTRICAL)
if (sys_time_check_and_ack_timer(electrical_tid))
electrical_periodic();
#endif
sw/airborne/modules/sensors/ezcurrent.c
+30 -28
View File
@@ -1,8 +1,4 @@
/*
* Driver for the EzOSD Current sensor.
*
* Notes:
* Connect directly to I2C1 port.
/**
*
* Copyright (C) 2012 Gerard Toonstra
*
@@ -24,23 +20,29 @@
* Boston, MA 02111-1307, USA.
*
*/
/**
* @file modules/sensors/ezcurrent.c
* Implementation of driver for the EzOSD Current sensor.
*
* Notes:
* Connect directly to I2C1 port.
*
* Sensor module wire assignments:
* Red wire: 5V
* Black wire: Ground
* DAT: SDA
* CLK: SCL
*/
#include "sensors/ezcurrent.h"
#include "estimator.h"
#include "mcu_periph/i2c.h"
#include "mcu_periph/uart.h"
#include "messages.h"
#include "subsystems/datalink/downlink.h"
#include "subsystems/electrical.h"
#include <math.h>
#define EZCURRENT_ADDR 0xEF
#ifndef ezcurrent_I2C_DEV
#define ezcurrent_I2C_DEV i2c1
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#ifndef EZCURRENT_I2C_DEV
#define EZCURRENT_I2C_DEV i2c1
#endif
struct i2c_transaction ezcurrent_i2c_trans;
@@ -56,22 +58,22 @@ void ezcurrent_init( void ) {
void ezcurrent_read_periodic( void ) {
#ifndef SITL
if (ezcurrent_i2c_trans.status == I2CTransDone) {
I2CReceive(ezcurrent_I2C_DEV, ezcurrent_i2c_trans, ezcurrent_i2c_trans.slave_addr, 10);
I2CReceive(EZCURRENT_I2C_DEV, ezcurrent_i2c_trans, ezcurrent_i2c_trans.slave_addr, 10);
}
#endif //SITL
}
void ezcurrent_read_event( void ) {
if (ezcurrent_i2c_trans.status == I2CTransSuccess) {
// Get electrical information from buffer
electrical.vsupply = ((uint8_t)( (((ezcurrent_i2c_trans.buf[3]) << 8) + (ezcurrent_i2c_trans.buf[2])) * 0.01f) );
electrical.current = ((int32_t)(ezcurrent_i2c_trans.buf[9]) << 8) + (int32_t)(ezcurrent_i2c_trans.buf[8]);
electrical.consumed = ((int32_t)(ezcurrent_i2c_trans.buf[7]) << 8) + (int32_t)(ezcurrent_i2c_trans.buf[6]);
// Transaction has been read
ezcurrent_i2c_trans.status = I2CTransDone;
} else if ( ezcurrent_i2c_trans.status == I2CTransFailed ) {
ezcurrent_i2c_trans.status = I2CTransDone;
// ezcurrent_i2c_trans.slave_addr++;
}
if (ezcurrent_i2c_trans.status == I2CTransSuccess) {
// Get electrical information from buffer
electrical.vsupply = ((uint8_t)( (((ezcurrent_i2c_trans.buf[3]) << 8) + (ezcurrent_i2c_trans.buf[2])) * 0.01f) );
electrical.current = ((int32_t)(ezcurrent_i2c_trans.buf[9]) << 8) + (int32_t)(ezcurrent_i2c_trans.buf[8]);
electrical.consumed = ((int32_t)(ezcurrent_i2c_trans.buf[7]) << 8) + (int32_t)(ezcurrent_i2c_trans.buf[6]);
// Transaction has been read
ezcurrent_i2c_trans.status = I2CTransDone;
} else if ( ezcurrent_i2c_trans.status == I2CTransFailed ) {
ezcurrent_i2c_trans.status = I2CTransDone;
// ezcurrent_i2c_trans.slave_addr++;
}
}
sw/airborne/modules/sensors/ezcurrent.h
+15 -14
View File
@@ -1,14 +1,4 @@
/*
* Driver for the EzOSD Current sensor.
*
* Notes:
* Connect directly to I2C1 port.
*
* Sensor module wire assignments:
* Red wire: 5V
* Black wire: Ground
* DAT: SDA
* CLK: SCL
/**
*
* Copyright (C) 2012 Gerard Toonstra
*
@@ -31,13 +21,24 @@
*
*/
/**
* @file modules/sensors/ezcurrent.c
* Prototypes of driver for the EzOSD Current sensor.
*
* Notes:
* Connect directly to I2C1 port.
*
* Sensor module wire assignments:
* Red wire: 5V
* Black wire: Ground
* DAT: SDA
* CLK: SCL
*/
#ifndef EZCURRENT_H
#define EZCURRENT_H
#include "std.h"
#include "mcu_periph/i2c.h"
extern struct i2c_transaction ezcurrent_i2c_trans;
extern void ezcurrent_init( void );
extern void ezcurrent_read_periodic( void );