From 882e450c990f0baf1c18e7545b75db043cbcd165 Mon Sep 17 00:00:00 2001 From: William Miceli Date: Fri, 14 May 2021 16:10:05 -0400 Subject: [PATCH] Renamed main header files --- Telem_Debug/Debug1/{main.h => SunseekerTelemetry2021.h} | 6 +++--- Telem_Debug/Debug1/main.c | 2 +- Telem_Debug/Debug2/CAN.c | 2 +- Telem_Debug/Debug2/MODEM.c | 2 +- Telem_Debug/Debug2/RTC.c | 2 +- .../Debug2/{Sunseeker2021.h => SunseekerTelemetry2021.h} | 6 +++--- Telem_Debug/Debug2/char_FIFO.c | 2 +- Telem_Debug/Debug2/io_init.c | 2 +- Telem_Debug/Debug2/main.c | 2 +- Telem_Debug/Debug2/message_FIFO.c | 2 +- Telem_Debug/Debug3/RS232.c | 2 +- Telem_Debug/Debug3/RTC.c | 2 +- .../Debug3/{Sunseeker2021.h => SunseekerTelemetry2021.h} | 6 +++--- Telem_Debug/Debug3/can0.c | 2 +- Telem_Debug/Debug3/can1.c | 2 +- Telem_Debug/Debug3/io_init.c | 2 +- Telem_Debug/Debug3/main.c | 2 +- .../{Sunseeker2021.h => SunseekerTelemetry2021.h} | 7 ++----- Telem_Debug/Debug_BlinkyLED/main.c | 3 ++- 19 files changed, 27 insertions(+), 29 deletions(-) rename Telem_Debug/Debug1/{main.h => SunseekerTelemetry2021.h} (97%) rename Telem_Debug/Debug2/{Sunseeker2021.h => SunseekerTelemetry2021.h} (99%) rename Telem_Debug/Debug3/{Sunseeker2021.h => SunseekerTelemetry2021.h} (99%) rename Telem_Debug/Debug_BlinkyLED/{Sunseeker2021.h => SunseekerTelemetry2021.h} (99%) diff --git a/Telem_Debug/Debug1/main.h b/Telem_Debug/Debug1/SunseekerTelemetry2021.h similarity index 97% rename from Telem_Debug/Debug1/main.h rename to Telem_Debug/Debug1/SunseekerTelemetry2021.h index 554263b..c6f5ebb 100644 --- a/Telem_Debug/Debug1/main.h +++ b/Telem_Debug/Debug1/SunseekerTelemetry2021.h @@ -9,8 +9,8 @@ * */ -#ifndef MAIN_H_ -#define MAIN_H_ +#ifndef SUNSEEKERTELEMETRY2021_H_ +#define SUNSEEKERTELEMETRY2021_H_ #include @@ -155,4 +155,4 @@ void timerB_init(void); #define JTAG_TMS 0x04 #define JTAG_TCK 0x08 -#endif /* MAIN_H_ */ +#endif /* SUNSEEKERTELEMETRY2021_H_ */ diff --git a/Telem_Debug/Debug1/main.c b/Telem_Debug/Debug1/main.c index 381ea10..bd2db2b 100644 --- a/Telem_Debug/Debug1/main.c +++ b/Telem_Debug/Debug1/main.c @@ -12,7 +12,7 @@ #include #include -#include "main.h" +#include "SunseekerTelemetry2021.h" // General Variables volatile unsigned char status_flag = FALSE; //status flag set on timer B diff --git a/Telem_Debug/Debug2/CAN.c b/Telem_Debug/Debug2/CAN.c index 0ab3f24..6d3fb0f 100644 --- a/Telem_Debug/Debug2/CAN.c +++ b/Telem_Debug/Debug2/CAN.c @@ -28,7 +28,7 @@ */ // Include files -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" #define can0_select() P4OUT &= ~CAN0_CSn #define can0_deselect() P4OUT |= CAN0_CSn diff --git a/Telem_Debug/Debug2/MODEM.c b/Telem_Debug/Debug2/MODEM.c index f07062c..ba5e70e 100644 --- a/Telem_Debug/Debug2/MODEM.c +++ b/Telem_Debug/Debug2/MODEM.c @@ -1,7 +1,7 @@ // // Telemetry MODEM Code // -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" int synccount = 0; diff --git a/Telem_Debug/Debug2/RTC.c b/Telem_Debug/Debug2/RTC.c index 4b8e0d0..f5523f3 100644 --- a/Telem_Debug/Debug2/RTC.c +++ b/Telem_Debug/Debug2/RTC.c @@ -1,7 +1,7 @@ // // Telemetry Real Time Clock // -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" /************************************************************* / Name: setRTC diff --git a/Telem_Debug/Debug2/Sunseeker2021.h b/Telem_Debug/Debug2/SunseekerTelemetry2021.h similarity index 99% rename from Telem_Debug/Debug2/Sunseeker2021.h rename to Telem_Debug/Debug2/SunseekerTelemetry2021.h index 38095f3..f8c507f 100644 --- a/Telem_Debug/Debug2/Sunseeker2021.h +++ b/Telem_Debug/Debug2/SunseekerTelemetry2021.h @@ -9,8 +9,8 @@ * */ -#ifndef SUNSEEKER2021_H_ -#define SUNSEEKER2021_H_ +#ifndef SUNSEEKERTELEMETRY2021_H_ +#define SUNSEEKERTELEMETRY2021_H_ #include #include @@ -369,4 +369,4 @@ static char *name_lookup[NAME_LOOKUP_ROWS] = { // "MC2FAN", //MC_CAN_BASE2 + MC_FAN //"MC2TP3", //MC_CAN_BASE2 + MC_TEMP3 -#endif /* SUNSEEKER2021_H_ */ +#endif /* SUNSEEKERTELEMETRY2021_H_ */ diff --git a/Telem_Debug/Debug2/char_FIFO.c b/Telem_Debug/Debug2/char_FIFO.c index 243964e..b6d661e 100644 --- a/Telem_Debug/Debug2/char_FIFO.c +++ b/Telem_Debug/Debug2/char_FIFO.c @@ -1,7 +1,7 @@ // // Telemetry Character FIFO // -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" void CHAR_FIFO_INIT(char_fifo queue) diff --git a/Telem_Debug/Debug2/io_init.c b/Telem_Debug/Debug2/io_init.c index d82f477..7c9b8b6 100644 --- a/Telem_Debug/Debug2/io_init.c +++ b/Telem_Debug/Debug2/io_init.c @@ -9,7 +9,7 @@ */ // Include files -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" /* * Initialise I/O port directions and states diff --git a/Telem_Debug/Debug2/main.c b/Telem_Debug/Debug2/main.c index f014485..42c0d4d 100644 --- a/Telem_Debug/Debug2/main.c +++ b/Telem_Debug/Debug2/main.c @@ -20,7 +20,7 @@ * */ -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" // structures message_fifo decode_queue; diff --git a/Telem_Debug/Debug2/message_FIFO.c b/Telem_Debug/Debug2/message_FIFO.c index c957ed1..8ba768c 100644 --- a/Telem_Debug/Debug2/message_FIFO.c +++ b/Telem_Debug/Debug2/message_FIFO.c @@ -1,7 +1,7 @@ // // Telemetry Messgae FIFO // -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" void message_fifo_INIT(void) { diff --git a/Telem_Debug/Debug3/RS232.c b/Telem_Debug/Debug3/RS232.c index bef08de..e2616d1 100644 --- a/Telem_Debug/Debug3/RS232.c +++ b/Telem_Debug/Debug3/RS232.c @@ -8,8 +8,8 @@ // Include files #include -#include "Sunseeker2021.h" #include "RS232.h" +#include "SunseekerTelemetry2021.h" /*********************************************************************************/ // UART to Modem UCA3 Interface (voltage isolated) diff --git a/Telem_Debug/Debug3/RTC.c b/Telem_Debug/Debug3/RTC.c index 4b8e0d0..f5523f3 100644 --- a/Telem_Debug/Debug3/RTC.c +++ b/Telem_Debug/Debug3/RTC.c @@ -1,7 +1,7 @@ // // Telemetry Real Time Clock // -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" /************************************************************* / Name: setRTC diff --git a/Telem_Debug/Debug3/Sunseeker2021.h b/Telem_Debug/Debug3/SunseekerTelemetry2021.h similarity index 99% rename from Telem_Debug/Debug3/Sunseeker2021.h rename to Telem_Debug/Debug3/SunseekerTelemetry2021.h index 5d3ffa3..edb6a05 100644 --- a/Telem_Debug/Debug3/Sunseeker2021.h +++ b/Telem_Debug/Debug3/SunseekerTelemetry2021.h @@ -9,8 +9,8 @@ * */ -#ifndef SUNSEEKER2021_H_ -#define SUNSEEKER2021_H_ +#ifndef SUNSEEKERTELEMETRY2021_H_ +#define SUNSEEKERTELEMETRY2021_H_ #include #include @@ -374,4 +374,4 @@ static char *name_lookup[NAME_LOOKUP_ROWS] = { // "MC2FAN", //MC_CAN_BASE2 + MC_FAN // "MC2TP3", //MC_CAN_BASE2 + MC_TEMP3 -#endif /* SUNSEEKER2021_H_ */ +#endif /* SUNSEEKERTELEMETRY2021_H_ */ diff --git a/Telem_Debug/Debug3/can0.c b/Telem_Debug/Debug3/can0.c index f55d899..b4528c7 100644 --- a/Telem_Debug/Debug3/can0.c +++ b/Telem_Debug/Debug3/can0.c @@ -30,8 +30,8 @@ */ // Include files -#include "Sunseeker2021.h" #include "can.h" +#include "SunseekerTelemetry2021.h" // Public variables can_variables can; diff --git a/Telem_Debug/Debug3/can1.c b/Telem_Debug/Debug3/can1.c index 1de9fbb..04aba50 100644 --- a/Telem_Debug/Debug3/can1.c +++ b/Telem_Debug/Debug3/can1.c @@ -30,8 +30,8 @@ */ // Include files -#include "Sunseeker2021.h" #include "can.h" +#include "SunseekerTelemetry2021.h" // Public variables can_variables can; diff --git a/Telem_Debug/Debug3/io_init.c b/Telem_Debug/Debug3/io_init.c index 6ade78e..065078b 100644 --- a/Telem_Debug/Debug3/io_init.c +++ b/Telem_Debug/Debug3/io_init.c @@ -9,7 +9,7 @@ */ // Include files -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" /* * Initialize I/O port directions and states diff --git a/Telem_Debug/Debug3/main.c b/Telem_Debug/Debug3/main.c index fd6ba0a..eeedb4a 100644 --- a/Telem_Debug/Debug3/main.c +++ b/Telem_Debug/Debug3/main.c @@ -20,7 +20,7 @@ * */ -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" // structures //message_fifo decode_queue; diff --git a/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h b/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h similarity index 99% rename from Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h rename to Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h index 1ce8e91..152c552 100644 --- a/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h +++ b/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h @@ -9,8 +9,7 @@ * */ -#ifndef SUNSEEKER2021_H_ -#define SUNSEEKER2021_H_ +#ifndef SUNSEEKERTELEMETRY2021_H_RY2021_H_SUNSEEKERTELEMETRY2021_H_ERTELEMETRY2021_H_ #include #include @@ -372,6 +371,4 @@ static char *name_lookup[NAME_LOOKUP_ROWS] = { // "MC1FAN", //MC_CAN_BASE1 + MC_FAN // "MC1TP3", //MC_CAN_BASE1 + MC_TEMP3 // "MC2FAN", //MC_CAN_BASE2 + MC_FAN -// "MC2TP3", //MC_CAN_BASE2 + MC_TEMP3 - -#endif /* SUNSEEKER2021_H_ */ +// "MC2TP3", //MC_CAN_BASE2 + MCSUNSEEKERTELEMETRY2021_H_* SUNSEEKERTELEMETRY2021_H_ */ diff --git a/Telem_Debug/Debug_BlinkyLED/main.c b/Telem_Debug/Debug_BlinkyLED/main.c index b97f49f..55432c4 100644 --- a/Telem_Debug/Debug_BlinkyLED/main.c +++ b/Telem_Debug/Debug_BlinkyLED/main.c @@ -20,7 +20,8 @@ * */ -#include "Sunseeker2021.h" +#include "SunseekerTelemetry2021.h" +y2021.h" // structures //message_fifo decode_queue;