Commit 01a4ecaa authored by Nemanja's avatar Nemanja
Browse files

final

parent f3ecb407
[fill].text,[fill].data,[fill].bss,[lib]/c.a.text,[lib]/c.a.data,[lib]/c.a.bss,[lib]/gcc.a.text,[lib]/gcc.a.data,[lib]/gcc.a.bss,[lib]/m.a.text,[lib]/m.a.data,[lib]/m.a.bss,[lib]/misc.text,[lib]/misc.data,[lib]/misc.bss,[lib]/nosys.a.text,[lib]/nosys.a.data,[lib]/nosys.a.bss,[lib]/stdc++.a.text,[lib]/stdc++.a.data,[lib]/stdc++.a.bss,main.o.text,main.o.data,main.o.bss,mbed-os/drivers.text,mbed-os/drivers.data,mbed-os/drivers.bss,mbed-os/features.text,mbed-os/features.data,mbed-os/features.bss,mbed-os/hal.text,mbed-os/hal.data,mbed-os/hal.bss,mbed-os/platform.text,mbed-os/platform.data,mbed-os/platform.bss,mbed-os/rtos.text,mbed-os/rtos.data,mbed-os/rtos.bss,mbed-os/targets.text,mbed-os/targets.data,mbed-os/targets.bss,static_ram,total_flash
491,14,24,63073,2572,127,7256,0,0,581,1,0,96,4,28,32,0,0,169635,145,5680,1858,0,373,2565,0,44,44,48,92,2636,4,64,5941,4,354,19970,168,5989,29617,380,3401,19516,307135
[fill].text,[fill].data,[fill].bss,[lib]/c.a.text,[lib]/c.a.data,[lib]/c.a.bss,[lib]/gcc.a.text,[lib]/gcc.a.data,[lib]/gcc.a.bss,[lib]/misc.text,[lib]/misc.data,[lib]/misc.bss,[lib]/nosys.a.text,[lib]/nosys.a.data,[lib]/nosys.a.bss,[lib]/stdc++.a.text,[lib]/stdc++.a.data,[lib]/stdc++.a.bss,main.o.text,main.o.data,main.o.bss,mbed-os/drivers.text,mbed-os/drivers.data,mbed-os/drivers.bss,mbed-os/features.text,mbed-os/features.data,mbed-os/features.bss,mbed-os/hal.text,mbed-os/hal.data,mbed-os/hal.bss,mbed-os/platform.text,mbed-os/platform.data,mbed-os/platform.bss,mbed-os/rtos.text,mbed-os/rtos.data,mbed-os/rtos.bss,mbed-os/targets.text,mbed-os/targets.data,mbed-os/targets.bss,static_ram,total_flash
498,15,24,63073,2572,127,7256,0,0,96,4,28,32,0,0,169635,145,5680,1784,0,333,2565,0,44,44,48,92,2636,4,64,5941,4,354,19970,168,5989,29617,380,3401,19476,306487
......@@ -2,9 +2,9 @@
{
"module": "[fill]",
"size": {
".data": 14,
".data": 15,
".bss": 24,
".text": 491
".text": 498
}
},
{
......@@ -23,14 +23,6 @@
".text": 7256
}
},
{
"module": "[lib]/m.a",
"size": {
".data": 1,
".bss": 0,
".text": 581
}
},
{
"module": "[lib]/misc",
"size": {
......@@ -59,8 +51,8 @@
"module": "main.o",
"size": {
".data": 0,
".bss": 373,
".text": 1858
".bss": 333,
".text": 1784
}
},
{
......@@ -113,8 +105,8 @@
},
{
"summary": {
"static_ram": 19516,
"total_flash": 307135
"static_ram": 19476,
"total_flash": 306487
}
}
]
......@@ -7,9 +7,6 @@
#include <math.h>
/************************************************/
#define DEBUG 0
#define BUF_SIZE 40
#define RUN 1
#define right 0x0C
#define left 0x08
......@@ -29,10 +26,6 @@ DigitalIn endstop_y_down(P1_13);
DigitalIn endstop_x_right(P1_12);
DigitalIn endstop_x_left(P1_14);
DigitalOut led1(LED1);//(P1_1);
DigitalOut led2(LED2);//(P1_0);
Serial device (P0_1, P0_0, 9600);
int counter_x = 0;
......@@ -68,7 +61,7 @@ void penUp()
void penDown()
{
int j=0;
//move servo -> pen up
//move servo -> pen down
while(j<4){
pwm_signal_1_3.write(0.90); //0.8
Thread::wait(10);
......@@ -169,8 +162,7 @@ void control_endstops(void)
//pwm_signal_1_3.write(0.95); //0.92
//pwm_signal_0_3.write(0.9);
//Thread::wait(10);
//pwm_signal_1_3.write(1.0);
//pwm_signal_1_3.write(1.0);
}
else if (!endstop_y_up && !endstop_x_left)
......@@ -317,9 +309,28 @@ void comm(void)
//linear(up+left,50/sqrt(2));
linear(rightqrt(2));
linear(right,10);
linear(up, 50);
linear(left, 10);
linear(down,50);
penUp();
linear(right, 20);
penDown();
linear(right,10);
linear(up, 50);
linear(left, 10);
linear(down,50);
linear(right,70);
break;
//linear(right, 100);
......@@ -335,10 +346,6 @@ int main(void)
{
osStatus status;
pwm_signal_1_3.period_ms(20); //Frage den Jordan :P
//led2.period_ms(10);
pwm_signal_1_3.write(1.0); //default value
spi_init();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment