pull request

.github/workflows/ci-workflow.yml

@@ -6,21 +6,49 @@ on:
   workflow_dispatch:
 
 jobs:
-  KhiCAS:
+#  KhiCAS:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - run: sudo apt-get update && sudo apt-get install wget gdb gcc g++ libgmp-dev libmpfr-dev libmpfi-dev libpari-dev libgsl0-dev libxext-dev libpng-dev libjpeg-dev libreadline-dev libncurses5-dev mesa-common-dev libx11-dev libxt-dev libxft-dev libntl-dev libgl1-mesa-dev libgl-dev libao-dev hevea debhelper libfltk1.3-dev build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi dfu-util texinfo autoconf-archive -y
+#
+#      - uses: actions/checkout@v1
+#        with:
+#          submodules: true
+#      - run: make -C apps/KhiCAS clean
+#      - run: make KhiCAS_rebuild
+#      - run: ./tool/archive KhiCAS.tar KhiCAS
+#      - uses: actions/upload-artifact@master
+#        with:
+#          name: KhiCAS
+#          path: KhiCAS.tar
+  Golly:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get update && sudo apt-get install wget gdb gcc g++ libgmp-dev libmpfr-dev libmpfi-dev libpari-dev libgsl0-dev libxext-dev libpng-dev libjpeg-dev libreadline-dev libncurses5-dev mesa-common-dev libx11-dev libxt-dev libxft-dev libntl-dev libgl1-mesa-dev libgl-dev libao-dev hevea debhelper libfltk1.3-dev build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi dfu-util texinfo autoconf-archive -y
 
       - uses: actions/checkout@v1
         with:
           submodules: true
-      - run: make -C apps/KhiCAS cleanall
-      - run: make KhiCAS_rebuild
-      - run: ./tool/archive KhiCAS.tar KhiCAS
+      - run: make Golly_rebuild
+      - run: ./tool/archive Golly.tar Golly
       - uses: actions/upload-artifact@master
         with:
-          name: KhiCAS
-          path: KhiCAS.tar
+          name: Golly
+          path: Golly.tar
+  Fractal:
+    runs-on: ubuntu-latest
+    steps:
+      - run: sudo apt-get update && sudo apt-get install wget gdb gcc g++ libgmp-dev libmpfr-dev libmpfi-dev libpari-dev libgsl0-dev libxext-dev libpng-dev libjpeg-dev libreadline-dev libncurses5-dev mesa-common-dev libx11-dev libxt-dev libxft-dev libntl-dev libgl1-mesa-dev libgl-dev libao-dev hevea debhelper libfltk1.3-dev build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi dfu-util texinfo autoconf-archive -y
+
+      - uses: actions/checkout@v1
+        with:
+          submodules: true
+      - run: make Fractal_rebuild
+      - run: ./tool/archive Fractal.tar Fractal
+      - uses: actions/upload-artifact@master
+        with:
+          name: Fractal
+          path: Fractal.tar
   BadApple:
     runs-on: ubuntu-latest
     steps:
@@ -163,4 +191,4 @@ jobs:
           path: UnitCircle.tar
 
 env:
-  ACCEPT_OFFICIAL_TOS: 1
+  ACCEPT_OFFICIAL_TOS: 1

apps/Fractal/Makefile

@@ -0,0 +1,15 @@
+API=../../api
+CC=arm-none-eabi-gcc
+OBJCOPY=arm-none-eabi-objcopy
+AR=arm-none-eabi-ar
+CFLAGS=-DNDEBUG -ggdb3 -I$(API) -O3 -mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard -fno-common -fdata-sections -ffunction-sections -fno-exceptions -flto -fwhole-program
+LDFLAGS=-Wl,-L$(API) -Wl,--gc-sections -Wl,--entry=entrypoint --specs=nosys.specs -nostartfiles -Wl,-Ur -lapi -lm
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
+
+app.elf: main.o peripherals.o menu.o
+	$(CC) $^ -o $@ $(CFLAGS) $(LDFLAGS)
+
+clean:
+	rm -f *.elf *.o

