diff --git a/lcd_hept/arduinolib.c b/lcd_hept/arduinolib.c index 357a6eb..8f7d3a8 100644 --- a/lcd_hept/arduinolib.c +++ b/lcd_hept/arduinolib.c @@ -134,7 +134,7 @@ void Arduinolib__lcd_string_step(uint8_t lstring[], int line, Arduinolib__lcd_st } /* gice a number to display to the LCD */ -void Arduinolib__lcd_int_step(uint8_t numb, int line, Arduinolib__lcd_int_out *out){ +void Arduinolib__lcd_int_step(int numb, int line, Arduinolib__lcd_int_out *out){ char lstring[80]; //buffer itoa(numb, lstring, 10); Arduinolib__lcd_string_out *o; diff --git a/lcd_hept/arduinolib.epi b/lcd_hept/arduinolib.epi index 8f86a7f..0ea0c63 100644 --- a/lcd_hept/arduinolib.epi +++ b/lcd_hept/arduinolib.epi @@ -5,6 +5,6 @@ fun lcd_write(info:uint8_t) returns () fun lcd_cmd(cmd:uint8_t) returns () fun lcd_char(char_data:uint8_t) returns () fun lcd_string (lstring:string; line:int) returns () -fun lcd_int (numb:uint8_t; line:int) returns () +fun lcd_int (numb:int; line:int) returns () fun dread(buttonpin: int) returns (v : int) fun dwrite(p:int; v:int) returns () \ No newline at end of file diff --git a/lcd_hept/arduinolib_types.h b/lcd_hept/arduinolib_types.h index 8f2c4fa..3b41cb6 100644 --- a/lcd_hept/arduinolib_types.h +++ b/lcd_hept/arduinolib_types.h @@ -36,7 +36,7 @@ void Arduinolib__lcd_char_step(uint8_t char_data, Arduinolib__lcd_char_out *o); void Arduinolib__lcd_string_step(uint8_t lstring[], int line, Arduinolib__lcd_string_out *o); -void Arduinolib__lcd_int_step(uint8_t numb, int line, Arduinolib__lcd_int_out *o); +void Arduinolib__lcd_int_step(int numb, int line, Arduinolib__lcd_int_out *o); void Arduinolib__dread_step(int p, Arduinolib__dread_out *out); diff --git a/lcd_hept/prog.ept b/lcd_hept/prog.ept index a509b25..273fa6d 100644 --- a/lcd_hept/prog.ept +++ b/lcd_hept/prog.ept @@ -24,16 +24,17 @@ let () = lcd_int(count/period, line); tel -node button (bpin, ledpin : int) returns () +node lcd_button_counter (bpin, period, line : int) returns () var value : int; + count : int; i : int; let - i = 0 fby (i+1); - value = dread(bpin); - () = dwrite((ledpin, value)); + i = 0 fby (i+1); + value = dread(bpin); + count = 0 fby (count + value); + () = lcd_int(count/period, line); tel - node main() returns () var start : bool; let @@ -41,7 +42,6 @@ let () = lcd_init() when start; () = lcd_blink_msg ((750, 375, "hello world!", 0) when not start); - () = lcd_counter ((375, 1) when not start); - () = button((8, 13) when not start); + () = lcd_button_counter((8, 50, 1) when not start); tel