Skip to content

Commit 0f18b8b

Browse files
madhephaestusmadhephaestus
committed
Stack overflow now not an issue
1 parent d5cb074 commit 0f18b8b

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎BowlerBootloader_mplab.X/nbproject/Makefile-default.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,26 @@ ${OBJECTDIR}/_ext/1360937237/main.o: ../src/main.c nbproject/Makefile-${CND_CON
9898
@${MKDIR} ${OBJECTDIR}/_ext/1360937237
9999
@${RM} ${OBJECTDIR}/_ext/1360937237/main.o.d
100100
@${RM} ${OBJECTDIR}/_ext/1360937237/main.o
101-
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -funroll-loops -fomit-frame-pointer -fschedule-insns -fschedule-insns2 -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -I"../include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/main.o.d" -o ${OBJECTDIR}/_ext/1360937237/main.o ../src/main.c -DDYIO
101+
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -I"../include" -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/main.o.d" -o ${OBJECTDIR}/_ext/1360937237/main.o ../src/main.c -DDYIO
102102

103103
${OBJECTDIR}/_ext/1360937237/led.o: ../src/led.c nbproject/Makefile-${CND_CONF}.mk
104104
@${MKDIR} ${OBJECTDIR}/_ext/1360937237
105105
@${RM} ${OBJECTDIR}/_ext/1360937237/led.o.d
106106
@${RM} ${OBJECTDIR}/_ext/1360937237/led.o
107-
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -funroll-loops -fomit-frame-pointer -fschedule-insns -fschedule-insns2 -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -I"../include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/led.o.d" -o ${OBJECTDIR}/_ext/1360937237/led.o ../src/led.c -DDYIO
107+
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -I"../include" -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/led.o.d" -o ${OBJECTDIR}/_ext/1360937237/led.o ../src/led.c -DDYIO
108108

109109
else
110110
${OBJECTDIR}/_ext/1360937237/main.o: ../src/main.c nbproject/Makefile-${CND_CONF}.mk
111111
@${MKDIR} ${OBJECTDIR}/_ext/1360937237
112112
@${RM} ${OBJECTDIR}/_ext/1360937237/main.o.d
113113
@${RM} ${OBJECTDIR}/_ext/1360937237/main.o
114-
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -funroll-loops -fomit-frame-pointer -fschedule-insns -fschedule-insns2 -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -I"../include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/main.o.d" -o ${OBJECTDIR}/_ext/1360937237/main.o ../src/main.c -DDYIO
114+
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -I"../include" -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/main.o.d" -o ${OBJECTDIR}/_ext/1360937237/main.o ../src/main.c -DDYIO
115115

116116
${OBJECTDIR}/_ext/1360937237/led.o: ../src/led.c nbproject/Makefile-${CND_CONF}.mk
117117
@${MKDIR} ${OBJECTDIR}/_ext/1360937237
118118
@${RM} ${OBJECTDIR}/_ext/1360937237/led.o.d
119119
@${RM} ${OBJECTDIR}/_ext/1360937237/led.o
120-
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -funroll-loops -fomit-frame-pointer -fschedule-insns -fschedule-insns2 -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -I"../include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/led.o.d" -o ${OBJECTDIR}/_ext/1360937237/led.o ../src/led.c -DDYIO
120+
@${FIXDEPS} "${OBJECTDIR}/_ext/1360937237/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -mips16 -O1 -I"../include" -I"../../c-bowler/BowlerStack/include" -I"../../c-bowler/Platform/include" -MMD -MF "${OBJECTDIR}/_ext/1360937237/led.o.d" -o ${OBJECTDIR}/_ext/1360937237/led.o ../src/led.c -DDYIO
121121

122122
endif
123123

@@ -132,12 +132,12 @@ endif
132132
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
133133
dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk ../../c-bowler/c-bowler.X/dist/default/debug/c-bowler.X.a elf32pic32mx.ld
134134
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
135-
${MP_CC} $(MP_EXTRA_LD_PRE) -mdebugger -D__MPLAB_DEBUGGER_PK3=1 -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ../../c-bowler/c-bowler.X/dist/default/debug/c-bowler.X.a -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__ICD2RAM=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_PK3=1,--gc-sections,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--cref,--warn-section-align,-s
135+
${MP_CC} $(MP_EXTRA_LD_PRE) -mdebugger -D__MPLAB_DEBUGGER_PK3=1 -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ../../c-bowler/c-bowler.X/dist/default/debug/c-bowler.X.a -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__ICD2RAM=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_PK3=1,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
136136

137137
else
138138
dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk ../../c-bowler/c-bowler.X/dist/default/production/c-bowler.X.a elf32pic32mx.ld
139139
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
140-
${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ../../c-bowler/c-bowler.X/dist/default/production/c-bowler.X.a -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--gc-sections,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--cref,--warn-section-align,-s
140+
${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ../../c-bowler/c-bowler.X/dist/default/production/c-bowler.X.a -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
141141
${MP_CC_DIR}/xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/BowlerBootloader_mplab.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}
142142
endif
143143

‎BowlerBootloader_mplab.X/nbproject/Makefile-genesis.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
#Sat Oct 04 15:53:30 EDT 2014
2+
#Tue Oct 14 20:36:24 EDT 2014
33
default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=cb34a79390b81cf1009808342bcc9761
44
default.languagetoolchain.dir=/opt/microchip/xc32/v1.00/bin
55
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=ac168ab0a9b512659ad42bb497aabd51

‎BowlerBootloader_mplab.X/nbproject/configurations.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,20 @@
8585
<C32>
8686
<property key="additional-warnings" value="false"/>
8787
<property key="enable-app-io" value="false"/>
88-
<property key="enable-omit-frame-pointer" value="true"/>
88+
<property key="enable-omit-frame-pointer" value="false"/>
8989
<property key="enable-symbols" value="true"/>
90-
<property key="enable-unroll-loops" value="true"/>
90+
<property key="enable-unroll-loops" value="false"/>
9191
<property key="exclude-floating-point" value="false"/>
9292
<property key="extra-include-directories"
93-
value="../../c-bowler/BowlerStack/include;../../c-bowler/Platform/include;../include"/>
93+
value="../include;../../c-bowler/BowlerStack/include;../../c-bowler/Platform/include"/>
9494
<property key="generate-16-bit-code" value="true"/>
9595
<property key="generate-micro-compressed-code" value="false"/>
9696
<property key="isolate-each-function" value="false"/>
9797
<property key="make-warnings-into-errors" value="false"/>
9898
<property key="optimization-level" value="-O1"/>
9999
<property key="place-data-into-section" value="false"/>
100-
<property key="post-instruction-scheduling" value="schedule-insns2"/>
101-
<property key="pre-instruction-scheduling" value="schedule-insns"/>
100+
<property key="post-instruction-scheduling" value="default"/>
101+
<property key="pre-instruction-scheduling" value="default"/>
102102
<property key="preprocessor-macros" value=""/>
103103
<property key="strict-ansi" value="false"/>
104104
<property key="support-ansi" value="false"/>
@@ -126,7 +126,7 @@
126126
<property key="fill-flash-options-seq" value=""/>
127127
<property key="fill-flash-options-what" value="0"/>
128128
<property key="generate-16-bit-code" value="false"/>
129-
<property key="generate-cross-reference-file" value="true"/>
129+
<property key="generate-cross-reference-file" value="false"/>
130130
<property key="generate-micro-compressed-code" value="false"/>
131131
<property key="heap-size" value=""/>
132132
<property key="input-libraries" value=""/>
@@ -136,12 +136,12 @@
136136
<property key="oXC32ld-extra-opts" value=""/>
137137
<property key="optimization-level" value=""/>
138138
<property key="preprocessor-macros" value=""/>
139-
<property key="remove-unused-sections" value="true"/>
140-
<property key="report-memory-usage" value="true"/>
139+
<property key="remove-unused-sections" value="false"/>
140+
<property key="report-memory-usage" value="false"/>
141141
<property key="stack-size" value=""/>
142-
<property key="symbol-stripping" value="-s"/>
142+
<property key="symbol-stripping" value=""/>
143143
<property key="trace-symbols" value=""/>
144-
<property key="warn-section-align" value="true"/>
144+
<property key="warn-section-align" value="false"/>
145145
</C32-LD>
146146
<C32CPP>
147147
<property key="additional-warnings" value="false"/>

‎src/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include "main.h"
55

66

7-
8-
const unsigned char bootloaderNSName[] = "neuronrobotics.bootloader.*;0.3;;\0";
9-
10-
const unsigned char infoNSName[] = "neuronrobotics.dyio._rev;0.3;;\0";
7+
//
8+
//const unsigned char bootloaderNSName[] = "neuronrobotics.bootloader.*;0.3;;\0";
9+
//
10+
//const unsigned char infoNSName[] = "neuronrobotics.dyio._rev;0.3;;\0";
1111

1212

1313

0 commit comments

Comments
 (0)