Merge remote-tracking branch 'dima/master'

Author: Dovgalyuk

Diff for: game/BrainF.cpp

@@ -98,23 +98,23 @@
  * */
 struct BrainFProgram
 {
-  const char Prog[160];
+  const char Prog[170];
 };
 
 static const BrainFProgram BrainFPrograms[] PROGMEM = {
   {"New       "},
   {"Hello worl++++++++++[>+++++++>++++++++++>+++>+<<<<-]>++.>+.+++++++..+++.>++.<<+++++++++++++++.>.+++.------.--------.>+.>."},
   {"(+/-)Calcu,>++++++[<-------->-],>++++++[<-------->-],>++++++[<-------->-]<<[>>+>>+<<<<-]>[>+>>-<<<-]<<[>>+<<-]>>[>]>>>>++++++[<<<++++++++>>>-]<<<."},
-  {"(+)Additio,>,[<+>-]<."},
-  {"(-)Subtrac,>,[<->-]<."},
-  {"(*)Multipl,>,<[>[>+>+<<-]>[<+>-]<<-]>>>."},
-  {"(/)Divisio+>,+>,<[<+>>[<<->>->+>]>[<<+>>[<+>-]]<<<<[<]>>-]<-."},
-  {"(/%)Divisi,>,<[<+<<<<+>>>>>-]>[<+<<<<+>>>>>-]<<<+>+[<+>>[<<->>->+>]>[<<+>>[<+>-]]<<<<[<]>>-]<-.[<+>-]<<[>[>+>+<<-]>[<+>-]<<-]>>>[<<<+>>>-]<<[-]<[<->-]<."},
-  {"FibonacciN>+[.[>+>+<<-]>>[<<+>>-]<<<[>>+<<-]>>]"},
-  {"(^)Power  ,>,-[<[>>+>+<<<-]>>>[<<<+>>>-]<<<[>>[>+>+<<-]>>[<<->>+]<<<<-]>-]>[-]>."},
-  {"(^2)Power >+<,[->[->++<]>[-<+>]<<]>."},
-  {"(*)2Multip,>,<[->[->+>+<<]>>[-<<+>>]<<<]>>."},
-  {"(!)Factori,>>>>+<<<<[->+[->+>+<<]>[-<+>]>[->[->+>+<<]>[-<+>]<<]>[-]>>[-<<+>>]<<<<<<]>>>>."}
+  {"(+)Additio,48->,48-[<+>-]<48+."},
+  {"(-)Subtrac,48->,48-[<->-]<48+."},
+  {"(*)Multipl,48->,48-<[>[>+>+<<-]>[<+>-]<<-]>>>48+."},
+  {"(/)Divisio+>,48-+>,48-<[<+>>[<<->>->+>]>[<<+>>[<+>-]]<<<<[<]>>-]<-48+."},
+  {"(/%)Divisi,48->,48-<[<+<<<<+>>>>>-]>[<+<<<<+>>>>>-]<<<+>+[<+>>[<<->>->+>]>[<<+>>[<+>-]]<<<<[<]>>-]<-48+.48-[<+>-]<<[>[>+>+<<-]>[<+>-]<<-]>>>[<<<+>>>-]<<[-]<[<->-]<48+."},
+  {"FibonacciN>+[48+.48-[>+>+<<-]>>[<<+>>-]<<<[>>+<<-]>>]"},
+  {"(^)Power  ,48->,48--[<[>>+>+<<<-]>>>[<<<+>>>-]<<<[>>[>+>+<<-]>>[<<->>+]<<<<-]>-]>[-]>48+."},
+  {"(2^)Power >+<,48-[->[->++<]>[-<+>]<<]>48+."},
+  {"(!)Factori,48->>>>+<<<<[->+[->+>+<<]>[-<+>]>[->[->+>+<<]>[-<+>]<<]>[-]>>[-<<+>>]<<<<<<]>>>>48+."},
+  {"(*)2Multip,48->,48-<[->[->+>+<<]>>[-<<+>>]<<<]>>48+."}
 };
 /*const char *ptr = (const char *)m->menu[page + iter].name;  static const uint8_t const BrainFPrograms1[] PROGMEM = {
   'N','e','w',' ',' ',' ',' ',' ',' ',' '
@@ -421,7 +421,7 @@ static void BrainF_update(unsigned long delta)
         else if (c == ']')
           data->chars[i / 9 / 12 % 6][i  % 12][i / 12 % 9] = 18;
         else
-          data->chars[i / 9 / 12 % 6][i  % 12][i / 12 % 9] = 1;
+          data->chars[i / 9 / 12 % 6][i  % 12][i / 12 % 9] = c-47;
         c = pgm_read_byte(ptr++);
       }