Skip to content
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

Cmsis update #37

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
6515266
CB: added linker scripts for samd51. no clue if they work
wallarug Jun 13, 2019
75df0e7
CB: added samd51 libs from http://packs.download.atmel.com/
wallarug Jun 13, 2019
1708e14
CB: added samd51 Device_Startup from gcc folder
wallarug Jun 13, 2019
521180b
CB: added samd51 Device_Startup from gcc folder
wallarug Jun 13, 2019
776e494
CB: added samd51 scripts template
wallarug Jun 13, 2019
a2ca91b
CB: modified samd51 scripts
wallarug Jun 13, 2019
0a73134
added robohat samd51 variant
wallarug Jun 16, 2019
13896d7
updated mk file
wallarug Jun 16, 2019
8a0f8f2
change touch over to adc pins. this saves lots of time.
wallarug Jun 16, 2019
7d83070
updated timer settings in robohatmm151 folder
wallarug Jun 16, 2019
79873e2
further changes to robohatmm151 build
wallarug Jun 16, 2019
87008fd
updated seesawconfig.h
wallarug Jun 22, 2019
cb14ce6
added samd51 to board_init.h from arduino
wallarug Jun 22, 2019
3b20cf7
fixed up constants for clock generators
wallarug Jun 22, 2019
7c7b74d
Merge branch 'master' of https://github.com/wallarug/seesaw
wallarug Jun 22, 2019
ffb9f11
AOTimer.cpp: added a new variable for setting the correct Peipheral …
wallarug Jun 22, 2019
d60154c
updated crickit
wallarug Jun 22, 2019
ea4a1b7
updated crickithat
wallarug Jun 22, 2019
9801bac
updated robohatmm1. timers, no touch, adc.
wallarug Jun 22, 2019
edb9f8e
updated robohatmm151
wallarug Jun 22, 2019
4735350
fixed up some issues with board_init.h
wallarug Jun 22, 2019
9ae2c48
missing endif
wallarug Jun 22, 2019
31acd83
fixed missing variables - slightly different variables between seesaw…
wallarug Jun 22, 2019
67dc831
removing references to qspi and bkupram from linker script for samd51…
wallarug Jun 22, 2019
a5bea51
updated MakeFile for samd51
wallarug Jun 22, 2019
9d93080
source/bsp.cpp needs a total rework since SAMD51 uses MCLK for initia…
wallarug Jun 22, 2019
40e2d82
updated robohatmm151
wallarug Jun 22, 2019
91e9af6
testing samd51 MCLK instead of PM
wallarug Jun 22, 2019
cbba49b
arduino: SERCOM.cpp - example of how to configure sercom for samd51
wallarug Jun 22, 2019
441d82a
removing bugs in bsp.cpp
wallarug Jun 23, 2019
937a804
fixed missing ;
wallarug Jun 27, 2019
411677c
missing ;
wallarug Jun 27, 2019
5392cf3
bsp.cpp
wallarug Jun 27, 2019
4084d84
cp USBCore.cpp from ardunio
wallarug Jun 27, 2019
829df68
playing with usb
wallarug Jun 27, 2019
f3fe562
playing more with USB
wallarug Jun 27, 2019
e6aa456
removed define
wallarug Jun 27, 2019
d8b2628
copied header files
wallarug Jun 27, 2019
5caedb9
removed includes
wallarug Jun 27, 2019
3815a1b
going backwards slightly
wallarug Jun 27, 2019
f137370
going backwards more
wallarug Jun 27, 2019
be6af99
bsp_adc.c
wallarug Jun 27, 2019
e0b4c28
fix EIC in bsp_gpio.h
wallarug Jun 27, 2019
b0ee52c
disallow eeprom for samd51 (no functions available)
wallarug Jun 27, 2019
08c5abe
fix typo
wallarug Jun 27, 2019
588615b
update CMSIS: https://github.com/ARM-software/CMSIS_5/releases/tag/5.…
wallarug Jun 27, 2019
76ba07a
updated core_cm4.h to try and fix index error
wallarug Jul 7, 2019
ea6cbd0
completely updated Include folder for CMSIS with version downloaded f…
wallarug Jul 7, 2019
9dd0d1a
Merge branch 'master' of https://github.com/wallarug/seesaw
wallarug Jul 7, 2019
ebaabcd
fix AOADC.cpp
wallarug Jul 7, 2019
18d5a3b
fixed for other processors AOADC.cpp
wallarug Jul 7, 2019
89984a3
found correct register
wallarug Jul 7, 2019
a78e169
still getting errors with CTRLB/ADC0 in AOADC.cpp
wallarug Jul 7, 2019
4aa28bc
changes
wallarug Jul 11, 2019
f874b65
removed WINMODE for SAMD51
wallarug Jul 11, 2019
1016e26
stripped out USB DMA
wallarug Jul 11, 2019
03eef4f
commented out bsp_dma.h from AOSERCOM.cpp
wallarug Jul 11, 2019
b645a1e
latest push from build machine
wallarug Aug 20, 2019
676266f
Merge branch 'master' of https://github.com/wallarug/seesaw
wallarug Mar 1, 2020
3c7825b
readded adafruit files
wallarug Mar 1, 2020
d569df9
commiting changes from adafruit/seesaw/master to wallarug/seesaw -b a…
wallarug Apr 2, 2020
8ba85b4
CMSIS 5.6.0 - manually updated files. The directory structure has ch…
wallarug Apr 2, 2020
cbfeb99
CMSIS 5.6.0 (RTX) - manually updated files. The directory structure …
wallarug Apr 2, 2020
b4704a4
CMSIS 5.6.0 - manually updated files. The directory structure has ch…
wallarug Apr 2, 2020
3fff46a
CMSIS 5.6.0 - manually updated files. The directory structure has ch…
wallarug Apr 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 23 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ OBJECTS = $(patsubst %.cpp,$(BUILD_PATH)/%.o,$(FULL_SOURCES))

