kopia lustrzana https://github.com/SP8EBC/ParaTNC
one-wire moved from pins conflicting with i2c. ELF name changed
rodzic
7825b575f6
commit
4b562d3e3b
|
@ -51,38 +51,38 @@ endif
|
|||
|
||||
# Add inputs and outputs from these tool invocations to the build variables
|
||||
SECONDARY_FLASH += \
|
||||
ParaTNC-ARM-lite.hex \
|
||||
ParaTNC.hex \
|
||||
|
||||
SECONDARY_SIZE += \
|
||||
ParaTNC-ARM-lite.siz \
|
||||
ParaTNC.siz \
|
||||
|
||||
|
||||
# All Target
|
||||
all: ParaTNC-ARM-lite.elf secondary-outputs
|
||||
all: ParaTNC.elf secondary-outputs
|
||||
|
||||
# Tool invocations
|
||||
ParaTNC-ARM-lite.elf: $(OBJS) $(USER_OBJS)
|
||||
ParaTNC.elf: $(OBJS) $(USER_OBJS)
|
||||
@echo 'Building target: $@'
|
||||
@echo 'Invoking: Cross ARM C++ Linker'
|
||||
arm-none-eabi-g++ -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -T mem.ld -T libs.ld -T sections.ld -nostartfiles -Xlinker --gc-sections -L"../ldscripts" -Wl,-Map,"ParaTNC-ARM-lite.map" --specs=nano.specs -u _printf_float -o "ParaTNC-ARM-lite.elf" $(OBJS) $(USER_OBJS) $(LIBS)
|
||||
arm-none-eabi-g++ -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -T mem.ld -T libs.ld -T sections.ld -nostartfiles -Xlinker --gc-sections -L"../ldscripts" -Wl,-Map,"ParaTNC.map" --specs=nano.specs -u _printf_float -o "ParaTNC.elf" $(OBJS) $(USER_OBJS) $(LIBS)
|
||||
@echo 'Finished building target: $@'
|
||||
@echo ' '
|
||||
|
||||
ParaTNC-ARM-lite.hex: ParaTNC-ARM-lite.elf
|
||||
ParaTNC.hex: ParaTNC.elf
|
||||
@echo 'Invoking: Cross ARM GNU Create Flash Image'
|
||||
arm-none-eabi-objcopy -O ihex "ParaTNC-ARM-lite.elf" "ParaTNC-ARM-lite.hex"
|
||||
arm-none-eabi-objcopy -O ihex "ParaTNC.elf" "ParaTNC.hex"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
ParaTNC-ARM-lite.siz: ParaTNC-ARM-lite.elf
|
||||
ParaTNC.siz: ParaTNC.elf
|
||||
@echo 'Invoking: Cross ARM GNU Print Size'
|
||||
arm-none-eabi-size --format=berkeley "ParaTNC-ARM-lite.elf"
|
||||
arm-none-eabi-size --format=berkeley "ParaTNC.elf"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
# Other Targets
|
||||
clean:
|
||||
-$(RM) $(CC_DEPS)$(C++_DEPS)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(SECONDARY_FLASH)$(SECONDARY_SIZE)$(ASM_DEPS)$(S_UPPER_DEPS)$(C_DEPS)$(CPP_DEPS) ParaTNC-ARM-lite.elf
|
||||
-$(RM) $(CC_DEPS)$(C++_DEPS)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(SECONDARY_FLASH)$(SECONDARY_SIZE)$(ASM_DEPS)$(S_UPPER_DEPS)$(C_DEPS)$(CPP_DEPS) ParaTNC.elf
|
||||
-@echo ' '
|
||||
|
||||
secondary-outputs: $(SECONDARY_FLASH) $(SECONDARY_SIZE)
|
||||
|
|
|
@ -192,7 +192,7 @@ main(int argc, char* argv[])
|
|||
TX20Init();
|
||||
#endif
|
||||
#ifdef _DALLAS_AS_TELEM
|
||||
dallas_init(GPIOB, GPIO_Pin_5, GPIO_PinSource5); // B5 output, B6 input
|
||||
dallas_init(GPIOC, GPIO_Pin_11, GPIO_PinSource11); // B5 output, B6 input
|
||||
#endif
|
||||
|
||||
// initializing UART drvier
|
||||
|
|
Ładowanie…
Reference in New Issue