summaryrefslogtreecommitdiff
path: root/n/es-2006/src/main.c
diff options
context:
space:
mode:
authordufourj2006-05-03 17:22:36 +0000
committerdufourj2006-05-03 17:22:36 +0000
commit0f1dec71f0581546e6afc0d3e0f991968059b174 (patch)
tree30dfcb1ff74cc65ca8e544c21712fe39d269f593 /n/es-2006/src/main.c
parent82a13c07d0a08cbb33ac7e073c32ee5e56786d62 (diff)
ES :
- amélioration de la gestion des capteurs rvb ; - meilleur nomage des fonctions ; - gestion de l'overflow. TODO : - à tester sur AVR ; - fonction de debug pour surveiller qu'un capteur ; - regarder la solution pour les stats par capteurs.
Diffstat (limited to 'n/es-2006/src/main.c')
-rw-r--r--n/es-2006/src/main.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/n/es-2006/src/main.c b/n/es-2006/src/main.c
index dc4f14f..a269dfe 100644
--- a/n/es-2006/src/main.c
+++ b/n/es-2006/src/main.c
@@ -29,13 +29,13 @@
#include "modules/proto/proto.h"
#include "modules/utils/utils.h"
-#include "timer.h"
-#include "rvb_sensor.h"
+#include "timer.h" /* main timer */
+#include "sensor_rvb.h" /* RVB sensors management */
/* Statistics for sensors */
-uint8_t rvb_sensors_stats = 0;
-uint8_t rvb_sensors_stats_enable = 0;
+uint8_t sensor_rvb_stat_enable = 0;
+uint8_t sensor_rvb_stats = 0;
/** Call when we receive some data from proto (uart) */
void
@@ -50,10 +50,10 @@ proto_callback (uint8_t cmd, uint8_t size, uint8_t *args)
utils_reset ();
break;
case c ('S', 1):
- rvb_sensors_stats = rvb_sensors_stats_enable = args[0];
+ sensor_rvb_stats = sensor_rvb_stat_enable = args[0];
break;
case c ('s', 2):
- rvb_sensor_watch (args[0], args[1]);
+ sensor_rvb_watch (args[0], args[1]);
break;
/* Unknown command */
default:
@@ -68,23 +68,26 @@ proto_callback (uint8_t cmd, uint8_t size, uint8_t *args)
int
main (void)
{
+ int compt;
+
uart0_init ();
timer_init ();
- rvb_sensors_init ();
+ sensor_rvb_init ();
sei ();
proto_send0 ('z');
while (1)
{
timer_wait ();
- if (rvb_sensors_stats_enable && !--rvb_sensors_stats)
+ if (sensor_rvb_stat_enable && !--sensor_rvb_stats)
{
- rvb_sensors_stats = rvb_sensors_stats_enable;
- proto_send4w ('S', rvb_sensors_values[7][0],
- rvb_sensors_values[7][1], rvb_sensors_values[7][2],
- rvb_sensors_values[7][3]);
+ sensor_rvb_stats = sensor_rvb_stat_enable;
+ for (compt = 0; compt < RVB_MAX_SENSOR; compt++)
+ proto_send4w ('S', sensor_rvb_values[compt][0],
+ sensor_rvb_values[compt][1], sensor_rvb_values[compt][2],
+ sensor_rvb_values[compt][3]);
}
- rvb_sensors_start_update ();
+ sensor_rvb_start_capture ();
while (uart0_poll ())
proto_accept (uart0_getc ());
}