NAME=seesaw-$(BOARD)
EXECUTABLE=$(BUILD_PATH)/$(NAME).bin
ARTIFACT=fw/$(NAME).bin

all: dirs $(EXECUTABLE)

Expand All @@ -154,6 +155,13 @@ dirs:
-@mkdir -p $(BUILD_PATH)/source/USB
-@mkdir -p $(BUILD_PATH)/Device_Startup
-@mkdir -p $(BUILD_PATH)/bsp
-@mkdir -p fw

.PHONY: artifact
artifact: $(ARTIFACT)
$(ARTIFACT): $(EXECUTABLE)
@cp $< $@


$(EXECUTABLE): $(SOBJECTS) $(COBJECTS) $(OBJECTS)
$(CC) -L$(BUILD_PATH) $(LDFLAGS) \
Expand All @@ -164,20 +172,24 @@ $(EXECUTABLE): $(SOBJECTS) $(COBJECTS) $(OBJECTS)
-@arm-none-eabi-size $(BUILD_PATH)/$(NAME).elf
@echo

$(BUILD_PATH)/%.o: %.S $(wildcard include/*.h boards/*/*.h)
echo "$<"
$(CC) $(SFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
$(BUILD_PATH)/%.o: %.S $(wildcard include/*.h boards/*/*.h) | dirs
@echo "$<"
@$(CC) $(SFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@

$(BUILD_PATH)/%.o: %.c $(wildcard include/*.h boards/*/*.h)
echo "$<"
$(CC) $(CFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
$(BUILD_PATH)/%.o: %.c $(wildcard include/*.h boards/*/*.h) | dirs
@echo "$<"
@$(CC) $(CFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@

$(BUILD_PATH)/%.o: %.cpp $(wildcard include/*.h boards/*/*.h)
echo "$<"
$(CXX) $(CXXFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
$(BUILD_PATH)/%.o: %.cpp $(wildcard include/*.h boards/*/*.h) | dirs
@echo "$<"
@$(CXX) $(CXXFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@

clean:
rm -rf build

all-boards:
for f in `cd boards; ls` ; do "$(MAKE)" BOARD=$$f ; done
.PHONY: board-%
board-%:
$(MAKE) BOARD=$* artifact

.PHONY: all-boards
all-boards: $(patsubst %, board-%, $(shell cd boards; ls))
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ variety of capabilities such as UART, ADC, DAC, extra GPIO, etc. to chips that d

# Interfacing
- [Arduino](https://github.com/adafruit/Adafruit_Seesaw)
- [CircuitPython](https://github.com/adafruit/Adafruit_CircuitPython_seesaw)
- [Python](https://github.com/adafruit/Adafruit_Python_seesaw)
- [CircuitPython and Python](https://github.com/adafruit/Adafruit_CircuitPython_seesaw)

## Build

Expand All @@ -15,7 +14,7 @@ variety of capabilities such as UART, ADC, DAC, extra GPIO, etc. to chips that d
* `make` and a Unix environment
* `python` in path
* `arm-none-eabi-gcc` and `arm-none-eabi-g++` in the path

- For Ubuntu 18.04, follow these [setup instructions](https://learn.adafruit.com/building-circuitpython/linux#install-build-tools-on-ubuntu-2-2)
### Build commands

The default board is `debug`. You can build a different one using:
Expand Down
4 changes: 4 additions & 0 deletions boards/soil/board_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
//* ============== TOUCH =================== *//
#define CONFIG_TOUCH 1

#define TOUCH_OVERSAMPLE OVERSAMPLE_64
#define TOUCH_RESISTOR RESISTOR_100K
#define TOUCH_FREQMODE FREQ_MODE_SPREAD

#define CONFIG_TOUCH0 1
#define CONFIG_TOUCH1 0
#define CONFIG_TOUCH2 0
Expand Down
Loading