You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -66,26 +65,16 @@ With passwordless ssh and the same username on the ev3dev machine, you can go `s
66
65
67
66
Next we need a versioning system. That's a tool for tracking changes you made to your code. Coincidentally the same tool is also very handy for transferring code between computers or sharing it on the web. There are several, but I prefer git. It's not installed by default so you have to do:
68
67
69
-
```bash
70
-
sudo apt-get update
71
-
sudo apt-get install git
72
-
git config --global user.email "you@example.com"
73
-
git config --global user.name "Your Name"
74
-
```
68
+
sudo apt-get update
69
+
sudo apt-get install git
70
+
git config --global user.email "you@example.com"
71
+
git config --global user.name "Your Name"
75
72
76
73
Now let's make a new project using our versioning system. Just type:
77
-
<<<<<<< HEAD
78
74
79
75
mkdir myproject
80
76
cd myproject/
81
77
git init
82
-
=======
83
-
```bash
84
-
mkdir myproject
85
-
cd myproject/
86
-
git init
87
-
```
88
-
>>>>>>> parent of d05dc7d... Improved code highlighting
89
78
90
79
Yay! We have a new project. It's empty though. So let's add some code. Start a text editor like this:
91
80
`nano run_motor.py`
@@ -113,13 +102,7 @@ What we are going to do now is make a clone of our project on the ev3dev machine
113
102
In the Welcome dialog choose: 'Checkout from version control' > 'Git'
114
103
Now type the hostname of the ev3dev machine, followed by a semicolon the projectname. In the other fields choose a nice parent and project directory.
115
104
116
-
<<<<<<< HEAD
117
105
Now you can continue where you left of on the ev3dev machine, but with a larger screen, better keyboard and more tools! There is one problem, though: PyCharm puts red curly lines under the ev3dev library.
118
-
=======
119
-
{% include screenshot.html source="/images/Mac-OS-X/PyCharm/welcome.png" %}
120
-
121
-
Now you can continue where you left of on the ev3dev machine, but with a larger screen, better keyboard and more tools! There is one problem, though: PyCharm puts red curly lines under the ev3dev library. {% include screenshot.html source="/images/Mac-OS-X/PyCharm/missing-lib.png" %} It doesn't recognise it. And that's logical, because it's missing on the development machine. If we install it we won't be able to run motors, but the documentation and autocomplete will be active. So on your development machine start a terminal and do:
122
-
>>>>>>> parent of d05dc7d... Improved code highlighting
123
106
124
107
0 commit comments