Merge from triface project.

[bertos.git] / app / triface / triface.c

diff --git a/app/triface/triface.c b/app/triface/triface.c
old mode 100755 (executable)
new mode 100644 (file)
index 732e0c3..00c1a58
--- a/app/triface/triface.c
+++ b/app/triface/triface.c
@@ -1,8 +1,34 @@
 /**
  * \file
  * <!--
- * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ *
  * -->
  *
  * \version $Id$
@@ -13,40 +39,45 @@
  * \brief Windowing system test.
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.4  2006/06/14 00:28:52  marco
- *#* Removed initial delay.
- *#*
- *#* Revision 1.3  2006/06/12 21:37:02  marco
- *#* implemented some commands (ver and sleep)
- *#*
- *#* Revision 1.2  2006/06/01 12:29:21  marco
- *#* Add first simple protocol command (version request).
- *#*
- *#* Revision 1.1  2006/05/18 00:41:47  bernie
- *#* New triface devlib application.
- *#*
- *#*/
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
 #include <drv/ser.h>
 #include <cfg/macros.h>
 #include <mware/parser.h>
+#include <net/keytag.h>
+#include <drv/sipo.h>
 
 #include "protocol.h"
+#include "hw_input.h"
+#include "hw_adc.h"
 
 int main(void)
 {
+       /* SPI Port Initialization */
+       sipo_init();
+
        kdbg_init();
        timer_init();
-//     buz_init();
+       adc_init();
+       buz_init();
 
        IRQ_ENABLE;
+       INPUT_INIT;
+
+       /* Initialize Tag serial port and data structure */
+       TagPacket pkt;
+
+       /* Open the main communication port */
+       Serial *host_port = ser_open(CONFIG_SER_HOSTPORT);
+       ser_setbaudrate(host_port, CONFIG_SER_HOSTPORTBAUDRATE);
+
+       pkt.tag_ser = ser_open(TAG_SER_PORT);
+       ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
+       pkt.comm_ser = host_port;
+       keytag_init(&pkt);
+
 
-       Serial *host_port = ser_open(0);
-       ser_setbaudrate(host_port, 38400);
 
        protocol_init(host_port);
 
@@ -54,6 +85,7 @@ int main(void)
        for(;;)
        {
                protocol_run(host_port);
+               keytag_poll(&pkt);
        }
 
        return 0;