Skip to content

Commit 16366ca

Browse files
refactor: remove namespace
1 parent e454104 commit 16366ca

7 files changed

Lines changed: 11 additions & 18 deletions

File tree

examples/basic_color_sensor/basic_color_sensor.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
#include <compkit.h>
22

3-
compkit::color_sensor<2> sensorDireita(A0, 2, 3, 4);
3+
color_sensor<2> sensorDireita(A0, 2, 3, 4);
44
size_t verde;
55
size_t amarelo;
66

77
void setup() {
88
Serial.begin(9600);
99

1010
delay(3000);
11-
compkit::color_point leitura1;
11+
color_point leitura1;
1212
sensorDireita.read(leitura1);
1313
verde = sensorDireita.add_color_point(leitura1);
1414

1515
Serial.print(verde);
1616
Serial.print(": ");
17-
compkit::print_color(leitura1);
17+
print_color(leitura1);
1818
Serial.println("");
1919

2020
delay(3000);
21-
compkit::color_point leitura2;
21+
color_point leitura2;
2222
sensorDireita.read(leitura2);
2323
amarelo = sensorDireita.add_color_point(leitura2);
2424

2525
Serial.print(amarelo);
2626
Serial.print(": ");
27-
compkit::print_color(leitura2);
27+
print_color(leitura2);
2828
Serial.println("");
2929

3030
delay(3000);
3131
}
3232

3333
void loop() {
34-
compkit::color_point leituraCorDireita;
34+
color_point leituraCorDireita;
3535
sensorDireita.read(leituraCorDireita);
3636

3737
int corAtual = sensorDireita.closest_color(leituraCorDireita);

examples/color_sensor_with_serial/color_sensor_with_serial.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <Arduino.h>
22
#include <compkit.h>
33

4-
compkit::color_sensor<5> color_reader(13, 12, 14, 27);
4+
color_sensor<5> color_reader(13, 12, 14, 27);
55

66
void menu(String incomingString) {
77
Serial.print("Received: ");
@@ -19,7 +19,7 @@ void menu(String incomingString) {
1919
Serial.println("Function 'test' ended!");
2020
} else if(incomingString == "c" || incomingString == "addc") {
2121
Serial.println("Function 'add color point' recognized!");
22-
compkit::color_point point;
22+
color_point point;
2323
color_reader.read(point);
2424

2525
Serial.print("Red: ");
@@ -64,7 +64,7 @@ void setup() {
6464
}
6565

6666
void loop() {
67-
compkit::color_point point;
67+
color_point point;
6868
color_reader.read(point);
6969
Serial.print("Red: ");
7070
Serial.print(point[0]);

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json",
33
"name": "compkit",
4-
"version": "1.1.1",
4+
"version": "1.2.0",
55
"description": "A collection of libraries for competitive robotics developed by and for ROBOTIEEE teams.",
66
"keywords": "sensors, input, data, processing, analysis, arduino, library, filter, smooth, competitive",
77
"repository": {

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=compkit
2-
version=1.1.1
2+
version=1.2.0
33
author=Alexandre Hiroyuki Yamauchi <alex.hiroyuki@outlook.com>
44
maintainer=Alexandre Hiroyuki Yamauchi <alex.hiroyuki@outlook.com>
55
sentence=A collection of libraries for competitive robotics

src/color_sensor.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include <Arduino.h>
1010
#include <compkit_macros.h>
1111

12-
namespace compkit {
13-
1412
// color_point is a 4-element array of integers
1513
// {red, green, blue, natural}
1614
struct color_point {
@@ -126,6 +124,5 @@ template <size_t n_color_points = 1> class color_sensor {
126124
return closest_color;
127125
}
128126
};
129-
} // namespace compkit
130127

131128
#endif // COMPKIT_COLOR_SENSOR_H

src/motor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#define COMPKIT_MOTOR_H
88

99
#include <Arduino.h>
10-
namespace compkit {
1110
class motor {
1211
private:
1312
unsigned int _motor_forward_pin;
@@ -29,6 +28,5 @@ class motor {
2928
}
3029
}
3130
};
32-
} // namespace compkit
3331

3432
#endif // COMPKIT_MOTOR_H

src/motor_controller.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <Arduino.h>
1010
#include <motor.h>
1111

12-
namespace compkit {
1312
class motor_controller {
1413
private:
1514
motor *_left_motor;
@@ -34,6 +33,5 @@ class motor_controller {
3433
_right_motor->speed(right_speed);
3534
}
3635
};
37-
} // namespace compkit
3836

3937
#endif // COMPKIT_MOTOR_CONTROLLER_H

0 commit comments

Comments
 (0)