apps/Fractal/inc/menu.h

@@ -0,0 +1,16 @@
+#ifndef MENU_H
+#define MENU_H
+
+#include "extapp_api.h"
+#include "peripherals.h"
+
+typedef struct {
+    char *value;
+    int cursor;
+    int max;
+    int x_pos;
+} input_t;
+
+void menu(int *MAX_ITER, double complex *c, int *quit);
+
+#endif

apps/Fractal/inc/peripherals.h

@@ -0,0 +1,26 @@
+#ifndef CHIPEE_PERIPHERALS_H_
+#define CHIPEE_PERIPHERALS_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <complex.h>
+#include <ctype.h>
+
+#define BGCOL 0x0000
+
+extern long long unsigned int keymappings[16];
+extern int keymappings_await[16];
+
+void clearscreen();
+void waitForKeyPressed();
+void waitForKeyReleased();
+void waitForKeyReleasedTimeout(int timeout);
+uint16_t makeColor(int iter, int max);
+uint16_t rgb_16(uint16_t r, uint16_t g, uint16_t b);
+char scancodeToCharFull(uint64_t scancode);
+char scancodeToCharNbr(uint64_t scancode);
+double complex parse_complex(const char *str);
+
+#endif

apps/Fractal/main.c

@@ -0,0 +1,47 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <complex.h>
+#include <math.h>
+#include "extapp_api.h"
+
+#include "inc/peripherals.h"
+#include "inc/menu.h"
+
+void extapp_main(void)
+{
+    waitForKeyReleased();
+    int quit = 0;
+
+    int SIZE_X = 320, SIZE_Y = 240;
+    int MAX_ITER;
+    double complex c;
+
+    menu(&MAX_ITER, &c, &quit);
+    if (quit) return;
+    clearscreen();
+
+    for (int i = -(SIZE_X - SIZE_Y) / 2; i < SIZE_X - (SIZE_X - SIZE_Y) / 2; i++)
+    {
+        for (int j = 0; j < SIZE_Y; j++)
+        {
+            double x = -1.5 + (3.0 * i) / SIZE_Y;
+            double y = -1.5 + (3.0 * j) / SIZE_Y;
+            double complex z = x + y * I;
+            int iter = 0;
+            while (cabs(z) < 2 && iter < MAX_ITER)
+            {
+                z = z * z + c;
+                iter++;
+            }
+            uint16_t color = makeColor(iter, MAX_ITER);
+            extapp_pushRectUniform(i + (SIZE_X - SIZE_Y) / 2, j, 1, 1, color);
+        }
+    }
+
+    waitForKeyReleased();
+    waitForKeyPressed();
+    waitForKeyReleased();
+
+    return;
+}

apps/Fractal/menu.c

