Skip to content

Commit

Permalink
whoopsie, missed a couple of LCD messages. Pattern select, pattern co…
Browse files Browse the repository at this point in the history
…py, and play/stop are all nicer now.

	modified:   arduino_code/beatseqr_arduino_firmware/pattern_select_routine.pde
	modified:   arduino_code/beatseqr_arduino_firmware/transport_button_routine.pde
  • Loading branch information
stevecooley committed Jun 3, 2010
1 parent 323bca5 commit 7bcbf5a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
27 changes: 13 additions & 14 deletions arduino_code/beatseqr_arduino_firmware/pattern_select_routine.pde
Expand Up @@ -23,11 +23,11 @@ void run_pattern_select_routine()
pattern_select_button_pressing_counter++;
if(pattern_select_button_pressing_counter >= 200)
{
lcd.print("?f"); // clear the LCD
// lcd.print("?f"); // clear the LCD
lcd.print("?x00?y0");// move cursor to beginning of line 1
lcd.print("Copy pattern ");
lcd.print("Copy pattrn ");
lcd.print(pattern+1);
lcd.print(" to ... ");
lcd.print(" to");

wait_for_copy_command(pattern);
pattern_select_button_pressing_counter = 0;
Expand All @@ -43,11 +43,9 @@ void run_pattern_select_routine()

if(extended_step_length_mode == 1)
{
lcd.print("?f"); // clear the LCD
// lcd.print("?f"); // clear the LCD
lcd.print("?x00?y0");// move cursor to beginning of line 0
lcd.print("pattern mode:");
lcd.print("?x00?y1");// move cursor to beginning of line 1
lcd.print("single pattern");
lcd.print("single pattern ");
extended_step_length_mode = 0;
pattern_select_leds[0].on();
pattern_select_leds[1].on();
Expand All @@ -66,11 +64,9 @@ void run_pattern_select_routine()
}
else
{
lcd.print("?f"); // clear the LCD
// lcd.print("?f"); // clear the LCD
lcd.print("?x00?y0");// move cursor to beginning of line 0
lcd.print("pattern mode:");
lcd.print("?x00?y1");// move cursor to beginning of line 1
lcd.print("four patterns");
lcd.print("chain patterns ");
extended_step_length_mode = 1;
pattern_select_leds[0].off();
pattern_select_leds[1].off();
Expand Down Expand Up @@ -131,10 +127,11 @@ void go_to_pattern(int pattern, int silent)

if(silent == 0)
{
lcd.print("?f"); // clear the LCD
// lcd.print("?f"); // clear the LCD
lcd.print("?x00?y0");// move cursor to beginning of line 1
lcd.print("pattern ");
lcd.print(pattern_value+1);
lcd.print(" ");
}
for(int voice=0; voice<=7; voice++)
{
Expand Down Expand Up @@ -188,11 +185,12 @@ void wait_for_copy_command(int pattern_to_copy_from)
pattern_select_button_pressing_counter = 0;


lcd.print("?f"); // clear the LCD
// lcd.print("?f"); // clear the LCD
lcd.print("?x00?y0");// move cursor to beginning of line 1
lcd.print("pattern ");
lcd.print(pattern_value+1);

lcd.print(" ");

for(int voice=0; voice<=7; voice++)
{
for(int step=0; step<=15; step++)
Expand Down Expand Up @@ -264,3 +262,4 @@ void wait_for_extended_step_length_command()
}
*/


Expand Up @@ -13,9 +13,9 @@ void run_transport_button_routine()
{
the_serial_message = "ZPL,1;";
serial_printer(the_serial_message);
lcd.print("?f"); // clear the LCD

lcd.print("?x00?y0");// move cursor to beginning of line 0
lcd.print("play");
lcd.print("play ");

// lcd.print("?x00?y1");// move cursor to beginning of line 1
// lcd.print(now);
Expand All @@ -40,9 +40,9 @@ void run_transport_button_routine()

the_serial_message = "ZPL,0;";
serial_printer(the_serial_message);
lcd.print("?f"); // clear the LCD

lcd.print("?x00?y0");// move cursor to beginning of line 0
lcd.print("stop");
lcd.print("stop ");

}
}
Expand Down

0 comments on commit 7bcbf5a

Please sign in to comment.