Skip to content

Updated repo path #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Macrosrider wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Updated repo path #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffe6c27
Updated repo path
Macrosrider Mar 24, 2021
5e4c2f5
Updated intall command
Macrosrider Mar 25, 2021
ef26ef2
Updated submodule path
Macrosrider Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "tiny-firmware/protob"]
path = tiny-firmware/protob
url = http://github.com/SkycoinProject/hardware-wallet-protob.git
url = http://github.com/skycoin/hardware-wallet-protob.git
branch = develop
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ deploy:
acl: private
region: $AWS_REGION
on:
repo: SkycoinProject/hardware-wallet
repo: skycoin/hardware-wallet
tags: true
3 changes: 1 addition & 2 deletions ci-scripts/install-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ sudo apt-get install -y build-essential curl unzip git python3 python3-pip pytho
wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 | tar xjf - -C /opt

# Install SDL
sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev libsdl2-dev libsdl2-image-dev

sudo aptitude install -y libegl1-mesa-dev libgles2-mesa-dev libsdl2-dev libsdl2-image-dev
2 changes: 1 addition & 1 deletion ci-scripts/verify_protob_hash.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROTOB_HASH=$(git -C tiny-firmware/protob/ rev-parse HEAD)

# make sure submodule has correct origin url
SUBMODULE_ORIGIN_URL=$(git -C tiny-firmware/protob remote get-url origin)
if ! echo "$SUBMODULE_ORIGIN_URL" | grep -q "http://github.com/SkycoinProject/hardware-wallet-protob.git"; then
if ! echo "$SUBMODULE_ORIGIN_URL" | grep -q "http://github.com/skycoin/hardware-wallet-protob.git"; then
echo "invalid repository $SUBMODULE_ORIGIN_URL"
exit 1
fi
Expand Down
8 changes: 4 additions & 4 deletions tiny-firmware/bootloader/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ static void send_msg_features(usbd_device* dev)
uint8_t fetOpts = 0;
switch (memory_rdp_level()) {
case 2:
// https://github.com/SkycoinProject/hardware-wallet-protob/blob/b3a2d50a55c6fb047b895bec27204e0abae38900/protob/messages/types.proto#L139
// https://github.com/skycoin/hardware-wallet-protob/blob/b3a2d50a55c6fb047b895bec27204e0abae38900/protob/messages/types.proto#L139
fetOpts = (1 << 4);
break;
case 1:
// https://github.com/SkycoinProject/hardware-wallet-protob/blob/b3a2d50a55c6fb047b895bec27204e0abae38900/protob/messages/types.proto#L138
// https://github.com/skycoin/hardware-wallet-protob/blob/b3a2d50a55c6fb047b895bec27204e0abae38900/protob/messages/types.proto#L138
fetOpts = (1 << 3);
break;
}
Expand Down Expand Up @@ -547,14 +547,14 @@ static void hid_rx_callback(usbd_device* dev, uint8_t ep)
if (flash_len > FLASH_TOTAL_SIZE + FLASH_META_DESC_LEN - (FLASH_APP_START - FLASH_ORIGIN)) { // firmware is too big
send_msg_failure(dev);
flash_state = STATE_END;
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Firmware is too big.", NULL, "Get official firmware", "github.com/SkycoinProject/hardware-wallet", NULL, NULL);
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Firmware is too big.", NULL, "Get official firmware", "github.com/skycoin/hardware-wallet", NULL, NULL);
return;
}
// check firmware magic
if (memcmp(p, FIRMWARE_MAGIC, 4) != 0) {
send_msg_failure(dev);
flash_state = STATE_END;
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Wrong firmware header.", NULL, "Get official firmware", "github.com/SkycoinProject/hardware-wallet", NULL, NULL);
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Wrong firmware header.", NULL, "Get official firmware", "github.com/skycoin/hardware-wallet", NULL, NULL);
return;
}
flash_state = STATE_FLASHING;
Expand Down
2 changes: 1 addition & 1 deletion tiny-firmware/build-emulator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ELFFILE=build/skycoin-emulator64-$TAG

docker build -f Dockerfile.emulator -t $IMAGE .
docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
git clone https://github.com/SkycoinProject/hardware-wallet.git && \
git clone https://github.com/skycoin/hardware-wallet.git && \
cd hardware-wallet/tiny-firmware && \
git checkout $TAG && \
export EMULATOR=1
Expand Down