From 895e3c4561bb31dfdb1f3ed260d95855f9a63d4d Mon Sep 17 00:00:00 2001 From: Joe User Date: Wed, 3 Nov 2021 20:48:20 -0400 Subject: [PATCH] Fix filenames --- .../base_controller/lib/base_controller/base_controller.h | 2 +- .../lib/encoder/{encoder.cpp => encoder_diffbot.cpp} | 2 +- .../lib/encoder/{encoder.h => encoder_diffbot.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename diffbot_base/scripts/base_controller/lib/encoder/{encoder.cpp => encoder_diffbot.cpp} (98%) rename diffbot_base/scripts/base_controller/lib/encoder/{encoder.h => encoder_diffbot.h} (100%) diff --git a/diffbot_base/scripts/base_controller/lib/base_controller/base_controller.h b/diffbot_base/scripts/base_controller/lib/base_controller/base_controller.h index 85cdbc4b..4db53fec 100644 --- a/diffbot_base/scripts/base_controller/lib/base_controller/base_controller.h +++ b/diffbot_base/scripts/base_controller/lib/base_controller/base_controller.h @@ -14,7 +14,7 @@ #include #include "diffbot_base_config.h" -#include "encoder.h" +#include "encoder_diffbot.h" #include "adafruit_feather_wing/adafruit_feather_wing.h" #include "pid.h" diff --git a/diffbot_base/scripts/base_controller/lib/encoder/encoder.cpp b/diffbot_base/scripts/base_controller/lib/encoder/encoder_diffbot.cpp similarity index 98% rename from diffbot_base/scripts/base_controller/lib/encoder/encoder.cpp rename to diffbot_base/scripts/base_controller/lib/encoder/encoder_diffbot.cpp index 14eaf4e1..ecaf4d0d 100644 --- a/diffbot_base/scripts/base_controller/lib/encoder/encoder.cpp +++ b/diffbot_base/scripts/base_controller/lib/encoder/encoder_diffbot.cpp @@ -1,4 +1,4 @@ -#include "encoder.h" +#include "encoder_diffbot.h" diffbot::Encoder::Encoder(ros::NodeHandle& nh, uint8_t pin1, uint8_t pin2, int encoder_resolution) diff --git a/diffbot_base/scripts/base_controller/lib/encoder/encoder.h b/diffbot_base/scripts/base_controller/lib/encoder/encoder_diffbot.h similarity index 100% rename from diffbot_base/scripts/base_controller/lib/encoder/encoder.h rename to diffbot_base/scripts/base_controller/lib/encoder/encoder_diffbot.h