Skip to content

Commit

Permalink
Merge remote-tracking branch 'microsoft/master' into microsoft-merge-…
Browse files Browse the repository at this point in the history
…2018-03-20
  • Loading branch information
dhalbert committed Mar 20, 2018
2 parents 82bda09 + 1f706a1 commit 8a2bfea
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ EXECUTABLE=$(BUILD_PATH)/$(NAME).bin
SELF_EXECUTABLE=$(BUILD_PATH)/update-$(NAME).uf2
SELF_EXECUTABLE_INO=$(BUILD_PATH)/update-$(NAME).ino

all: dirs $(EXECUTABLE) $(SELF_EXECUTABLE)
SUBMODULES = lib/uf2/README.md

all: $(SUBMODULES) dirs $(EXECUTABLE) $(SELF_EXECUTABLE)

r: run
b: burn
Expand Down Expand Up @@ -178,3 +180,6 @@ all-boards:
for f in `cd boards; ls` ; do "$(MAKE)" BOARD=$$f drop-board || break; done

drop: all-boards drop-pkg

$(SUBMODULES):
git submodule update --init --recursive
20 changes: 20 additions & 0 deletions boards/dadamachines-automat/board_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#ifndef BOARD_CONFIG_H
#define BOARD_CONFIG_H

#define __SAMD21G18A__ 1

#define VENDOR_NAME "dadamachines"
#define PRODUCT_NAME "automat"
#define VOLUME_LABEL "AUTOMAT"
#define INDEX_URL "http://dadamachines.com/"
#define BOARD_ID "SAMD21G18A-dadamachines-automat-v0"

#define USB_VID 0x16D0
#define USB_PID 0x0CDA
#define USB_POWER_MA 20

#define LED_PIN PIN_PA17
//#define LED_TX_PIN PIN_PA27
//#define LED_RX_PIN PIN_PB03

#endif
17 changes: 17 additions & 0 deletions boards/eitech-robotics/board_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef BOARD_CONFIG_H
#define BOARD_CONFIG_H

#define __SAMD21G18A__ 1

#define VENDOR_NAME "Eitech"
#define PRODUCT_NAME "Robotics"
#define VOLUME_LABEL "ROBOTICS"
#define INDEX_URL "http://www.eitech.de/"
#define BOARD_ID "SAMD21G18A-Eitech-Robotics-v0"

#define USB_VID 0x1D50
#define USB_PID 0x6110 // PID from Openmoko Project

#define LED_PIN PIN_PA30

#endif
18 changes: 18 additions & 0 deletions boards/sensebox-mcu/board_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#ifndef BOARD_CONFIG_H
#define BOARD_CONFIG_H

#define __SAMD21G18A__ 1

#define VENDOR_NAME "eduSense"
#define PRODUCT_NAME "senseBox MCU"
#define VOLUME_LABEL "SENSEBOX"
#define INDEX_URL "http://www.sensebox.de"
#define BOARD_ID "SAMD21G18A-senseBox-MCU-v0"

#define USB_VID 0x04D8
#define USB_PID 0xEF66 // PID sublicensed from Microchip
#define USB_POWER_MA 20

#define LED_PIN PIN_PA27 // red LED

#endif
17 changes: 17 additions & 0 deletions boards/wattuino-rc/board_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef BOARD_CONFIG_H
#define BOARD_CONFIG_H

#define __SAMD21G18A__ 1

#define VENDOR_NAME "Watterott electronic"
#define PRODUCT_NAME "Wattuino RC"
#define VOLUME_LABEL "RCBOOT"
#define INDEX_URL "http://www.watterott.com"
#define BOARD_ID "SAMD21G18A-Wattuino-RC-v0"

#define USB_VID 0x1D50
#define USB_PID 0x6112 // PID from Openmoko Project

#define LED_PIN PIN_PA30

#endif

0 comments on commit 8a2bfea

Please sign in to comment.