# SVN changeset patch
# User aaguilar
# Date 2014-12-28 16:53:37.786165
# Revision 177

te_structs.h   se cambio de directorio de util a timeEngine

Index: trunk/firmware/sources/saigd/timeEngine/libnmea++/parse/nmea_defs.h
===================================================================
diff --git a/trunk/firmware/sources/saigd/timeEngine/libnmea++/parse/nmea_defs.h b/trunk/firmware/sources/saigd/timeEngine/libnmea++/parse/nmea_defs.h
--- a/trunk/firmware/sources/saigd/timeEngine/libnmea++/parse/nmea_defs.h	(revision 176)
+++ b/trunk/firmware/sources/saigd/timeEngine/libnmea++/parse/nmea_defs.h	(revision 177)
@@ -15,18 +15,6 @@
 #include <map>
 #include <string>
 
-#define GPNON  0x0000 /**< Unknown packet type. */
-#define GPGGA  0x0001 /**< GGA - Essential fix data which provide 3D location and accuracy data. */
-#define GPGSA  0x0002 /**< GSA - GPS receiver operating mode, SVs used for navigation, and DOP values. */
-#define GPGSV  0x0004 /**< GSV - Number of SVs in view, PRN numbers, elevation, azimuth & SNR values. */
-#define GPRMC  0x0008 /**< RMC - Recommended Minimum Specific GPS/TRANSIT Data. */
-#define GPVTG  0x0010 /**< VTG - Actual track made good and speed over ground. */
-#define GPALM  0x0020
-#define GPGLL  0x0040
-#define PGRMI  0x0080
-#define PGRMC  0x0100
-#define PGRMC1 0x0200
-#define PGRMO  0x0400
 
 typedef int (*pnmea_parse)(nmea_code*, gnss_info*);
 typedef std::map<std::string, pnmea_parse> code;
