Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Fork of PES by
Revision 11:7c5598781280, committed 2017-04-19
- Comitter:
- itslinear
- Date:
- Wed Apr 19 11:35:12 2017 +0000
- Parent:
- 10:75a18bf17c86
- Child:
- 12:b9faf8637183
- Commit message:
- hallo holdi
Changed in this revision
--- a/Kamera.cpp Wed Apr 19 10:13:52 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#include "Kamera.h"
-
-int kamera(){
- return 1;
- }
\ No newline at end of file
--- a/Kamera.h Wed Apr 19 10:13:52 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -#ifndef KAMERA_H -#define KAMERA_H - -#include <mbed.h> - -int kamera(); - - - - - - - - - - - - - - - - -#endif \ No newline at end of file
--- a/pixy.lib Wed Apr 19 10:13:52 2017 +0000 +++ b/pixy.lib Wed Apr 19 11:35:12 2017 +0000 @@ -1,1 +1,1 @@ -https://developer.mbed.org/teams/PES-2/code/pixy/#b0a6783fb615 +http://developer.mbed.org/teams/Gruppe-3/code/pixy/#b0a6783fb615
--- a/readCamera.cpp Wed Apr 19 10:13:52 2017 +0000
+++ b/readCamera.cpp Wed Apr 19 11:35:12 2017 +0000
@@ -1,5 +1,5 @@
-#include "mbed.h"
-#include "Pixy.h"
+#include "readCamera.h"
+
Pixy pixy(I2C_SDA, I2C_SCL);
Serial pc(SERIAL_TX, SERIAL_RX);
@@ -12,7 +12,7 @@
uint16_t blocks;
-int main()
+int kamera()
{
pixy.setSerialOutput(&pc);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/readCamera.h Wed Apr 19 11:35:12 2017 +0000 @@ -0,0 +1,24 @@ +#ifndef CAMERA_H +#define CAMERA_H + +#include <mbed.h> +#include "Pixy.h" + +int kamera(); + + + + + + + + + + + + + + + + +#endif \ No newline at end of file
