Skip to content

Commit 679c7ed

Browse files
ArendJanArendJan
authored
Merge pull request #7 from ArendJan/tmx-unification
Tmx unification
2 parents 4a55f9f + 985ca62 commit 679c7ed

7 files changed

Lines changed: 131 additions & 120 deletions

File tree

‎include/boards/esp32devkit.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#if defined(ARDUINO_ARCH_ESP32)
44

55
#include <Arduino.h>
6-
6+
// This board does not have a normal list of analog pins
7+
// this shifts the analog pins
78
#define A1 2047
89
#define A2 2047
910
#define A8 2047

‎include/boards/itsybitsy_m4.hpp‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
#include <Arduino.h>
44

55
#if defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_ITSYBITSY_M4)
6-
const auto A7 = 2047;
7-
const auto A8 = 2047;
8-
const auto A9 = 2047;
9-
const auto A10 = 2047;
10-
const auto A11 = 2047;
11-
const auto A12 = 2047;
12-
const auto A13 = 2047;
13-
const auto A14 = 2047;
14-
const auto A15 = 2047;
15-
const auto A16 = 2047;
16-
const auto A17 = 2047;
17-
const auto A18 = 2047;
18-
const auto A19 = 2047;
19-
6+
const auto A7 = 2047;
7+
const auto A8 = 2047;
8+
const auto A9 = 2047;
9+
const auto A10 = 2047;
10+
const auto A11 = 2047;
11+
const auto A12 = 2047;
12+
const auto A13 = 2047;
13+
const auto A14 = 2047;
14+
const auto A15 = 2047;
15+
const auto A16 = 2047;
16+
const auto A17 = 2047;
17+
const auto A18 = 2047;
18+
const auto A19 = 2047;
2019

2120
const auto MAX_SERVOS = 0;
2221
#endif

‎include/boards/nanoatmega.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
#if defined(ARDUINO_ARCH_AVR) && defined(ARDUINO_AVR_NANO)
55

6-
const auto A8 = 2047;
7-
const auto A9 = 2047;
8-
const auto A10 = 2047;
9-
const auto A11 = 2047;
10-
const auto A12 = 2047;
11-
const auto A13 = 2047;
12-
const auto A14 = 2047;
13-
const auto A15 = 2047;
14-
const auto A16 = 2047;
15-
const auto A17 = 2047;
16-
const auto A18 = 2047;
17-
const auto A19 = 2047;
6+
const auto A8 = 2047;
7+
const auto A9 = 2047;
8+
const auto A10 = 2047;
9+
const auto A11 = 2047;
10+
const auto A12 = 2047;
11+
const auto A13 = 2047;
12+
const auto A14 = 2047;
13+
const auto A15 = 2047;
14+
const auto A16 = 2047;
15+
const auto A17 = 2047;
16+
const auto A18 = 2047;
17+
const auto A19 = 2047;
1818
const uint8_t MAX_SERVOS = 4; // PWM pins on Nano
1919
#endif

‎include/boards/stm32blackpill.hpp‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22
#include <Arduino.h>
33
#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLACKPILL_F103C8)
44

5-
6-
const auto A10 = 2047;
7-
const auto A11 = 2047;
8-
const auto A12 = 2047;
9-
const auto A13 = 2047;
10-
const auto A14 = 2047;
11-
const auto A15 = 2047;
12-
const auto A16 = 2047;
13-
const auto A17 = 2047;
14-
const auto A18 = 2047;
15-
const auto A19 = 2047;
5+
const auto A10 = 2047;
6+
const auto A11 = 2047;
7+
const auto A12 = 2047;
8+
const auto A13 = 2047;
9+
const auto A14 = 2047;
10+
const auto A15 = 2047;
11+
const auto A16 = 2047;
12+
const auto A17 = 2047;
13+
const auto A18 = 2047;
14+
const auto A19 = 2047;
1615
const auto MAX_SERVOS = 8; // PWM pins on BlackPill
1716
#endif
1817

1918
#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLACKPILL_F303CC)
20-
const auto A15 = 2047;
21-
const auto A16 = 2047;
22-
const auto A17 = 2047;
23-
const auto A18 = 2047;
24-
const auto A19 = 2047;
19+
const auto A15 = 2047;
20+
const auto A16 = 2047;
21+
const auto A17 = 2047;
22+
const auto A18 = 2047;
23+
const auto A19 = 2047;
2524
const auto MAX_SERVOS = 8; // PWM pins on BlackPill
2625
#endif

‎include/config.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#pragma once
22

3-
4-
53
#ifndef MAX_SONARS
64
#define MAX_SONARS 6
75
#endif

‎include/main.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include <Arduino.h>
43
#include "boards/esp32devkit.hpp"
4+
#include "boards/itsybitsy_m4.hpp"
55
#include "boards/nanoatmega.hpp"
66
#include "boards/stm32blackpill.hpp"
7-
#include "boards/itsybitsy_m4.hpp"
7+
#include <Arduino.h>
88
void get_unique_id();
99

1010
// Old code

0 commit comments

Comments
 (0)