projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from BeRTOS. Reformat. Clean up.
[bertos.git]
/
app
/
triface
/
triface.c
diff --git
a/app/triface/triface.c
b/app/triface/triface.c
index eb47d8fad0f5c67f77c31de895c0d67ff506b62b..270619bcc666f8dd5d7b21e00c655e0c58609d49 100644
(file)
--- a/
app/triface/triface.c
+++ b/
app/triface/triface.c
@@
-41,18
+41,21
@@
*/
*/
+#include "protocol.h"
+#include "hw/hw_input.h"
+#include "hw/hw_adc.h"
+#include "cfg/cfg_ser.h"
+
+#include <cfg/macros.h>
+
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/ser.h>
#include <drv/sipo.h>
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/ser.h>
#include <drv/sipo.h>
-#include <cfg/macros.h>
#include <mware/parser.h>
#include <net/keytag.h>
#include <mware/parser.h>
#include <net/keytag.h>
-#include "protocol.h"
-#include "hw_input.h"
-#include "hw_adc.h"
static KFileSerial fd_ser;
static KFileSerial fd_ser;
@@
-74,8
+77,8
@@
int main(void)
TagPacket pkt;
/* Open the main communication port */
TagPacket pkt;
/* Open the main communication port */
- ser_init(&fd_ser, CONFIG_
SER_HOST
PORT);
- ser_setbaudrate(&fd_ser, CONFIG_
SER_HOSTPORT
BAUDRATE);
+ ser_init(&fd_ser, CONFIG_
TRIFACE_
PORT);
+ ser_setbaudrate(&fd_ser, CONFIG_
TRIFACE_
BAUDRATE);
ser_init(pkt.tag_ser, TAG_SER_PORT);
ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);
ser_init(pkt.tag_ser, TAG_SER_PORT);
ser_setbaudrate(pkt.tag_ser, TAG_SER_BAUDRATE);