Skip to content
This repository was archived by the owner on May 19, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 4.26.1 0x74c9c7e3
// 4.26.1 0x780d75ed
// Generated by imageconverter. Please, do not edit!

#include <images/BitmapDatabase.hpp>
Expand All @@ -12,9 +12,9 @@ extern const unsigned char image_tickamber_22x17[]; // BITMAP_TICKAMBER_22X17_ID

const touchgfx::Bitmap::BitmapData bitmap_database[] = {
{ image_alarm_60x60, 0, 60, 60, 20, 13, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 4, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circlecross_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circleplus_50x50, 0, 50, 50, 23, 11, 4, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 28, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circlecross_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circleplus_50x50, 0, 50, 50, 22, 13, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_tickamber_22x17, 0, 22, 17, 4, 11, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 }
};

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

640 changes: 320 additions & 320 deletions Apps/Alarm/Software/Apps/TouchGFX-GUI/simulator/msvs/Application.vcxproj

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 4.26.1 0x67d9945b
// 4.26.1 0x48b0f6bf
// Generated by imageconverter. Please, do not edit!

#include <images/BitmapDatabase.hpp>
Expand All @@ -20,8 +20,8 @@ extern const unsigned char image_pause_14x14[]; // BITMAP_PAUSE_14X14_ID = 12, S
extern const unsigned char image_tickamber_22x17[]; // BITMAP_TICKAMBER_22X17_ID = 13, Size: 22x17 pixels

const touchgfx::Bitmap::BitmapData bitmap_database[] = {
{ image_circlecross_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circlecross_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_clock_16x19, 0, 16, 19, 4, 16, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 2, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_crossamber_17x17, 0, 17, 17, 5, 5, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_cyclingman_37x29, 0, 37, 29, 13, 10, 4, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 6, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Apps/GlanceSteps/Software/Libs/Header/Service.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Service
static constexpr int16_t kIconX = 39;
static constexpr int16_t kIconY = 25;

static constexpr int16_t kValueX = 65;
static constexpr int16_t kValueX = 70;
static constexpr int16_t kValueY = 28;
static constexpr int16_t kValueW = 100;
static constexpr int16_t kValueH = 40;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 4.26.1 0x72b8fdf4
// 4.26.1 0x6697a5ac
// Generated by imageconverter. Please, do not edit!

#include <images/BitmapDatabase.hpp>
Expand All @@ -18,8 +18,8 @@ extern const unsigned char image_tickamber_22x17[]; // BITMAP_TICKAMBER_22X17_ID
extern const unsigned char image_walkingman_26x30[]; // BITMAP_WALKINGMAN_26X30_ID = 11, Size: 26x30 pixels

const touchgfx::Bitmap::BitmapData bitmap_database[] = {
{ image_circlecross_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 45, 15, 3, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 20, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circlecross_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_circletick_50x50, 0, 50, 50, 13, 3, 23, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 5, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_heart_30x30, 0, 30, 30, 4, 7, 21, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 11, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_heartratezone1, 0, 39, 44, 6, 27, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 12, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
{ image_heartratezone2, 0, 47, 37, 28, 5, 16, ((uint8_t)touchgfx::Bitmap::ABGR2222) >> 3, 7, ((uint8_t)touchgfx::Bitmap::ABGR2222) & 0x7 },
Expand Down
Loading
Loading