repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update device name instead of record
[mTask.git]
/
client
/
interface.c
diff --git
a/client/interface.c
b/client/interface.c
index
8106945
..
8afac28
100644
(file)
--- a/
client/interface.c
+++ b/
client/interface.c
@@
-11,17
+11,20
@@
//Globals
bool input_available(void)
{
//Globals
bool input_available(void)
{
+ //return iqGetFullI(&(&SD6)->iqueue)>0;
return iqGetFullI(&(&SD3)->iqueue)>0;
}
uint8_t read_byte(void)
{
return (uint8_t)sdGet(&SD3);
return iqGetFullI(&(&SD3)->iqueue)>0;
}
uint8_t read_byte(void)
{
return (uint8_t)sdGet(&SD3);
+ //return (uint8_t)sdGet(&SD6);
}
void write_byte(uint8_t b)
{
sdPut(&SD3, b);
}
void write_byte(uint8_t b)
{
sdPut(&SD3, b);
+ //sdPut(&SD6, b);
}
uint64_t dpins[] = {LINE_ARD_D0, LINE_ARD_D1, LINE_ARD_D2, LINE_ARD_D3,
}
uint64_t dpins[] = {LINE_ARD_D0, LINE_ARD_D1, LINE_ARD_D2, LINE_ARD_D3,
@@
-35,9
+38,6
@@
void write_dpin(uint8_t i, bool b)
bool read_dpin(uint8_t i)
{
bool read_dpin(uint8_t i)
{
- if(i == 3){
- return palReadLine(LINE_BUTTON) == PAL_HIGH;
- }
return palReadLine(dpins[i]) == PAL_HIGH;
}
return palReadLine(dpins[i]) == PAL_HIGH;
}
@@
-86,6
+86,9
@@
void delay(long ms)
void setup(void)
{
void setup(void)
{
+// palSetPadMode(GPIOG, 9, PAL_MODE_ALTERNATE(8)); // USART6 TX
+// palSetPadMode(GPIOG, 14, PAL_MODE_ALTERNATE(8)); // USART6 RX
+
halInit();
chSysInit();
sdStart(&SD3, NULL);
halInit();
chSysInit();
sdStart(&SD3, NULL);
@@
-93,13
+96,12
@@
void setup(void)
void debug(char *fmt, ...)
{
void debug(char *fmt, ...)
{
-// unsigned int i;
-// write_byte((uint8_t)'m');
-// for(i = 0; i<strlen(fmt); i++){
-// write_byte((uint8_t)fmt[i]);
-// }
-// write_byte('\n');
- (void)fmt;
+ write_byte('m');
+ for(unsigned int i = 0; i<strlen(fmt); i++){
+ write_byte(fmt[i]);
+ }
+ write_byte('\n');
+// (void)fmt;
}
void pdie(char *s)
}
void pdie(char *s)