Skip to content

Commit

Permalink
Merge pull request #528 from LedgerHQ/xch/ux-renaming
Browse files Browse the repository at this point in the history
Ux renamings
  • Loading branch information
xchapron-ledger authored Feb 7, 2024
2 parents 4ad2791 + b106c7b commit 8dd9234
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
ifeq ($(USE_NBGL),0)
SDK_SOURCE_PATH += lib_bagl lib_ux
else
SDK_SOURCE_PATH += lib_nbgl lib_ux_stax
SDK_SOURCE_PATH += lib_nbgl lib_ux_nbgl
endif

define uniq =
Expand Down
4 changes: 2 additions & 2 deletions doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,8 @@ INPUT = \
lib_ux/doc \
lib_ux/include \
lib_ux/src \
lib_ux_stax/doc \
lib_ux_stax
lib_ux_nbgl/doc \
lib_ux_nbgl

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
26 changes: 26 additions & 0 deletions include/ux.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

/*****************************************************************************
* (c) 2024 Ledger SAS.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*****************************************************************************/

#pragma once

#ifdef HAVE_BAGL
#include "ux_bagl.h"
#endif

#ifdef HAVE_NBGL
#include "ux_nbgl.h"
#endif
26 changes: 26 additions & 0 deletions include/ux_loc.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

/*****************************************************************************
* (c) 2024 Ledger SAS.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*****************************************************************************/

#pragma once

#ifdef HAVE_BAGL
#include "ux_loc_bagl.h"
#endif

#ifdef HAVE_NBGL
#include "ux_loc_nbgl.h"
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion unit-tests/lib_nbgl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ include_directories(.)
include_directories(../../target/stax/include)
include_directories(../../include)
include_directories(../../lib_nbgl/include)
include_directories(../../lib_ux_stax)
include_directories(../../lib_ux_nbgl)

add_executable(test_nbgl_fonts test_nbgl_fonts.c)
add_executable(test_nbgl_obj_pool test_nbgl_obj_pool.c)
Expand Down

0 comments on commit 8dd9234

Please sign in to comment.