From ce4a1f2e1d2c31c6f6c9c6b80f53889732f1ee77 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 3 May 2019 21:37:01 +0200 Subject: [PATCH] core: remove unnecessary files --- core/.gitlab-ci.yml | 25 ------- core/src1/main.py | 22 ------ core/src1/usb.py | 29 -------- core/src_game/game_2048.py | 134 ------------------------------------- core/src_game/main.py | 1 - core/src_game/trezor | 1 - 6 files changed, 212 deletions(-) delete mode 100644 core/.gitlab-ci.yml delete mode 100644 core/src1/main.py delete mode 100644 core/src1/usb.py delete mode 100644 core/src_game/game_2048.py delete mode 100644 core/src_game/main.py delete mode 120000 core/src_game/trezor diff --git a/core/.gitlab-ci.yml b/core/.gitlab-ci.yml deleted file mode 100644 index 74a96028bb..0000000000 --- a/core/.gitlab-ci.yml +++ /dev/null @@ -1,25 +0,0 @@ -image: docker:latest - -services: - - docker:dind - -build and push emulator image: - when: manual - before_script: - - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD - script: - - docker build -t ${CI_REGISTRY_IMAGE}/trezor-emulator:latest -f ./docker/emulator/Dockerfile . - - docker push ${CI_REGISTRY_IMAGE}/trezor-emulator:latest - -build master: - stage: build - script: - - ./build-docker.sh HEAD local - only: - - master - artifacts: - expire_in: 1 week - paths: - - build-docker/boardloader/boardloader.bin - - build-docker/bootloader/bootloader.bin - - build-docker/firmware/firmware.bin diff --git a/core/src1/main.py b/core/src1/main.py deleted file mode 100644 index f3dc2dda88..0000000000 --- a/core/src1/main.py +++ /dev/null @@ -1,22 +0,0 @@ -import usb - -usb.bus.open() - -import trezorio as io -from trezorui import Display - -d = Display() - -d.clear() -d.backlight(255) - -i = 0 - -while True: - d.print('Loop %d\n' % i) - i += 1 - r = [0, 0] - if io.poll([io.TOUCH], r, 1000000): - print('TOUCH', r) - else: - print('NOTOUCH') diff --git a/core/src1/usb.py b/core/src1/usb.py deleted file mode 100644 index 2582c9b078..0000000000 --- a/core/src1/usb.py +++ /dev/null @@ -1,29 +0,0 @@ -import trezorio as io - -iface_wire = io.WebUSB( - iface_num=0, - ep_in=0x81, - ep_out=0x01, -) - -iface_vcp = io.VCP( - iface_num=2, - data_iface_num=3, - ep_in=0x83, - ep_out=0x03, - ep_cmd=0x84, -) - -bus = io.USB( - vendor_id=0x1209, - product_id=0x53C1, - release_num=0x0100, - manufacturer="SatoshiLabs", - product="TREZOR", - interface="TREZOR Interface", - serial_number="1234", - usb21_landing=False, -) - -bus.add(iface_wire) -bus.add(iface_vcp) diff --git a/core/src_game/game_2048.py b/core/src_game/game_2048.py deleted file mode 100644 index e5b8286859..0000000000 --- a/core/src_game/game_2048.py +++ /dev/null @@ -1,134 +0,0 @@ -# -# 2048 Game -# ported to TREZOR Core by Pavol Rusnak (stick@satoshilabs.com) -# -# inspired by https://github.com/gabrielecirulli/2048 -# - -from trezor import loop, ui, workflow -from trezor.crypto import random -from trezor.ui.swipe import Swipe, SWIPE_DOWN, SWIPE_UP, SWIPE_LEFT - - -color_fg1 = ui.rgb(0x77, 0x6E, 0x65) -color_fg2 = ui.rgb(0xF9, 0xF6, 0xF2) -color = { - "0": (ui.rgb(0xCC, 0xC0, 0xB3), ui.rgb(0xBB, 0xAD, 0xA0)), - "2": (ui.rgb(0xEE, 0xE4, 0xDA), color_fg1), - "4": (ui.rgb(0xED, 0xE0, 0xC8), color_fg1), - "8": (ui.rgb(0xF2, 0xB1, 0x79), color_fg2), - "16": (ui.rgb(0xF5, 0x95, 0x63), color_fg2), - "32": (ui.rgb(0xF6, 0x7C, 0x5F), color_fg2), - "64": (ui.rgb(0xF6, 0x5E, 0x3B), color_fg2), - "128": (ui.rgb(0xED, 0xCF, 0x72), color_fg2), - "256": (ui.rgb(0xED, 0xCC, 0x61), color_fg2), - "512": (ui.rgb(0xED, 0xC8, 0x50), color_fg2), - "1024": (ui.rgb(0xED, 0xC5, 0x3F), color_fg2), - "2048": (ui.rgb(0xED, 0xC2, 0x2E), color_fg2), - "lose": (ui.rgb(0xFF, 0x00, 0x00), ui.rgb(0xFF, 0xFF, 0xFF)), - "win": (ui.rgb(0x00, 0xFF, 0x00), ui.rgb(0xFF, 0xFF, 0xFF)), -} - - -class Game: - def __init__(self): - self.d = ui.display - self.d.backlight(ui.BACKLIGHT_NORMAL) - self.d.bar(0, 0, ui.WIDTH, ui.HEIGHT, color["0"][1]) - self.m = [[0 for _ in range(4)] for _ in range(4)] - self.add() - self.add() - - def add(self): - while True: - i, j = random.uniform(4), random.uniform(4) - if self.m[i][j] == 0: - self.m[i][j] = 2 - break - - def contains(self, val): - return val in [i for l in self.m for i in l] - - def render(self): - # LOSE endstate - if not self.contains(0): - self.d.bar(0, 0, ui.WIDTH, ui.HEIGHT, color["lose"][0]) - self.d.text_center( - 120, 128, "YOU LOSE!", ui.BOLD, color["lose"][1], color["lose"][0] - ) - # WIN endstate - elif self.contains(2048): - self.d.bar(0, 0, ui.WIDTH, ui.HEIGHT, color["win"][0]) - self.d.text_center( - 120, 128, "YOU WIN!", ui.BOLD, color["win"][1], color["win"][0] - ) - # NORMAL game state - else: - for i in range(4): - for j in range(4): - v = self.m[i][j] - cb, cf = color[str(v)] - self.d.bar_radius( - 8 + i * 58, 8 + j * 58, 50, 50, cb, color["0"][1], 2 - ) - if v: - self.d.text_center( - 8 + i * 58 + 25, 8 + j * 58 + 33, str(v), ui.BOLD, cf, cb - ) - self.d.backlight(ui.BACKLIGHT_NORMAL) - self.d.refresh() - - def update(self, d): - for _ in range(4): - self.compact(d) - self.add() - - def compact(self, d): - if d == SWIPE_DOWN: - for i in range(4): - for j in [2, 1, 0]: - if self.m[i][j] == self.m[i][j + 1]: - self.m[i][j + 1] = self.m[i][j] * 2 - self.m[i][j] = 0 - elif 0 == self.m[i][j + 1]: - self.m[i][j + 1] = self.m[i][j] - self.m[i][j] = 0 - elif d == SWIPE_UP: - for i in range(4): - for j in [1, 2, 3]: - if self.m[i][j] == self.m[i][j - 1]: - self.m[i][j - 1] = self.m[i][j] * 2 - self.m[i][j] = 0 - elif 0 == self.m[i][j - 1]: - self.m[i][j - 1] = self.m[i][j] - self.m[i][j] = 0 - elif d == SWIPE_LEFT: - for j in range(4): - for i in [1, 2, 3]: - if self.m[i][j] == self.m[i - 1][j]: - self.m[i - 1][j] = self.m[i][j] * 2 - self.m[i][j] = 0 - elif 0 == self.m[i - 1][j]: - self.m[i - 1][j] = self.m[i][j] - self.m[i][j] = 0 - else: # SWIPE_RIGHT - for j in range(4): - for i in [2, 1, 0]: - if self.m[i][j] == self.m[i + 1][j]: - self.m[i + 1][j] = self.m[i][j] * 2 - self.m[i][j] = 0 - elif 0 == self.m[i + 1][j]: - self.m[i + 1][j] = self.m[i][j] - self.m[i][j] = 0 - - -async def layout_game(): - game = Game() - while True: - game.render() - swipe = await Swipe(absolute=True) - game.update(swipe) - - -workflow.startdefault(layout_game) -loop.run() diff --git a/core/src_game/main.py b/core/src_game/main.py deleted file mode 100644 index 0ab75929ca..0000000000 --- a/core/src_game/main.py +++ /dev/null @@ -1 +0,0 @@ -import game_2048 diff --git a/core/src_game/trezor b/core/src_game/trezor deleted file mode 120000 index 7265975be4..0000000000 --- a/core/src_game/trezor +++ /dev/null @@ -1 +0,0 @@ -../src/trezor \ No newline at end of file