<p>roox has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19489">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Adjusted coding style.<br><br>Change-Id: I9b5250579290b6eb1e33d446e9fc7d2c082c4002<br>---<br>M src/target/firmware/apps/snake_game/main.c<br>1 file changed, 191 insertions(+), 105 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/19489/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/apps/snake_game/main.c b/src/target/firmware/apps/snake_game/main.c</span><br><span>index 98a5b34..d9748f7 100644</span><br><span>--- a/src/target/firmware/apps/snake_game/main.c</span><br><span>+++ b/src/target/firmware/apps/snake_game/main.c</span><br><span>@@ -20,7 +20,6 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <stdio.h></span><br><span> #include <string.h></span><br><span> </span><br><span>@@ -50,11 +49,14 @@</span><br><span> </span><br><span> unsigned long next = 1;</span><br><span> /* This is not a good random number generator ... */</span><br><span style="color: hsl(0, 100%, 40%);">-int rand(void) {</span><br><span style="color: hsl(120, 100%, 40%);">+int rand(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> next = next * 110351 + 12;</span><br><span> return (unsigned int)(next & 0x7fff);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-void srand(unsigned int seed) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void srand(unsigned int seed)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> next = seed;</span><br><span> }</span><br><span> </span><br><span>@@ -66,7 +68,7 @@</span><br><span> #define SBODY 20</span><br><span> /* The numbers above 20 are the distance to the head.</span><br><span> * 21 is direly behind the head.</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> #define STDLEN 3</span><br><span> #define HEIGHT 7</span><br><span> #define WIDTH 16</span><br><span>@@ -81,19 +83,22 @@</span><br><span> </span><br><span> uint8_t field[WIDTH][HEIGHT];</span><br><span> int16_t score = 0, lenght = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-enum errors { ALLRIGHT, SNAKE_COL, } err;</span><br><span style="color: hsl(120, 100%, 40%);">+enum errors { ALLRIGHT, SNAKE_COL } err;</span><br><span> </span><br><span> void printField();</span><br><span> void setItem(int, int, int);</span><br><span> void movepos(char);</span><br><span> void increaseBodyAge();</span><br><span style="color: hsl(0, 100%, 40%);">-void setFood() {</span><br><span style="color: hsl(120, 100%, 40%);">+void setFood()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> int x, y, c;</span><br><span style="color: hsl(0, 100%, 40%);">- for (c = 0; c < 10;c++) {</span><br><span style="color: hsl(0, 100%, 40%);">- x = rand() % (WIDTH -1);</span><br><span style="color: hsl(0, 100%, 40%);">- y = rand() % (HEIGHT -1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) printf("Next %u\n", next);</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) printf("Rand (%d|%d)\n", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (c = 0; c < 10; c++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ x = rand() % (WIDTH - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ y = rand() % (HEIGHT - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Next %u\n", next);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Rand (%d|%d)\n", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> if (field[x][y] == BLANK) {</span><br><span> field[x][y] = FOOD;</span><br><span> return;</span><br><span>@@ -103,7 +108,10 @@</span><br><span> for (y = 0; y < HEIGHT; y++) {</span><br><span> if (field[x][y] == BLANK) {</span><br><span> field[x][y] = FOOD;</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) printf("Set without rand (%d|%d) %d\n", x, y, c);</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Set without rand (%d|%d) %d\n", x, y,</span><br><span style="color: hsl(120, 100%, 40%);">+ c);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span>@@ -113,127 +121,172 @@</span><br><span> static void print_snake_str(char *text, int16_t x, int16_t y)</span><br><span> {</span><br><span> x = 6 * x;</span><br><span style="color: hsl(0, 100%, 40%);">- y = 8 * (y+1) -3;</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 1) printf("Put string %s to (%d|%d)\n", text, x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ y = 8 * (y + 1) - 3;</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 1</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Put string %s to (%d|%d)\n", text, x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> fb_gotoxy(x, y);</span><br><span> fb_putstr(text, framebuffer->width);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> char Move;</span><br><span style="color: hsl(0, 100%, 40%);">-void movepos(char move) {</span><br><span style="color: hsl(120, 100%, 40%);">+void movepos(char move)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> Move = move;</span><br><span> setItem(pos.x, pos.y, SBODY);</span><br><span> switch (move) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'h': pos.x--;break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'j': pos.y++;break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'k': pos.y--;break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'l': pos.x++;break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'h': pos.x--; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'j': pos.y++; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'k': pos.y--; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'l': pos.x++; break;</span><br><span> }</span><br><span> switch (move) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'j': case 'k':</span><br><span style="color: hsl(0, 100%, 40%);">- if (pos.y == -1) pos.y = HEIGHT -1;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (pos.y == HEIGHT) pos.y = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- increaseBodyAge();</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'l': case 'h':</span><br><span style="color: hsl(0, 100%, 40%);">- if (pos.x == -1) pos.x = WIDTH -1;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (pos.x == WIDTH) pos.x = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- increaseBodyAge();</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'j':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'k':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pos.y == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.y = HEIGHT - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (pos.y == HEIGHT)</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.y = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ increaseBodyAge();</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'l':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'h':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pos.x == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.x = WIDTH - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (pos.x == WIDTH)</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.x = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ increaseBodyAge();</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> setItem(pos.x, pos.y, HEAD);</span><br><span> printField();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-void movepos_timer_cb(void *p) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list *tmr = (struct osmo_timer_list*)p;</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) printf("Auto move %c\n", Move);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void movepos_timer_cb(void *p)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list *tmr = (struct osmo_timer_list *)p;</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Auto move %c\n", Move);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> movepos(Move);</span><br><span> </span><br><span> osmo_timer_schedule(tmr, WAIT_TIME_AUTOMOVE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_timer_list move_snake_timer = {</span><br><span> .cb = &movepos_timer_cb,</span><br><span> .data = &move_snake_timer</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-void movepos_keypress(char keypress) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void movepos_keypress(char keypress)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> Move = keypress;</span><br><span> osmo_timer_schedule(&move_snake_timer, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void increaseBodyAge() {</span><br><span style="color: hsl(120, 100%, 40%);">+void increaseBodyAge()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> int y, x;</span><br><span> lenght = SBODY + STDLEN + score;</span><br><span> for (x = 0; x < WIDTH; x++) {</span><br><span> for (y = 0; y < HEIGHT; y++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (field[x][y] >= lenght) field[x][y] = BLANK;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (field[x][y] >= SBODY) field[x][y]++;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (field[x][y] >= lenght)</span><br><span style="color: hsl(120, 100%, 40%);">+ field[x][y] = BLANK;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (field[x][y] >= SBODY)</span><br><span style="color: hsl(120, 100%, 40%);">+ field[x][y]++;</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void setItem(int x, int y, int item) {</span><br><span style="color: hsl(120, 100%, 40%);">+void setItem(int x, int y, int item)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> if (item == HEAD) {</span><br><span> switch (field[x][y]) {</span><br><span style="color: hsl(0, 100%, 40%);">- case FOOD: score++; setFood(); item = HEAD_FOOD; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case BLANK: break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: err = SNAKE_COL;score--;</span><br><span style="color: hsl(120, 100%, 40%);">+ case FOOD:</span><br><span style="color: hsl(120, 100%, 40%);">+ score++;</span><br><span style="color: hsl(120, 100%, 40%);">+ setFood();</span><br><span style="color: hsl(120, 100%, 40%);">+ item = HEAD_FOOD;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BLANK:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ err = SNAKE_COL;</span><br><span style="color: hsl(120, 100%, 40%);">+ score--;</span><br><span> }</span><br><span> }</span><br><span> field[x][y] = item;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void resetField() {</span><br><span style="color: hsl(120, 100%, 40%);">+wohnung void resetField()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> /* system("clear"); */</span><br><span> printf("\033[H\033[2J");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void printField() {</span><br><span style="color: hsl(120, 100%, 40%);">+void printField()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> fb_clear();</span><br><span> int x, y;</span><br><span> for (y = 0; y < HEIGHT; y++) {</span><br><span> for (x = 0; x < WIDTH; x++) {</span><br><span> switch (field[x][y]) {</span><br><span style="color: hsl(0, 100%, 40%);">- case BLANK:break;</span><br><span style="color: hsl(0, 100%, 40%);">- case HEAD: print_snake_str("O", x, y);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case HEAD_FOOD: print_snake_str("P", x, y);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case FOOD: print_snake_str("#", x, y);break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- if (field[x][y] == lenght) print_snake_str(";", x, y);</span><br><span style="color: hsl(0, 100%, 40%);">- else print_snake_str("o", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ case BLANK:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case HEAD:</span><br><span style="color: hsl(120, 100%, 40%);">+ print_snake_str("O", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case HEAD_FOOD:</span><br><span style="color: hsl(120, 100%, 40%);">+ print_snake_str("P", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case FOOD:</span><br><span style="color: hsl(120, 100%, 40%);">+ print_snake_str("#", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (field[x][y] == lenght)</span><br><span style="color: hsl(120, 100%, 40%);">+ print_snake_str(";", x, y);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ print_snake_str("o", x, y);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> }</span><br><span> printf("Score: %d\n", score);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_gotoxy(0, framebuffer->height+-9);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_lineto(framebuffer->width-1, framebuffer->cursor_y);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_gotoxy(0, framebuffer->height-1);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_gotoxy(0, framebuffer->height - 9);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_lineto(framebuffer->width - 1, framebuffer->cursor_y);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_gotoxy(0, framebuffer->height - 1);</span><br><span> char text[16];</span><br><span> switch (err) {</span><br><span style="color: hsl(0, 100%, 40%);">- case SNAKE_COL: fb_putstr("The snake ate itself!!!", framebuffer->width);</span><br><span style="color: hsl(0, 100%, 40%);">- err = ALLRIGHT; break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: sprintf(text, "Score: %d", score);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_putstr(text, framebuffer->width);</span><br><span style="color: hsl(0, 100%, 40%);">- framebuffer->cursor_x = 45;</span><br><span style="color: hsl(0, 100%, 40%);">- fb_putstr("OsmocomBB", framebuffer->width);</span><br><span style="color: hsl(120, 100%, 40%);">+ case SNAKE_COL:</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_putstr("The snake ate itself!!!", framebuffer->width);</span><br><span style="color: hsl(120, 100%, 40%);">+ err = ALLRIGHT;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ sprintf(text, "Score: %d", score);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_putstr(text, framebuffer->width);</span><br><span style="color: hsl(120, 100%, 40%);">+ framebuffer->cursor_x = 45;</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_putstr("OsmocomBB", framebuffer->width);</span><br><span> }</span><br><span> fb_flush();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Pos X: %d, Y: %d\n", pos.x, pos.y);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n\n");</span><br><span style="color: hsl(0, 100%, 40%);">- for(y = -1; y < HEIGHT; y++) {</span><br><span style="color: hsl(0, 100%, 40%);">- for(x = -1; x < WIDTH; x++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (y == -1 || x == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (x == -1) printf(" %2d: ", y);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (y == -1) printf(UNDERLINE " %2d" KNRM, x);</span><br><span style="color: hsl(0, 100%, 40%);">- } else printf(" %2d",field[x][y]);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- puts("\n");</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Pos X: %d, Y: %d\n", pos.x, pos.y);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ for (y = -1; y < HEIGHT; y++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (x = -1; x < WIDTH; x++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (y == -1 || x == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (x == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" %2d: ", y);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (y == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(UNDERLINE " %2d" KNRM,</span><br><span style="color: hsl(120, 100%, 40%);">+ x);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" %2d", field[x][y]);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ puts("\n");</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int cursor = 0;</span><br><span> #define NEIGH_LINES ((framebuffer->height +8) / 8)</span><br><span> static void print_display(char *text, int *y, int c)</span><br><span>@@ -254,7 +307,8 @@</span><br><span> fb_putstr(text, framebuffer->width);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void fb_clear_fancy(uint8_t delay) {</span><br><span style="color: hsl(120, 100%, 40%);">+void fb_clear_fancy(uint8_t delay)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> int16_t x, y;</span><br><span> fb_setfg(FB_COLOR_BLACK);</span><br><span> fb_setbg(FB_COLOR_WHITE);</span><br><span>@@ -279,33 +333,35 @@</span><br><span> fb_setbg(FB_COLOR_WHITE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void intro() {</span><br><span style="color: hsl(120, 100%, 40%);">+void intro()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> fb_setfg(FB_COLOR_BLACK);</span><br><span> fb_setbg(FB_COLOR_WHITE);</span><br><span> fb_setfont(FB_FONT_HELVB14);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fb_gotoxy(framebuffer->width/2 - 7 * 3, 15);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_putstr("Snake",framebuffer->width-4);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_gotoxy(framebuffer->width / 2 - 7 * 3, 15);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_putstr("Snake", framebuffer->width - 4);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fb_gotoxy(14, framebuffer->height-5);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_gotoxy(14, framebuffer->height - 5);</span><br><span> fb_setfont(FB_FONT_HELVR08);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_putstr("Version: " GIT_SHORTHASH, framebuffer->width-4);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_putstr("Version: " GIT_SHORTHASH, framebuffer->width - 4);</span><br><span> fb_gotoxy(0, 0);</span><br><span> fb_boxto(framebuffer->width - 1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_boxto(framebuffer->width - 2, framebuffer->height-1);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_boxto(0, framebuffer->height-2);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_boxto(framebuffer->width - 2, framebuffer->height - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_boxto(0, framebuffer->height - 2);</span><br><span> fb_boxto(1, 1);</span><br><span> </span><br><span> printf("(%u, %u)\n", framebuffer->width, framebuffer->height);</span><br><span> fb_gotoxy(2, 2);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_lineto(framebuffer->width-3, framebuffer->height-3);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_gotoxy(2, framebuffer->height-3);</span><br><span style="color: hsl(0, 100%, 40%);">- fb_lineto(framebuffer->width-3, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_lineto(framebuffer->width - 3, framebuffer->height - 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_gotoxy(2, framebuffer->height - 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ fb_lineto(framebuffer->width - 3, 2);</span><br><span> fb_flush();</span><br><span> }</span><br><span> </span><br><span> /* Main Program */</span><br><span style="color: hsl(0, 100%, 40%);">-const char *hr = "======================================================================\n";</span><br><span style="color: hsl(120, 100%, 40%);">+const char *hr =</span><br><span style="color: hsl(120, 100%, 40%);">+ "======================================================================\n";</span><br><span> </span><br><span> void key_handler(enum key_codes code, enum key_states state);</span><br><span> </span><br><span>@@ -356,24 +412,25 @@</span><br><span> delay_ms(5000);</span><br><span> fb_clear_fancy(20);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> fb_setfg(FB_COLOR_BLACK);</span><br><span> fb_setbg(FB_COLOR_WHITE);</span><br><span> fb_setfont(FB_FONT_HELVR08);</span><br><span> fb_flush();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pos.x = framebuffer->width/(6 * 2);</span><br><span style="color: hsl(0, 100%, 40%);">- pos.y = framebuffer->height/(8 * 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.x = framebuffer->width / (6 * 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ pos.y = framebuffer->height / (8 * 2);</span><br><span> setItem(pos.x, pos.y, HEAD);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (battery_info.bat_volt_mV == 0) osmo_timers_update();</span><br><span style="color: hsl(120, 100%, 40%);">+ while (battery_info.bat_volt_mV == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timers_update();</span><br><span> srand(battery_info.bat_volt_mV);</span><br><span style="color: hsl(0, 100%, 40%);">- if (DEBUG > 0) printf("Initialize random number generator with %d\n", battery_info.bat_volt_mV);</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Initialize random number generator with %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ battery_info.bat_volt_mV);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> setFood();</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Put string to (%d|%d)\n", pos.x, pos.y);</span><br><span> printField();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> sercomm_register_rx_cb(SC_DLCI_CONSOLE, console_rx_cb);</span><br><span> sercomm_register_rx_cb(SC_DLCI_L1A_L23, l1a_l23_rx_cb);</span><br><span> keypad_set_handler(&key_handler);</span><br><span>@@ -386,28 +443,49 @@</span><br><span> </span><br><span> twl3025_power_off();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {}</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> void key_handler(enum key_codes code, enum key_states state)</span><br><span> {</span><br><span> if (!osmo_timer_pending(&move_snake_timer)) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&move_snake_timer,WAIT_TIME_AUTOMOVE);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&move_snake_timer, WAIT_TIME_AUTOMOVE);</span><br><span> }</span><br><span> if (state != PRESSED)</span><br><span> return;</span><br><span> </span><br><span> switch (code) {</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_0: bl_level(0);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_1: bl_level(10);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_2: movepos_keypress('k');break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_3: bl_level(30);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_4: movepos_keypress('h');break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_5: bl_level(50);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_6: movepos_keypress('l');break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_7: bl_level(150);break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_8: movepos_keypress('j');break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_9: bl_level(255);break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_0:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(10);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_2:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('k');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_3:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(30);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_4:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('h');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_5:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(50);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_6:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('l');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_7:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(150);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_8:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('j');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_9:</span><br><span style="color: hsl(120, 100%, 40%);">+ bl_level(255);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> // used to be display_puts...</span><br><span> break;</span><br><span> case KEY_STAR:</span><br><span>@@ -425,10 +503,18 @@</span><br><span> case KEY_POWER:</span><br><span> twl3025_power_off_now();</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_RIGHT: movepos_keypress('l'); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_LEFT: movepos_keypress('h'); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_UP: movepos_keypress('k'); break;</span><br><span style="color: hsl(0, 100%, 40%);">- case KEY_DOWN: movepos_keypress('j'); break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_RIGHT:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('l');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_LEFT:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('h');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_UP:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('k');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case KEY_DOWN:</span><br><span style="color: hsl(120, 100%, 40%);">+ movepos_keypress('j');</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19489">change 19489</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/19489"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9b5250579290b6eb1e33d446e9fc7d2c082c4002 </div>
<div style="display:none"> Gerrit-Change-Number: 19489 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: roox <mardnh@gmx.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>