@@ -0,0 +1,84 @@
+#include "inc/menu.h"
+
+#define DEFAULT rgb_16(166, 166, 166)
+#define SELECTED 0xFFFF
+#define NOPTIONS 2
+
+void menu(int *MAX_ITER, double complex *c, int *quit)
+{
+    int lselect = 0;
+    input_t inputs[NOPTIONS];
+    inputs[0] = (input_t){.cursor = 0, .max = 30, .value = calloc(31, sizeof(char)), .x_pos = 65};
+    inputs[1] = (input_t){.cursor = 0, .max = 3, .value = calloc(4, sizeof(char)), .x_pos = 135};
+    uint64_t previous_scancode = 0;
+
+    clearscreen();
+
+    extapp_pushRectUniform(0, 0, 320, 18, rgb_16(50, 50, 50));
+    extapp_drawTextSmall("FRACTAL", 140, 4, 0xFFFF, rgb_16(50, 50, 50), 0);
+
+    extapp_drawTextLarge(lselect == 0 ? "> c =" : "  c =", 5, 40, lselect == 0 ? SELECTED : DEFAULT, BGCOL, 0);
+    extapp_drawTextLarge(lselect == 1 ? "> Max. iter:" : "  Max. iter:", 5, 65, lselect == 1 ? SELECTED : DEFAULT, BGCOL, 0);
+    extapp_drawTextSmall(inputs[0].value, inputs[0].x_pos, 44, DEFAULT, BGCOL, 0);
+    extapp_drawTextSmall(inputs[1].value, inputs[1].x_pos, 69, SELECTED, BGCOL, 0);
+    extapp_drawTextLarge("<Ok>", 270, 200, DEFAULT, BGCOL, 0);
+    extapp_drawTextSmall("Toujours en noir et blanc", 5, 227, DEFAULT, BGCOL, 0);
+
+    while (true)
+    {
+        for (int i = 0; i < NOPTIONS; i++)
+        {
+            inputs[i].value[inputs[i].cursor] = '\0';
+        }
+
+        extapp_drawTextLarge(lselect == 0 ? "> c =" : "  c =", 5, 40, lselect == 0 ? SELECTED : DEFAULT, BGCOL, 0);
+        extapp_drawTextLarge(lselect == 1 ? "> Max. iter:" : "  Max. iter:", 5, 65, lselect == 1 ? SELECTED : DEFAULT, BGCOL, 0);
+        extapp_drawTextSmall(inputs[0].value, inputs[0].x_pos, 44, lselect == 0 ? SELECTED : DEFAULT, BGCOL, 0);
+        extapp_drawTextSmall(inputs[1].value, inputs[1].x_pos, 69, lselect == 1 ? SELECTED : DEFAULT, BGCOL, 0);
+
+        uint64_t scancode = extapp_scanKeyboard();
+
+        if (scancode != 0 && scancode != previous_scancode)
+        {
+            if (scancode & SCANCODE_Up) lselect = (lselect - 1 + NOPTIONS) % NOPTIONS;
+            else if (scancode & SCANCODE_Down) lselect = (lselect + 1) % NOPTIONS;
+            else if (scancode & SCANCODE_Back) {
+                *quit = 1;
+                break;
+            }
+            else if (scancode & SCANCODE_OK || scancode & SCANCODE_EXE) break;
+            else if (scancode & SCANCODE_Backspace && inputs[lselect].cursor > 0)
+            {
+                inputs[lselect].cursor--;
+                inputs[lselect].value[inputs[lselect].cursor] = '\0';
+                extapp_pushRectUniform(inputs[lselect].x_pos + 7 * inputs[lselect].cursor, 44 + lselect * 25, 100, 18, BGCOL);
+            }
+            else if (inputs[lselect].cursor < inputs[lselect].max)
+            {
+                char _c = lselect == 1 ? scancodeToCharNbr(scancode) : scancodeToCharFull(scancode);
+                if (_c != '\0')
+                {
+                    inputs[lselect].value[inputs[lselect].cursor] = _c;
+                    inputs[lselect].cursor++;
+                    extapp_pushRectUniform(inputs[lselect].x_pos + 7 * inputs[lselect].cursor, 44 + lselect * 25, 100, 18, BGCOL);
+                    extapp_drawTextSmall(inputs[lselect].value, inputs[lselect].x_pos, 44 + lselect * 25, SELECTED, BGCOL, 0);
+                }
+            }
+        }
+
+        previous_scancode = scancode;
+
+        extapp_msleep(10);
+    }
+
+    waitForKeyPressed();
+    waitForKeyReleased();
+
+    *MAX_ITER = atoi(inputs[1].value);
+    if (*MAX_ITER < 1)
+        *MAX_ITER = 100;
+    *c = parse_complex(inputs[0].value);
+
+    free(inputs[0].value);
+    free(inputs[1].value);
+}