@ -9,6 +9,12 @@ int main(int argc, char *argv[])
{
uint8_t i = 0 ;
uint8_t a = ' 0 ' ;
< < < < < < < HEAD
= = = = = = =
bool latch = false ;
bool latch_old = false ;
stmStart ( ) ;
> > > > > > > 5e93624 b4fad253de63e72bcd0e6f45ef3994daf
setupInit ( ) ;
@ -46,17 +52,28 @@ int main(int argc, char *argv[])
//USART will rteturn what wou type and trun led on if you press "1"
a = usartGetChar ( usart2 ) ;
usartSendChar ( usart2 , a ) ;
if ( a = = ' 1 ' )
{
if ( a = = ' 1 ' ) {
pinWrite ( pinB3 , 1 ) ;
} else if ( a = = ' 0 ' ) {
pinWrite ( pinB3 , 0 ) ;
}
/*
if ( a = = ' 1 ' & & latch ! = latch_old )
{
pinToggle ( pinB3 ) ;
//pinWrite(pinB3,1);
}
else
{
pinWrite ( pinB3 , 0 ) ;
}
*/
/*
//test if the gpio port works as an input
if ( pinRead ( pinA0 ) )
if ( pinRead ( pinA0 ) & & ! latch_old )
{
pinWrite ( pinB3 , 1 ) ;
}
@ -64,7 +81,12 @@ int main(int argc, char *argv[])
{
pinWrite ( pinB3 , 0 ) ;
}
< < < < < < < HEAD
delayMs ( 100 ) ;
= = = = = = =
*/
// delayMs(100);
> > > > > > > 5e93624 b4fad253de63e72bcd0e6f45ef3994daf
}
return 1 ;
}