Skip to content

Tmx unification #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArendJan merged 2 commits into from
Jun 24, 2025
Merged

Tmx unification #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
637b7c5
small fixes
ArendJan Jun 24, 2025
985ca62
Fixes for slow arduino nano + stylefixes
ArendJan Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/boards/esp32devkit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#if defined(ARDUINO_ARCH_ESP32)

#include <Arduino.h>

// This board does not have a normal list of analog pins
// this shifts the analog pins
#define A1 2047
#define A2 2047
#define A8 2047
Expand Down
27 changes: 13 additions & 14 deletions include/boards/itsybitsy_m4.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
#include <Arduino.h>

#if defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_ITSYBITSY_M4)
const auto A7 = 2047;
const auto A8 = 2047;
const auto A9 = 2047;
const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;

const auto A7 = 2047;
const auto A8 = 2047;
const auto A9 = 2047;
const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;

const auto MAX_SERVOS = 0;
#endif
24 changes: 12 additions & 12 deletions include/boards/nanoatmega.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

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

const auto A8 = 2047;
const auto A9 = 2047;
const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const auto A8 = 2047;
const auto A9 = 2047;
const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const uint8_t MAX_SERVOS = 4; // PWM pins on Nano
#endif
31 changes: 15 additions & 16 deletions include/boards/stm32blackpill.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@
#include <Arduino.h>
#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLACKPILL_F103C8)


const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const auto A10 = 2047;
const auto A11 = 2047;
const auto A12 = 2047;
const auto A13 = 2047;
const auto A14 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const auto MAX_SERVOS = 8; // PWM pins on BlackPill
#endif

#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLACKPILL_F303CC)
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const auto A15 = 2047;
const auto A16 = 2047;
const auto A17 = 2047;
const auto A18 = 2047;
const auto A19 = 2047;
const auto MAX_SERVOS = 8; // PWM pins on BlackPill
#endif
2 changes: 0 additions & 2 deletions include/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once



#ifndef MAX_SONARS
#define MAX_SONARS 6
#endif
Expand Down
4 changes: 2 additions & 2 deletions include/main.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include <Arduino.h>
#include "boards/esp32devkit.hpp"
#include "boards/itsybitsy_m4.hpp"
#include "boards/nanoatmega.hpp"
#include "boards/stm32blackpill.hpp"
#include "boards/itsybitsy_m4.hpp"
#include <Arduino.h>
void get_unique_id();

// Old code
Expand Down
Loading