Index: trunk/firmware/sources/saigd/timeEngine/te_structs.h
===================================================================
diff --git a/trunk/firmware/sources/saigd/timeEngine/te_structs.h b/trunk/firmware/sources/saigd/timeEngine/te_structs.h
new file mode 10644
--- /dev/null	(revision 0)
+++ b/trunk/firmware/sources/saigd/timeEngine/te_structs.h	(revision 177)
@@ -0,0 +1,149 @@
+/*
+ * te_defs.h
+ *
+ *  Created on: Nov 4, 2014
+ *      Author: Alan Aguilar Sologuren
+ */
+
+#ifndef UTILS_TE_STRUCTS_H_
+#define UTILS_TE_STRUCTS_H_
+
+#include <stdint.h>
+
+/*mascaras disponibles para GPS 15xL*/
+#define GPNON  0x0000 /**< Unknown packet type. */
+#define GPGGA  0x0001 /**< GGA - Essential fix data which provide 3D location and accuracy data. */
+#define GPGSA  0x0002 /**< GSA - GPS receiver operating mode, SVs used for navigation, and DOP values. */
+#define GPGSV  0x0004 /**< GSV - Number of SVs in view, PRN numbers, elevation, azimuth & SNR values. */
+#define GPRMC  0x0008 /**< RMC - Recommended Minimum Specific GPS/TRANSIT Data. */
+#define GPVTG  0x0010 /**< VTG - Actual track made good and speed over ground. */
+#define GPALM  0x0020
+#define GPGLL  0x0040
+#define PGRMI  0x0080
+#define PGRMC  0x0100
+#define PGRMC1 0x0200
+#define PGRMO  0x0400
+
+///////////////////////////////////////////////////////////////////////////////
+// ESTRUCTURAS PARA MODULO DE CONTROL DE RECEPTOR GNSS (GPS-15xL)
+///////////////////////////////////////////////////////////////////////////////
+
+/*!
+ *
+ */
+typedef struct gnss_config_struct_{
+	uint8_t baudrate;
+	uint16_t nmea_mask;
+}gnss_config_struct;
+
+/*!
+ * \struct gnss_precise_time
+ * \brief Estructura de tiempo de GNSS para almacenar tiempo preciso.
+ * Almacena tiempo con resolucion de microsegundos.
+ */
+typedef struct gnss_precise_time_{
+	int year;  /*!< Ahno de la data adquirida */
+	int doy;   /*!< Dia del ahno de la data adqirida */
+	int hour;  /*!< Hora de la data adquirida */
+	int minu;  /*!< Minutos de la data adquirida */
+	int sec;   /*!< Segundos de la data adquirida */
+	int usec;  /*!< Microsegndos de la data adquirida */
+	gnss_precise_time_(): year(0), doy(0), hour(0), minu(0), sec(0), usec(0){}
+}gnss_precise_time;
+
+///////////////////////////////////////////////////////////////////////////////
+// ESTRUCTURAS PARA EL MODULO DE CONTROL DEL GENERADOR DE CLOCK
+///////////////////////////////////////////////////////////////////////////////
+
+/*!
+ *
+ */
+typedef struct clock_config_struct_{
+
+}clock_config_struct;
+
+/*!
+ *
+ */
+typedef struct clock_state_struct_{
+
+}clock_state_struct;
+
+///////////////////////////////////////////////////////////////////////////////
+// ESTRUCTURAS PARA MODULO DE CONTROL DE RTC
+///////////////////////////////////////////////////////////////////////////////
+
+/*!
+ * \struct ds1308_ctl_byte
+ * \brief  Estructura para almacenar informacion de configuracion para
+ * el registro con direccion DS1308_CTL_ADD (0x07) del DS1308.
+ */
+typedef struct ds1308_ctl_byte_ {
+	uint8_t rs0:1;
+	uint8_t rs1:1;
+	uint8_t bbclk:1;
+	uint8_t los:1;
+	uint8_t sqwe:1;
+	uint8_t osf:1;
+	uint8_t eclk:1;
+	uint8_t out:1;
+	ds1308_ctl_byte_(): rs0(0), rs1(0), bbclk(0), los(0), sqwe(0),
+			osf(0), eclk(1), out(0){}
+}ds1308_ctl_byte;
+
+/*!
+ * \struct ds1308_clock_halt
+ * \brief  Estructura para configurar el arranque o parada de funciones
+ * timekeeping del DS1308
+ */
+typedef struct ds1308_clock_halt_ {
+	uint8_t dummy_dont_use:7;
+	uint8_t ch:1;
+	ds1308_clock_halt_(): dummy_dont_use(0), ch(0){}
+}ds1308_clock_halt;
+
+/*!
+ * \struct rtc_config_struct
+ * \brief Almacena toda la informmacion necesaria para configurar el IC
+ * DS1308.
+ */
+typedef struct rtc_config_struct_{
+	ds1308_clock_halt  clk_halt;
+	ds1308_ctl_byte    ctl_byte;
+}rtc_config_struct;
+
+///////////////////////////////////////////////////////////////////////////////
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*!
+ *
+ */
+typedef struct te_status_struct_{
+
+}te_status_struct;
+
+/*!
+ *
+ */
+typedef struct te_time_pkg_{
+	gnss_precise_time time; /*!< Tiempo de adquisicion de un PPS de GNSS
+	                             especifico */
+	uint16_t pps_serial;    /*!< Numero serial de un PPS desde que la linea de
+	                            enganche GNSS (LOCK) fue activada (max 1800) */
+	bool is_gnss_time;      /*!< true si el tiempo dado proviene del un
+	 	 	 	 	 	 	 	 receptor GNSS */
+	gnss_precise_time * pnext;    /*!< Apunta al siguiente paquete de tiempo */
+	gnss_precise_time * previous; /*!< Apunta al paquete de tempo anterior. */
+	te_time_pkg_(): pps_serial(0), is_gnss_time(false), pnext(0), previous(0){}
+}te_time_pkg;
+
+/*!
+ *
+ */
+typedef struct te_command_struct_{
+
+}te_command_struct;
+
+
+#endif /* UTILS_TE_STRUCTS_H_ */
Index: trunk/firmware/sources/saigd/utils/te_structs.h
===================================================================
diff --git a/trunk/firmware/sources/saigd/utils/te_structs.h b/trunk/firmware/sources/saigd/utils/te_structs.h
deleted file mode 10644
--- a/trunk/firmware/sources/saigd/utils/te_structs.h	(revision 176)
+++ /dev/null	(revision 177)
@@ -1,134 +0,0 @@
-/*
- * te_defs.h
- *
- *  Created on: Nov 4, 2014
- *      Author: Alan Aguilar Sologuren
- */
-
-#ifndef UTILS_TE_STRUCTS_H_
-#define UTILS_TE_STRUCTS_H_
-
-#include <inttypes.h>
-
-///////////////////////////////////////////////////////////////////////////////
-// ESTRUCTURAS PARA MODULO DE CONTROL DE RECEPTOR GNSS (GPS-15xL)
-///////////////////////////////////////////////////////////////////////////////
-
-/*!
- *
- */
-typedef struct gnss_config_struct_{
-
-}gnss_config_struct;
-
-/*!
- * \struct gnss_precise_time
- * \brief Estructura de tiempo de GNSS para almacenar tiempo preciso.
- * Almacena tiempo con resolucion de microsegundos.
- */
-typedef struct gnss_precise_time_{
-	int year;  /*!< Ahno de la data adquirida */
-	int doy;   /*!< Dia del ahno de la data adqirida */
-	int hour;  /*!< Hora de la data adquirida */
-	int minu;  /*!< Minutos de la data adquirida */
-	int sec;   /*!< Segundos de la data adquirida */
-	int usec;  /*!< Microsegndos de la data adquirida */
-	gnss_precise_time_(): year(0), doy(0), hour(0), minu(0), sec(0), usec(0){}
-}gnss_precise_time;
-
-///////////////////////////////////////////////////////////////////////////////
-// ESTRUCTURAS PARA EL MODULO DE CONTROL DEL GENERADOR DE CLOCK
-///////////////////////////////////////////////////////////////////////////////
-
-/*!
- *
- */
-typedef struct clock_config_struct_{
-
-}clock_config_struct;
-
-/*!
- *
- */
-typedef struct clock_state_struct_{
-
-}clock_state_struct;
-
-///////////////////////////////////////////////////////////////////////////////
-// ESTRUCTURAS PARA MODULO DE CONTROL DE RTC
-///////////////////////////////////////////////////////////////////////////////
-
-/*!
- * \struct ds1308_ctl_byte
- * \brief  Estructura para almacenar informacion de configuracion para
- * el registro con direccion DS1308_CTL_ADD (0x07) del DS1308.
- */
-typedef struct ds1308_ctl_byte_ {
-	uint8_t rs0:1;
-	uint8_t rs1:1;
-	uint8_t bbclk:1;
-	uint8_t los:1;
-	uint8_t sqwe:1;
-	uint8_t osf:1;
-	uint8_t eclk:1;
-	uint8_t out:1;
-	ds1308_ctl_byte_(): rs0(0), rs1(0), bbclk(0), los(0), sqwe(0),
-			osf(0), eclk(1), out(0){}
-}ds1308_ctl_byte;
-
-/*!
- * \struct ds1308_clock_halt
- * \brief  Estructura para configurar el arranque o parada de funciones
- * timekeeping del DS1308
- */
-typedef struct ds1308_clock_halt_ {
-	uint8_t dummy_dont_use:7;
-	uint8_t ch:1;
-	ds1308_clock_halt_(): dummy_dont_use(0), ch(0){}
-}ds1308_clock_halt;
-
-/*!
- * \struct rtc_config_struct
- * \brief Almacena toda la informmacion necesaria para configurar el IC
- * DS1308.
- */
-typedef struct rtc_config_struct_{
-	ds1308_clock_halt  clk_halt;
-	ds1308_ctl_byte    ctl_byte;
-}rtc_config_struct;
-
-///////////////////////////////////////////////////////////////////////////////
-//
-///////////////////////////////////////////////////////////////////////////////
-
-/*!
- *
- */
-typedef struct te_status_struct_{
-
-}te_status_struct;
-
-/*!
- *
- */
-typedef struct te_time_pkg_{
-	gnss_precise_time time; /*!< Tiempo de adquisicion de un PPS de GNSS
-	                             especifico */
-	uint16_t pps_serial;    /*!< Numero serial de un PPS desde que la linea de
-	                            enganche GNSS (LOCK) fue activada (max 1800) */
-	bool is_gnss_time;      /*!< true si el tiempo dado proviene del un
-	 	 	 	 	 	 	 	 receptor GNSS */
-	gnss_precise_time * pnext;    /*!< Apunta al siguiente paquete de tiempo */
-	gnss_precise_time * previous; /*!< Apunta al paquete de tempo anterior. */
-	te_time_pkg_(): pps_serial(0), is_gnss_time(false), pnext(0), previous(0){}
-}te_time_pkg;
-
-/*!
- *
- */
-typedef struct te_command_struct_{
-
-}te_command_struct;
-
-
-#endif /* UTILS_TE_STRUCTS_H_ */