Skip to content

V1 1 0 #4

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 8, 2015
Merged

V1 1 0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d36e26
Support for Arduino 1.6 on Mac OS X
francoiscampbell Aug 7, 2015
e2334cd
Bumped version
francoiscampbell Aug 8, 2015
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake"]
path = src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake
url = git://github.com/queezythegreat/arduino-cmake.git
url = git://github.com/altexdim/arduino-cmake.git
6 changes: 5 additions & 1 deletion META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<idea-plugin version="2">
<id>io.github.francoiscambell.clionarduinoplugin</id>
<name>CLion Arduino</name>
<version>1.0.2</version>
<version>1.1.0</version>
<vendor email="" url="https://github.com/francoiscampbell/CLionArduinoPlugin">Francois Campbell</vendor>

<description><![CDATA[
Expand All @@ -62,6 +62,10 @@
]]></description>

<change-notes><![CDATA[
<b>1.1.0</b>
<ul>
<li>Compatiblity with Arduino SDK 1.6 on Mac OS X</li>
</ul>
<b>1.0.2</b>
<ul>
<li>Removed Groovy runtime, no longer necessary</li>
Expand Down
2 changes: 1 addition & 1 deletion src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake
Open in desktop
Submodule arduino-cmake updated 13 files
+3 −1 .gitignore
+12 −1 CMakeLists.txt
+4 −0 README.original.rst
+176 −0 README.txt
+6 −0 cmake/ArduinoToolchain.cmake
+129 −59 cmake/Platform/Arduino.cmake
+0 −26 example/Blink/Blink.ino
+0 −5 example/Blink/config.h
+11 −96 example/CMakeLists.txt
+0 −22 example/blink.cpp
+0 −19 example/blink_lib.cpp
+0 −17 example/blink_lib.h
+23 −0 example/example.cpp