Skip to content

Commit 65e4ef5

Browse files
smdavidsmdavid
committed
Update to DMCP 3.26 and toolchain 10.3
1 parent a58e2c7 commit 65e4ef5

File tree

12 files changed

+27
-17
lines changed

12 files changed

+27
-17
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BSD 3-Clause License
44

5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77

88
Redistribution and use in source and binary forms, with or without

‎Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CPUFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard -mfpu=fpv4-sp-d16
9090
# compile gcc flags
9191
ASFLAGS = $(CPUFLAGS) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
9292
CFLAGS = $(CPUFLAGS) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
93-
CFLAGS += -Wno-misleading-indentation
93+
CFLAGS += -Wno-misleading-indentation -Wno-stringop-truncation
9494
DBGFLAGS = -g
9595

9696
ifeq ($(DEBUG), 1)
@@ -111,8 +111,9 @@ CFLAGS += -MD -MP -MF .dep/$(@F).d
111111
# link script
112112
LDSCRIPT = stm32_program.ld
113113
LIBDIR =
114-
LDFLAGS = $(CPUFLAGS) -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections \
115-
-Wl,--wrap=_malloc_r
114+
LDFLAGS += $(CPUFLAGS) -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
115+
LDFLAGS += -specs=nano.specs
116+
LDFLAGS += -Wl,--gc-sections -Wl,--wrap=_malloc_r
116117

117118

118119
# default action: build all

‎dmcp/dmcp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without
@@ -356,7 +356,7 @@ typedef struct {
356356

357357
// ----------------------------------
358358

359-
#define PLATFORM_VERSION "3.25"
359+
#define PLATFORM_VERSION "3.26"
360360

361361
// System interface version
362362
#define PLATFORM_IFC_CNR 3

‎dmcp/ff_ifc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

‎dmcp/lft_ifc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

‎dmcp/sys/pgm_syscalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

‎src/main.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7676
// ==================================================
7777
void stack_dup();
7878
void stack_pop();
79+
void stack_clear();
7980
void clear_regs();
8081

8182

@@ -479,7 +480,7 @@ void add_edit_key(int key) {
479480
break;
480481

481482
default: // Numbers
482-
if ( !dot && ((len == 1 && ed[0] == '0') || (ed[len-1] == '0' && !isdigit(ed[len-2]))) )
483+
if ( !dot && ((len == 1 && ed[0] == '0') || (ed[len-1] == '0' && !isdigit((int)ed[len-2]))) )
483484
ed[--len] = 0; // Remove redundant 0
484485
ed_cat(key_to_char[key], len);
485486
break;
@@ -495,6 +496,13 @@ void add_edit_key(int key) {
495496

496497
#define FNSH 0x100
497498

499+
500+
void stack_clear() {
501+
for(int a=0; a<STACK_SIZE; a++)
502+
stack[a] = num_zero;
503+
}
504+
505+
498506
void stack_dup() {
499507
memmove(stack+1, stack, sizeof(num_t)*(STACK_SIZE-1));
500508
}
@@ -550,7 +558,7 @@ int run_fn(int key) {
550558

551559
switch (fnr) {
552560

553-
case KEY_BSP | FNSH: clear_regs(); break;
561+
case KEY_BSP | FNSH: stack_clear(); break; //clear_regs();
554562

555563
case KEY_BSP:
556564
case KEY_RDN: stack_pop(); break;
@@ -831,6 +839,7 @@ void program_init() {
831839

832840
// Zero numbers
833841
clear_regs();
842+
stack_clear();
834843
}
835844

836845

‎src/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

‎src/menu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

‎src/menu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
BSD 3-Clause License
44
5-
Copyright (c) 2015-2024, SwissMicros
5+
Copyright (c) 2015-2025, SwissMicros
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)