This repository was archived by the owner on Mar 25, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 12
Added Class and Tests for Serial #10
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ee0fd13
Added Class and Tests for Serial
khalilxlj 5f7fe24
Update formatting
khalilxlj 26f8111
Updated tests for Serial println
khalilxlj 0b0e8c4
Updated tests and comments
khalilxlj 254dbda
Took out.vscode
khalilxlj 05f840d
Update and rename test.sh to scripts/test.sh
d5ca5d4
Update Serial_TC.cpp
1a0ea90
Update Serial_TC.h
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#! /bin/sh | ||
bundle config --local path vendor/bundle | ||
bundle install | ||
bundle exec arduino_ci_remote.rb --skip-examples-compilation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
// This class is for the Serial Commands used in Tank Controller. | ||
// Serial here mostly deals with writing or printing data over through the serial port. | ||
// Serial.print and Serial.write can be called in different ways to print data. | ||
// Also print_PID, print_DataTime, print_mac are used to print the PID information, current date information, and the | ||
// mac address. | ||
|
||
#include <Arduino.h> | ||
#include <RTClib.h> | ||
|
||
class Serial_TC { | ||
private: | ||
public: | ||
Serial_TC() { | ||
Serial.begin(9600); | ||
} | ||
|
||
void print_PID(double Kp, double Ki, double Kd, double output) { | ||
Serial.print(F("Kp:")); | ||
Serial.print(Kp); | ||
Serial.print(F(" Ki:")); | ||
Serial.print(Ki); | ||
Serial.print(F(" Kd:")); | ||
Serial.println(Kd); | ||
Serial.print(F("PID output (s): ")); | ||
Serial.println(output / 1000, 1); | ||
} | ||
|
||
void print_two_digits(int value) { | ||
if (value < 10) { | ||
Serial.print('0'); | ||
} | ||
Serial.print(value, DEC); | ||
} | ||
void print_DateTime(DateTime dateTime) { | ||
Serial.print(dateTime.year(), DEC); | ||
Serial.print('-'); | ||
print_two_digits(dateTime.month()); | ||
Serial.print('-'); | ||
print_two_digits(dateTime.day()); | ||
Serial.print(' '); | ||
print_two_digits(dateTime.hour()); | ||
Serial.print(':'); | ||
print_two_digits(dateTime.minute()); | ||
Serial.print(':'); | ||
print_two_digits(dateTime.second()); | ||
Serial.println(); | ||
} | ||
|
||
void print_mac(byte mac[]) { | ||
Serial.print(F("MAC Address: ")); | ||
Serial.print(mac[0]); | ||
for (int i = 1; i < 6; ++i) { | ||
Serial.print(':'); | ||
Serial.print(mac[i]); | ||
} | ||
Serial.println(); | ||
} | ||
|
||
void print(String aString, String aString2) { | ||
Serial.println(aString); | ||
Serial.println(aString2); | ||
} | ||
|
||
void print(String aString, int anInt) { | ||
Serial.print(aString); | ||
Serial.println(anInt); | ||
} | ||
|
||
void print(String aString, int anInt, int format) { | ||
Serial.print(aString); | ||
Serial.println(anInt, format); | ||
} | ||
|
||
void print(String aString) { | ||
Serial.println(aString); | ||
} | ||
|
||
void write(byte aByte) { | ||
Serial.write(aByte); | ||
} | ||
|
||
void write(char arr[], int anInt) { | ||
Serial.write(arr, anInt); | ||
} | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
#include <RTClib.h> | ||
#include <Serial_TC.h> | ||
|
||
#include "ArduinoUnitTests.h" | ||
|
||
unittest(SerialTest) { | ||
GodmodeState* state = GODMODE(); | ||
state->serialPort[0].dataIn = ""; // the queue of data waiting to be read | ||
state->serialPort[0].dataOut = ""; // the history of data written | ||
|
||
Serial_TC mySerial; | ||
|
||
mySerial.write('b'); | ||
assertEqual("", state->serialPort[0].dataIn); | ||
assertEqual("b", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
String test = "test:"; | ||
mySerial.print(test); | ||
assertEqual("test:\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
mySerial.print(test, 2); | ||
assertEqual("test:2\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
mySerial.print("Label: ", "value"); | ||
assertEqual("Label: \r\nvalue\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
mySerial.print("Test Hex:", 78, HEX); | ||
assertEqual("Test Hex:4E\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
byte mac[6] = {0x90, 0xA2, 0xDA, 0x00, 0x00, 0x00}; | ||
mySerial.print_mac(mac); | ||
assertEqual("MAC Address: 144:162:218:0:0:0\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
char temp[] = {'a', 'b', 'c', '\0'}; | ||
mySerial.write(temp, strlen(temp)); | ||
assertEqual("abc", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
mySerial.print_PID(1.1, 2.2, 3.3, 1234.5); | ||
assertEqual("Kp:1.1000000000 Ki:2.2000000000 Kd:3.3000000000\r\nPID output (s): 1.2\r\n", | ||
state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
DateTime dateTime = DateTime(2020, 1, 2, 3, 4, 5); | ||
mySerial.print_DateTime(dateTime); | ||
assertEqual("2020-01-02 03:04:05\r\n", state->serialPort[0].dataOut); | ||
|
||
state->serialPort[0].dataOut = ""; // the history of data written | ||
dateTime = DateTime(2020, 11, 12, 13, 14, 15); | ||
mySerial.print_DateTime(dateTime); | ||
assertEqual("2020-11-12 13:14:15\r\n", state->serialPort[0].dataOut); | ||
} | ||
|
||
unittest_main() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should have tests for each of the public API functions. It wouldn't take much to add a few more.