aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD Delmar Davis <don@suspectdevices.com>2018-03-03 22:33:10 -0800
committerD Delmar Davis <don@suspectdevices.com>2018-03-03 22:33:10 -0800
commit09fc6b732af6fa6a286263c2d7d7f449014bc4d7 (patch)
tree6af79787a5601fcbd1dab2e2c9a63b0847e1080d
parent5ffca99f3d4e82db3880305be2125d498e791bc1 (diff)
Cleanup for platformio migration
-rwxr-xr-xArduino/bin/README_Load.txt38
-rwxr-xr-xArduino/bin/build.sh36
-rwxr-xr-xArduino/bin/load.sh18
-rw-r--r--ems-light.xcworkspace/contents.xcworkspacedata160
-rw-r--r--ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstatebin16465 -> 0 bytes
-rwxr-xr-xsrc/Clock.cpp (renamed from Arduino/ems-light/Clock.cpp)0
-rwxr-xr-xsrc/Clock.h (renamed from Arduino/ems-light/Clock.h)0
-rwxr-xr-xsrc/Configuration.h (renamed from Arduino/ems-light/Configuration.h)0
-rwxr-xr-xsrc/Machine.cpp (renamed from Arduino/ems-light/Machine.cpp)0
-rwxr-xr-xsrc/Machine.h (renamed from Arduino/ems-light/Machine.h)0
-rwxr-xr-xsrc/Monitor.cpp (renamed from Arduino/ems-light/Monitor.cpp)0
-rwxr-xr-xsrc/Monitor.h (renamed from Arduino/ems-light/Monitor.h)0
-rwxr-xr-xsrc/SafetyThird.cpp (renamed from Arduino/ems-light/SafetyThird.cpp)0
-rwxr-xr-xsrc/SafetyThird.h (renamed from Arduino/ems-light/SafetyThird.h)0
-rwxr-xr-xsrc/TaskScheduler.h (renamed from Arduino/ems-light/TaskScheduler.h)0
-rwxr-xr-xsrc/ems-light.ino (renamed from Arduino/ems-light/ems-light.ino)0
-rwxr-xr-xsrc/keywords.h (renamed from Arduino/ems-light/keywords.h)0
17 files changed, 0 insertions, 252 deletions
diff --git a/Arduino/bin/README_Load.txt b/Arduino/bin/README_Load.txt
deleted file mode 100755
index b465e2b..0000000
--- a/Arduino/bin/README_Load.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Instructions for loading compiled binary images
- from a raspberry pi to a feather M0.
-
-First, update your pi
-sudo apt-get update && apt-get upgrade
-sudo apt-get install build-essential
-sudo apt-get install libreadline-dev wx2.8-headers libwxgtk2.8-0 libwxgtk2.8-dev
-
-next visit the page https://github.com/shumatech/BOSSA.
- clone this repo and note the folder name.
-
-next follow the instructions on the page to make the bossac and bossash files
-
-next create a script some thing like what is below:
-
------------------------------------------------------
-# load.sh - flash your arduino using a locally installed bosac
-
-# Project Variables
-INO_NAME=ems
-PROJECT_PATH=/home/pi/ems/Arduino
-
-# Local System variables
-PORT=ttyACM0
-PACKAGES_PATH=/home/pi/BOSSA/bin
-BUILD_PATH=$PROJECT_PATH/build
-
-# Arduino compile tools are here:
-BOSSAC_PATH=$PACKAGES_PATH
-
-# load to the feather if possible
-$BOSSAC_PATH/bossac -i -d --port=$PORT -U true -i -e -w -v $BUILD_PATH/$INO_NAME.ino.bin -R
--------------------------------------------------------
-
-Note that if you do not know the port of the device, you can remove the --port=PORT and bossac will attempt to find the port.
-
-
-
diff --git a/Arduino/bin/build.sh b/Arduino/bin/build.sh
deleted file mode 100755
index fecf63a..0000000
--- a/Arduino/bin/build.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# build.sh - build the ems arduino code and flash it
-
-# Project Variables
-INO_NAME=ems
-PROJECT_PATH=/home/pi/ems/Arduino
-
-# Local System variables
-PORT=ttyACM0
-ARDUINO_PATH=/home/pi/arduino-1.6.12
-PACKAGES_PATH=/home/pi/.arduino15/packages
-
-# Arduino compile tools are here:
-TOOL_PATH=$PACKAGES_PATH/arduino/tools
-HARDWARE_PATH=$PACKAGES_PATH/arduino/hardware
-TOOLS="-tools $ARDUINO_PATH/tools-builder -tools $ARDUINO_PATH/hardware/tools/avr -tools $PACKAGES_PATH"
-HARDWARE="-hardware $HARDWARE_PATH -hardware $PACKAGES_PATH"
-BUILD_PATH=$PROJECT_PATH/build
-CMSIS_PATH=$PACKAGES_PATH/arduino/tools/CMSIS/4.0.0-atmel
-GCC_PATH=$PACKAGES_PATH/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1
-BOSSAC_PATH=$PACKAGES_PATH/arduino/tools/bossac/1.7.0
-OPENOCD_PATH=$PACKAGES_PATH/arduino/tools/openocd/0.9.0-arduino
-SOURCE_PATH=$PROJECT_PATH/
-
-ARDUINO=/home/pi/arduino-1.6.12/arduino-builder
-TOOLS_BUILDER=/home/pi/arduino-1.6.12/tools-builder
-
-# make sure our build folder exists
-mkdir -p $BUILD_PATH
-
-# compile and install
-$ARDUINO -dump-prefs -logger=machine $HARDWARE $TOOLS -built-in-libraries $ARDUINO_PATH/libraries -libraries $PROJECT_PATH/libraries -fqbn=adafruit:samd:adafruit_feather_m0 -vid-pid=0X239A_0X800B -ide-version=10612 -build-path $BUILD_PATH -warnings=all -prefs=build.warn_data_percentage=75 -prefs=runtime.tools.CMSIS.path=$CMSIS_PATH -prefs=runtime.tools.arm-none-eabi-gcc.path=$GCC_PATH -prefs=runtime.tools.bossac.path=$BOSSAC_PATH -prefs=runtime.tools.openocd.path=$OPENOCD_PATH -verbose $PROJECT_PATH/$INO_NAME/$INO_NAME.ino
-$ARDUINO -compile -logger=machine $HARDWARE $TOOLS -built-in-libraries $ARDUINO_PATH/libraries -libraries $PROJECT_PATH/libraries -fqbn=adafruit:samd:adafruit_feather_m0 -vid-pid=0X239A_0X800B -ide-version=10612 -build-path $BUILD_PATH -warnings=all -prefs=build.warn_data_percentage=75 -prefs=runtime.tools.CMSIS.path=$CMSIS_PATH -prefs=runtime.tools.arm-none-eabi-gcc.path=$GCC_PATH -prefs=runtime.tools.bossac.path=$BOSSAC_PATH -prefs=runtime.tools.openocd.path=$OPENOCD_PATH -verbose $PROJECT_PATH/$INO_NAME/$INO_NAME.ino
-
-# load to the feather if possible
-$BOSSAC_PATH/bossac -i -d --port=$PORT -U true -i -e -w -v $BUILD_PATH/$INO_NAME.ino.bin -R
-
diff --git a/Arduino/bin/load.sh b/Arduino/bin/load.sh
deleted file mode 100755
index 0446f55..0000000
--- a/Arduino/bin/load.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# load.sh - flash your arduino using a locally installed bosac
-
-# Project Variables
-INO_NAME=ems
-PROJECT_PATH=/home/pi/ems/Arduino
-
-# Local System variables
-PORT=ttyACM0
-PACKAGES_PATH=/home/pi/BOSSA/bin
-BUILD_PATH=$PROJECT_PATH/build
-
-# Arduino compile tools are here:
-BOSSAC_PATH=$PACKAGES_PATH
-
-# load to the feather if possible
-#$BOSSAC_PATH/bossac -i -d -U true -i -e -w -v $BUILD_PATH/$INO_NAME.ino.bin -R
-$BOSSAC_PATH/bossac -i -d --port=$PORT -U true -i -e -w -v $BUILD_PATH/$INO_NAME.ino.bin -R
-
diff --git a/ems-light.xcworkspace/contents.xcworkspacedata b/ems-light.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 174456a..0000000
--- a/ems-light.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <Group
- location = "group:Arduino"
- name = "Arduino">
- <Group
- location = "group:ems-light"
- name = "ems-light">
- <FileRef
- location = "group:Clock.cpp">
- </FileRef>
- <FileRef
- location = "group:Clock.h">
- </FileRef>
- <FileRef
- location = "group:/Users/don/Documents/2017/ems-light/Arduino/ems-light/Configuration.h">
- </FileRef>
- <FileRef
- location = "group:ems-light.ino">
- </FileRef>
- <FileRef
- location = "group:keywords.h">
- </FileRef>
- <FileRef
- location = "group:Machine.cpp">
- </FileRef>
- <FileRef
- location = "group:Machine.h">
- </FileRef>
- <FileRef
- location = "group:Monitor.cpp">
- </FileRef>
- <FileRef
- location = "group:Monitor.h">
- </FileRef>
- <FileRef
- location = "group:SafetyThird.cpp">
- </FileRef>
- <FileRef
- location = "group:SafetyThird.h">
- </FileRef>
- <FileRef
- location = "group:TaskScheduler.h">
- </FileRef>
- </Group>
- <Group
- location = "group:ems-templates"
- name = "ems-templates">
- <FileRef
- location = "group:Heater.h">
- </FileRef>
- <FileRef
- location = "group:Pump.h">
- </FileRef>
- <FileRef
- location = "group:Thermocouple.cpp">
- </FileRef>
- <FileRef
- location = "group:Thermocouple.h">
- </FileRef>
- </Group>
- <Group
- location = "group:bin"
- name = "bin">
- <FileRef
- location = "group:build.sh">
- </FileRef>
- <FileRef
- location = "group:load.sh">
- </FileRef>
- <FileRef
- location = "group:README_Load.txt">
- </FileRef>
- </Group>
- <Group
- location = "group:libraries"
- name = "libraries">
- <Group
- location = "group:Adafruit-MAX31855"
- name = "Adafruit-MAX31855">
- </Group>
- <Group
- location = "group:Adafruit_SleepyDog"
- name = "Adafruit_SleepyDog">
- </Group>
- <FileRef
- location = "group:readme.txt">
- </FileRef>
- <Group
- location = "group:RTCZero"
- name = "RTCZero">
- </Group>
- </Group>
- </Group>
- <Group
- location = "group:console"
- name = "console">
- <FileRef
- location = "group:consoleFrame.py">
- </FileRef>
- <FileRef
- location = "group:dn.png">
- </FileRef>
- <FileRef
- location = "group:EMS.py">
- </FileRef>
- <FileRef
- location = "group:EMSConsole.py">
- </FileRef>
- <FileRef
- location = "group:images.py">
- </FileRef>
- <FileRef
- location = "group:pause.png">
- </FileRef>
- <FileRef
- location = "group:play.png">
- </FileRef>
- <FileRef
- location = "group:up.png">
- </FileRef>
- <FileRef
- location = "group:wizard.py">
- </FileRef>
- </Group>
- <Group
- location = "group:docs"
- name = "docs">
- <FileRef
- location = "group:EMS.docx">
- </FileRef>
- </Group>
- <FileRef
- location = "group:ems.sh">
- </FileRef>
- <Group
- location = "group:hardware"
- name = "hardware">
- <FileRef
- location = "group:M0FeatherSIC.brd">
- </FileRef>
- <FileRef
- location = "group:M0FeatherSIC.pdf">
- </FileRef>
- <FileRef
- location = "group:M0FeatherSIC.sch">
- </FileRef>
- </Group>
- <FileRef
- location = "group:README.md">
- </FileRef>
- <Group
- location = "group:utilities"
- name = "utilities">
- <FileRef
- location = "group:genkeys.py">
- </FileRef>
- </Group>
-</Workspace>
diff --git a/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate b/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 3c165d3..0000000
--- a/ems-light.xcworkspace/xcuserdata/don.xcuserdatad/UserInterfaceState.xcuserstate
+++ /dev/null
Binary files differ
diff --git a/Arduino/ems-light/Clock.cpp b/src/Clock.cpp
index 4f6431d..4f6431d 100755
--- a/Arduino/ems-light/Clock.cpp
+++ b/src/Clock.cpp
diff --git a/Arduino/ems-light/Clock.h b/src/Clock.h
index 690d72a..690d72a 100755
--- a/Arduino/ems-light/Clock.h
+++ b/src/Clock.h
diff --git a/Arduino/ems-light/Configuration.h b/src/Configuration.h
index 822846d..822846d 100755
--- a/Arduino/ems-light/Configuration.h
+++ b/src/Configuration.h
diff --git a/Arduino/ems-light/Machine.cpp b/src/Machine.cpp
index 1f9e8a5..1f9e8a5 100755
--- a/Arduino/ems-light/Machine.cpp
+++ b/src/Machine.cpp
diff --git a/Arduino/ems-light/Machine.h b/src/Machine.h
index db7c9fd..db7c9fd 100755
--- a/Arduino/ems-light/Machine.h
+++ b/src/Machine.h
diff --git a/Arduino/ems-light/Monitor.cpp b/src/Monitor.cpp
index fd77089..fd77089 100755
--- a/Arduino/ems-light/Monitor.cpp
+++ b/src/Monitor.cpp
diff --git a/Arduino/ems-light/Monitor.h b/src/Monitor.h
index 2c01c65..2c01c65 100755
--- a/Arduino/ems-light/Monitor.h
+++ b/src/Monitor.h
diff --git a/Arduino/ems-light/SafetyThird.cpp b/src/SafetyThird.cpp
index 180edd2..180edd2 100755
--- a/Arduino/ems-light/SafetyThird.cpp
+++ b/src/SafetyThird.cpp
diff --git a/Arduino/ems-light/SafetyThird.h b/src/SafetyThird.h
index 3b318a5..3b318a5 100755
--- a/Arduino/ems-light/SafetyThird.h
+++ b/src/SafetyThird.h
diff --git a/Arduino/ems-light/TaskScheduler.h b/src/TaskScheduler.h
index 89ae8a2..89ae8a2 100755
--- a/Arduino/ems-light/TaskScheduler.h
+++ b/src/TaskScheduler.h
diff --git a/Arduino/ems-light/ems-light.ino b/src/ems-light.ino
index 26bc988..26bc988 100755
--- a/Arduino/ems-light/ems-light.ino
+++ b/src/ems-light.ino
diff --git a/Arduino/ems-light/keywords.h b/src/keywords.h
index 1cf39e1..1cf39e1 100755
--- a/Arduino/ems-light/keywords.h
+++ b/src/keywords.h