-
Notifications
You must be signed in to change notification settings - Fork 59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
maintainership conversation (and some of my fixes :P) #31
Open
urjaman
wants to merge
7
commits into
stancecoke:Master
Choose a base branch
from
urjaman:general-improvements-2307
base: Master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+264
−304
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ec5ba7b
ignore all the timestamp settings
urjaman 103494a
set input pullup on unused pins
urjaman f6372da
uart: a non-waiting getch
urjaman 7b16d72
adc: read using volatile ptrs
urjaman d9b9848
motor variable access cleanup (ISR vs mainloop)
urjaman 0e4f520
Makefile unification
urjaman 34b15c5
configurator: add linux-support and apply_config.sh
urjaman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,4 @@ Debug | |
| /tools/JavaConfigurator/dist/ | ||
| /nbproject/private/ | ||
| /Result.log | ||
| experimental settings/*-*.ini | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,101 @@ | ||
| #Makefile for STM8 Examples with SDCC compiler | ||
| #Author: Saeid Yazdani | ||
| #Website: WWW.EMBEDONIX.COM | ||
| #Copyright 2016 | ||
| #LICENSE: GNU-LGPL | ||
|
|
||
| .PHONY: all clean | ||
|
|
||
| #Compiler | ||
| CC = sdcc | ||
| OBJCOPY = stm8-objcopy | ||
| SIZE = stm8-size | ||
|
|
||
| #Platform | ||
| PLATFORM = stm8 | ||
|
|
||
| #Product name | ||
| PNAME = main | ||
|
|
||
| #Directory for helpers | ||
| IDIR = StdPeriphLib/inc | ||
| SDIR = StdPeriphLib/src | ||
|
|
||
| # In case you ever want a different name for the main source file | ||
| MAINSRC = $(PNAME).c | ||
|
|
||
| ELF_SECTIONS_TO_REMOVE = -R DATA -R INITIALIZED -R SSEG -R .debug_line -R .debug_loc -R .debug_abbrev -R .debug_info -R .debug_pubnames -R .debug_frame | ||
|
|
||
| # These are the sources that must be compiled to .rel files: | ||
| EXTRASRCS = \ | ||
| $(SDIR)/stm8s_itc.c \ | ||
| $(SDIR)/stm8s_clk.c \ | ||
| $(SDIR)/stm8s_iwdg.c \ | ||
| $(SDIR)/stm8s_gpio.c \ | ||
| $(SDIR)/stm8s_exti.c \ | ||
| $(SDIR)/stm8s_uart2.c \ | ||
| $(SDIR)/stm8s_tim1.c \ | ||
| $(SDIR)/stm8s_tim2.c \ | ||
| $(SDIR)/stm8s_adc1.c \ | ||
| $(SDIR)/stm8s_flash.c \ | ||
| BOdisplay.c \ | ||
| ACAcontrollerState.c \ | ||
| ACAeeprom.c \ | ||
| ACAsetPoint.c \ | ||
| ACAcommons.c \ | ||
| gpio.c \ | ||
| cruise_control.c \ | ||
| uart.c \ | ||
| adc.c \ | ||
| brake.c \ | ||
| timers.c \ | ||
| pwm.c \ | ||
| motor.c \ | ||
| PAS.c \ | ||
| SPEED.c \ | ||
| display.c \ | ||
| display_kingmeter.c | ||
|
|
||
| HEADERS = BOdisplay.h ACAcommons.h ACAsetPoint.h ACAcontrollerState.h ACAeeprom.h adc.h brake.h cruise_control.h gpio.h interrupts.h main.h motor.h pwm.h timers.h uart.h PAS.h SPEED.h | ||
|
|
||
| # The list of .rel files can be derived from the list of their source files | ||
| RELS = $(EXTRASRCS:.c=.rel) | ||
|
|
||
| INCLUDES = -I$(IDIR) -I. | ||
| CFLAGS = -m$(PLATFORM) --std-c99 --nolospre | ||
| ELF_FLAGS = --out-fmt-ihx --debug | ||
| LIBS = | ||
| # This just provides the conventional target name "all"; it is optional | ||
| # Note: I assume you set PNAME via some means not exhibited in your original file | ||
| all: $(PNAME) | ||
|
|
||
| # How to build the overall program | ||
|
|
||
| $(PNAME): $(MAINSRC) $(RELS) | ||
| $(CC) $(INCLUDES) $(CFLAGS) $(ELF_FLAGS) $(LIBS) $(MAINSRC) $(RELS) | ||
| # $(SIZE) $(PNAME).elf | ||
| # $(OBJCOPY) -O binary $(ELF_SECTIONS_TO_REMOVE) | ||
| # $(PNAME).elf $(PNAME).bin | ||
|
|
||
| # How to build any .rel file from its corresponding .c file | ||
| # GNU would have you use a pattern rule for this, but that's GNU-specific | ||
| %.rel: %.c $(HEADERS) | ||
| $(CC) -c $(INCLUDES) $(CFLAGS) $(ELF_FLAGS) $(LIBS) -o$< $< | ||
|
|
||
| # Suffixes appearing in suffix rules we care about. | ||
| # Necessary because .rel is not one of the standard suffixes. | ||
| .SUFFIXES: .c .rel | ||
|
|
||
| # hex: | ||
| # $(OBJCOPY) -O ihex $(ELF_SECTIONS_TO_REMOVE) $(PNAME).elf | ||
| # $(PNAME).ihx | ||
|
|
||
| # flash: | ||
| # stm8flash -cstlinkv2 -pstm8s105?6 -w$(PNAME).ihx | ||
|
|
||
| ENTF = cmd /C del | ||
|
|
||
| clean: | ||
| echo "Cleaning files..." | ||
| $(ENTF) *.asm | ||
| $(ENTF) *.rel | ||
| $(ENTF) *.lk | ||
| $(ENTF) *.lst | ||
| $(ENTF) *.rst | ||
| $(ENTF) *.sym | ||
| $(ENTF) *.cdb | ||
| $(ENTF) *.map | ||
| $(ENTF) *.adb | ||
| echo "Done." | ||
|
|
||
| #Original Makefile template from Saeid Yazdani (c) 2016 | ||
| #LICENSE: GNU-LGPL | ||
|
|
||
| .PHONY: all clean | ||
|
|
||
| #Compiler | ||
| CC = sdcc | ||
|
|
||
| #Platform | ||
| PLATFORM = stm8 | ||
|
|
||
| #Product name | ||
| PNAME = main | ||
|
|
||
| #Directory for helpers | ||
| IDIR = StdPeriphLib/inc | ||
| SDIR = StdPeriphLib/src | ||
|
|
||
| # In case you ever want a different name for the main source file | ||
| MAINSRC = $(PNAME).c | ||
|
|
||
| # These are the sources that must be compiled to .rel files: | ||
| EXTRASRCS = \ | ||
| $(SDIR)/stm8s_itc.c \ | ||
| $(SDIR)/stm8s_clk.c \ | ||
| $(SDIR)/stm8s_iwdg.c \ | ||
| $(SDIR)/stm8s_gpio.c \ | ||
| $(SDIR)/stm8s_exti.c \ | ||
| $(SDIR)/stm8s_uart2.c \ | ||
| $(SDIR)/stm8s_tim1.c \ | ||
| $(SDIR)/stm8s_tim2.c \ | ||
| $(SDIR)/stm8s_adc1.c \ | ||
| $(SDIR)/stm8s_flash.c \ | ||
| BOdisplay.c \ | ||
| ACAcontrollerState.c \ | ||
| ACAeeprom.c \ | ||
| ACAsetPoint.c \ | ||
| ACAcommons.c \ | ||
| gpio.c \ | ||
| cruise_control.c \ | ||
| uart.c \ | ||
| adc.c \ | ||
| brake.c \ | ||
| timers.c \ | ||
| pwm.c \ | ||
| motor.c \ | ||
| PAS.c \ | ||
| SPEED.c \ | ||
| display.c \ | ||
| display_kingmeter.c | ||
|
|
||
| HEADERS = BOdisplay.h ACAcommons.h ACAsetPoint.h ACAcontrollerState.h ACAeeprom.h adc.h brake.h cruise_control.h gpio.h interrupts.h main.h motor.h pwm.h timers.h uart.h PAS.h SPEED.h | ||
|
|
||
| # The list of .rel files can be derived from the list of their source files | ||
| RELS = $(EXTRASRCS:.c=.rel) | ||
|
|
||
| INCLUDES = -I$(IDIR) -I. | ||
| CFLAGS = -m$(PLATFORM) --std-c99 --nolospre | ||
| ELF_FLAGS = --out-fmt-ihx --debug | ||
| LIBS = | ||
| # This just provides the conventional target name "all"; it is optional | ||
| # Note: I assume you set PNAME via some means not exhibited in your original file | ||
| all: $(PNAME) | ||
|
|
||
| # How to build the overall program | ||
|
|
||
| $(PNAME): $(MAINSRC) $(RELS) | ||
| $(CC) $(INCLUDES) $(CFLAGS) $(ELF_FLAGS) $(LIBS) $(MAINSRC) $(RELS) | ||
|
|
||
| # How to build any .rel file from its corresponding .c file | ||
| # GNU would have you use a pattern rule for this, but that's GNU-specific | ||
| %.rel: %.c $(HEADERS) | ||
| $(CC) -c $(INCLUDES) $(CFLAGS) $(ELF_FLAGS) $(LIBS) -o$< $< | ||
|
|
||
| # Suffixes appearing in suffix rules we care about. | ||
| # Necessary because .rel is not one of the standard suffixes. | ||
| .SUFFIXES: .c .rel | ||
|
|
||
|
|
||
| flash: | ||
| stm8flash -cstlinkv2 -pstm8s105?6 -w$(PNAME).ihx | ||
|
|
||
|
|
||
| ifeq ($(OS),Windows_NT) | ||
| ENTF = cmd /C del | ||
| else | ||
| ENTF = rm -f | ||
| endif | ||
|
|
||
| clean: | ||
| echo "Cleaning files..." | ||
| $(ENTF) *.asm | ||
| $(ENTF) *.rel | ||
| $(ENTF) *.lk | ||
| $(ENTF) *.lst | ||
| $(ENTF) *.rst | ||
| $(ENTF) *.sym | ||
| $(ENTF) *.cdb | ||
| $(ENTF) *.map | ||
| $(ENTF) *.adb | ||
| echo "Done." |
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These might want to be shared nonetheless?