Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 03:54:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolved weird merge

Browse Source
This commit is contained in:
Alden Hart
2016-08-28 16:41:46 -04:00
parent 0c6f0dc24e
commit f6113db23f
5 changed files with 30 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+25 -7
View File
@@ -1,10 +1,28 @@
---
language: c
before_install:
- sudo apt-get update -q
- sudo apt-get update -q
install:
- sudo apt-get install -qq lib32z1
script: "cd Tools && make && cd ../TinyG2 && make"
- sudo apt-get install -qq lib32z1
script:
- cd g2core
- make VERBOSE=1 COLOR=0 CONFIG=TestV9
- make VERBOSE=1 COLOR=0 CONFIG=Othermill
- make VERBOSE=1 COLOR=0 CONFIG=PrintrbotSimple1608
- make VERBOSE=1 COLOR=0 CONFIG=sbv300
deploy:
provider: releases
api_key:
secure: hBB3dHzLM97onnpneoxpewDFYfmcDmeE6FPFRxplaGYROO7SjML8orFCGMLX1cEIlvn4lwzAB+NlE2kreujxiB/gEdZy5DNk8ts+QrbfRXax/VmCNgZYp0tOVn037UFi39rKzx8olbFTImdQypMVf5mdbusY64hTpWrrsZ4uBoU=
file:
- bin/Othermill-g2v9k/g2core.elf
- bin/Othermill-g2v9k/g2core.bin
- bin/PrintrbotSimple1608-printrboardG2v3/g2core.elf
- bin/PrintrbotSimple1608-printrboardG2v3/g2core.bin
- bin/TestV9-g2v9k/g2core.elf
- bin/TestV9-g2v9k/g2core.bin
- bin/sbv300-sbv300/g2core.elf
- bin/sbv300-sbv300/g2core.bin
skip_cleanup: true
on:
repo: synthetos/g2
#tags: true
Motate
+1 -1
Submodule Motate updated: b53a07db7b...a353750980
g2core/board/G2v9.mk
+1 -1
View File
@@ -39,7 +39,7 @@ ifeq ("$(BASE_BOARD)","g2v9")
export CHIP
CHIP_LOWERCASE = sam3x8c
BOARD_PATH = ./board/g2v9
BOARD_PATH = ./board/G2v9
SOURCE_DIRS += ${BOARD_PATH} device/step_dir_driver
PLATFORM_BASE = ${MOTATE_PATH}/platform/atmel_sam
g2core/boards.mk
+3 -3
View File
@@ -104,21 +104,21 @@ ifeq ("$(CONFIG)","PrintrbotPlus")
ifeq ("$(BOARD)","NONE")
BOARD=printrboardG2v3
endif
SETTINGS_FILE="settings_printrbot_plus.h"
SETTINGS_FILE="settings_Printrbot_Plus.h"
endif
ifeq ("$(CONFIG)","PrintrbotSimple1403")
ifeq ("$(BOARD)","NONE")
BOARD=printrboardG2v3
endif
SETTINGS_FILE="settings_printrbot_simple_1403.h"
SETTINGS_FILE="settings_Printrbot_Simple_1403.h"
endif
ifeq ("$(CONFIG)","PrintrbotSimple1608")
ifeq ("$(BOARD)","NONE")
BOARD=printrboardG2v3
endif
SETTINGS_FILE="settings_printrbot_simple_1608.h"
SETTINGS_FILE="settings_Printrbot_Simple_1608.h"
endif
ifeq ("$(CONFIG)","PrintrbotPlay")
g2core/g2core.xcodeproj/project.pbxproj
-44
View File
@@ -291,20 +291,6 @@
passBuildSettingsInEnvironment = 1;
productName = g3_due;
};
D4A590981D6BA607004BF232 /* G2 gShield copy */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION) VERBOSE=1 COLOR=0 OPTIMIZATION=s BOARD=gShield";
buildConfigurationList = D4A590991D6BA607004BF232 /* Build configuration list for PBXLegacyTarget "G2 gShield copy" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
buildWorkingDirectory = .;
dependencies = (
);
name = "G2 gShield copy";
passBuildSettingsInEnvironment = 1;
productName = g3_due;
};
D4AC391A1C7BAB8E0098D685 /* G2 sbv300 */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION) VERBOSE=1 COLOR=0 CONFIG=sbv300 DEBUG=2";
@@ -426,7 +412,6 @@
D4F226F31D088A48008ED57C /* G2 gQuintic PrintrbotPlus */,
D43FF7141D537A5C00FB5B53 /* G2 gQuadratic Test */,
D457112317053BFB00EA19A8 /* index */,
D4A590981D6BA607004BF232 /* G2 gShield copy */,
);
};
/* End PBXProject section */
@@ -634,26 +619,6 @@
};
name = Release;
};
D4A5909A1D6BA607004BF232 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BOARD = ArduinoDue;
PATH = "$PATH:/usr/local/gcc-arm-none-eabi/bin";
PLATFORM = atmel_sam;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
D4A5909B1D6BA607004BF232 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BOARD = ArduinoDue;
PATH = "$PATH:/usr/local/gcc-arm-none-eabi/bin";
PLATFORM = atmel_sam;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
D4AC391C1C7BAB8E0098D685 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -791,15 +756,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D4A590991D6BA607004BF232 /* Build configuration list for PBXLegacyTarget "G2 gShield copy" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D4A5909A1D6BA607004BF232 /* Debug */,
D4A5909B1D6BA607004BF232 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D4AC391B1C7BAB8E0098D685 /* Build configuration list for PBXLegacyTarget "G2 sbv300" */ = {
isa = XCConfigurationList;
buildConfigurations = (