clang-format

Author: SpencerJ

.gitignore

@@ -4,3 +4,5 @@ bin/
 
 compile_commands.json
 temp.log
+
+*.zip

include/screen/field.hpp

@@ -68,18 +68,17 @@ namespace screen {
 
 class Field {
  public:
-
-   /**
-    * A struct that controls the drawing of numbers on cubes (which represent height)
-    *
-    * deltaX how far to move the number horizontally from default
-    * deltaY how far to move the number vertically from default
-    * fontStyle which style to use; can be used to change the font, color, etc. of the number
+  /**
+   * A struct that controls the drawing of numbers on cubes (which represent height)
+   *
+   * deltaX how far to move the number horizontally from default
+   * deltaY how far to move the number vertically from default
+   * fontStyle which style to use; can be used to change the font, color, etc. of the number
    */
-   struct NumberConfig{
-     int deltaX, deltaY;
-     lv_style_t* fontStyle;
-   };
+  struct NumberConfig {
+    int deltaX, deltaY;
+    lv_style_t *fontStyle;
+  };
 
   /**
    * Field generator for the screen
@@ -176,7 +175,7 @@ class Field {
    *    for both stacks. See the README for more information
    */
   void draw(scoringZone pos, std::pair<color, color> contents,
-                       std::pair<uint8_t, uint8_t> stackHeight);
+            std::pair<uint8_t, uint8_t> stackHeight);
 
   /**
    * draw the four colored tiles
@@ -225,8 +224,8 @@ class Field {
   // Cubes should be drawn automatically by the above functions
   void drawCube(std::pair<uint8_t, uint8_t> pos, color color, uint8_t stackHeight, bool targeted);
 
-  static void drawCube(lv_obj_t *parent, std::pair<uint8_t, uint8_t> pos, double scalar, color color,
-                       uint8_t stackHeight, NumberConfig config, bool targeted);
+  static void drawCube(lv_obj_t *parent, std::pair<uint8_t, uint8_t> pos, double scalar,
+                       color color, uint8_t stackHeight, NumberConfig config, bool targeted);
 
   int scale(int original);
 

src/opcontrol.cpp

@@ -13,8 +13,7 @@ void opcontrol()
 
   // two stacks use an array of colors
   // draw a purple stack with height 1 and an orange stack with height 3 in the far red zone
-  field.draw(screen::scoringZone::farRed, {screen::color::purple, screen::color::orange},
-                        {1, 3});
+  field.draw(screen::scoringZone::farRed, {screen::color::purple, screen::color::orange}, {1, 3});
 
   // one stack does not need to use an array
   // draw a green stack with height 4 in the near red zone
@@ -37,7 +36,8 @@ void opcontrol()
   // (this is the 5 cube stack on the audience side)
   field.draw(screen::cubeGroup::near, CUBE_NEAR_LEFT + CUBE_NEAR_RIGHT + CUBE_FAR_RIGHT);
 
-  // draw the highest(rightmost), and the 2nd lowest(leftmost) cube of the 4th(closest) left cube group
+  // draw the highest(rightmost), and the 2nd lowest(leftmost) cube of the 4th(closest) left cube
+  // group
   field.draw(screen::cubeGroup::left4, CUBE_HIGHEST + CUBE_2LOWEST);
 
   // draw the left tower with no cubes in or around

src/screen/field.cpp

@@ -3,9 +3,12 @@
 namespace screen {
 
 Field::Field(lv_obj_t *parent, const double ilength, const bool iautoInit,
-             const NumberConfig iconfig):
-             scalar(ilength / 240), autoInit(iautoInit), config(iconfig),
-             wallDrawn(false), allianceTowerContents(color::none, color::none)
+             const NumberConfig iconfig)
+    : scalar(ilength / 240),
+      autoInit(iautoInit),
+      config(iconfig),
+      wallDrawn(false),
+      allianceTowerContents(color::none, color::none)
 {
   obj = lv_obj_create(parent, NULL);
   lv_obj_set_style(obj, &fieldStyle);
@@ -54,7 +57,8 @@ void Field::setPos(int x, int y)
   lv_obj_set_pos(obj, x, y);
 }
 
-void Field::setSideLength(uint ilength){
+void Field::setSideLength(uint ilength)
+{
   scalar = ilength / 240.0;
   lv_obj_set_size(obj, ilength, ilength);
   clean();
@@ -331,7 +335,7 @@ void Field::draw(const scoringZone pos, const color contents, const uint8_t stac
 }
 
 void Field::draw(const scoringZone pos, const std::pair<color, color> contents,
-                            const std::pair<uint8_t, uint8_t> stackHeight)
+                 const std::pair<uint8_t, uint8_t> stackHeight)
 {
   bool targeted = contents.first != color::none;
 
@@ -408,7 +412,6 @@ void Field::drawColoredTiles()
 
 void Field::drawLines()
 {
-
   short s40, s80, s160, s200, s240;
 
   static lv_point_t irzPts[3];
@@ -426,25 +429,38 @@ void Field::drawLines()
   lv_obj_t *innerRedZone = lv_line_create(obj, NULL);
   lv_line_set_style(innerRedZone, &lineStyle);
 
-  s40 = static_cast<short>(scale(40));
-  s80 = static_cast<short>(scale(80));
+  s40  = static_cast<short>(scale(40));
+  s80  = static_cast<short>(scale(80));
   s160 = static_cast<short>(scale(160));
   s200 = static_cast<short>(scale(200));
   s240 = static_cast<short>(scale(240));
 
-  irzPts[0] = {0, s40}; irzPts[1] = {s40, s40}; irzPts[2] = {s40, 0};
+  irzPts[0] = {0, s40};
+  irzPts[1] = {s40, s40};
+  irzPts[2] = {s40, 0};
   lv_line_set_points(innerRedZone, irzPts, 3);
 
-  lv_obj_t *outerRedZone      = lv_line_create(obj, innerRedZone);
-  orzPts[0] = {0, s80}; orzPts[1] = {s40, s80}; orzPts[2] = {s80, s40}; orzPts[3] = {s80, 0};
+  lv_obj_t *outerRedZone = lv_line_create(obj, innerRedZone);
+
+  orzPts[0] = {0, s80};
+  orzPts[1] = {s40, s80};
+  orzPts[2] = {s80, s40};
+  orzPts[3] = {s80, 0};
   lv_line_set_points(outerRedZone, orzPts, 4);
 
-  lv_obj_t *innerBlueZone     = lv_line_create(obj, innerRedZone);
-  ibzPts[0] = {s200, 0}; ibzPts[1] = {s200, s40}; ibzPts[2] = {s240, s40};
+  lv_obj_t *innerBlueZone = lv_line_create(obj, innerRedZone);
+
+  ibzPts[0] = {s200, 0};
+  ibzPts[1] = {s200, s40};
+  ibzPts[2] = {s240, s40};
   lv_line_set_points(innerBlueZone, ibzPts, 3);
 
-  lv_obj_t *outerBlueZone     = lv_line_create(obj, innerRedZone);
-  obzPts[0] = {s160, 0}; obzPts[1] = {s160, s40}; obzPts[2] = {s200, s80}; obzPts[3] = {s240, s80};
+  lv_obj_t *outerBlueZone = lv_line_create(obj, innerRedZone);
+
+  obzPts[0] = {s160, 0};
+  obzPts[1] = {s160, s40};
+  obzPts[2] = {s200, s80};
+  obzPts[3] = {s240, s80};
   lv_line_set_points(outerBlueZone, obzPts, 4);
 }
 
@@ -525,16 +541,15 @@ int Field::scale(int original)
 void Field::resetVectors()
 {
   // fully populate the vectors
-  cubesToDraw  = {cubeGroup::farLeft, cubeGroup::farRight, cubeGroup::farPurple,
-                 cubeGroup::left1,   cubeGroup::left2,    cubeGroup::left3,
-                 cubeGroup::left4,   cubeGroup::right1,   cubeGroup::right2,
-                 cubeGroup::right3,  cubeGroup::right4,   cubeGroup::near};
+  cubesToDraw = {cubeGroup::farLeft, cubeGroup::farRight, cubeGroup::farPurple, cubeGroup::left1,
+                 cubeGroup::left2,   cubeGroup::left3,    cubeGroup::left4,     cubeGroup::right1,
+                 cubeGroup::right2,  cubeGroup::right3,   cubeGroup::right4,    cubeGroup::near};
 
   towersToDraw = {tower::left, tower::right, tower::center, tower::far,
                   tower::near, tower::red,   tower::blue};
 
-  zonesToDraw  = {scoringZone::farRed, scoringZone::farBlue,
-                  scoringZone::nearRed, scoringZone::nearBlue};
+  zonesToDraw = {scoringZone::farRed,  scoringZone::farBlue, 
+                 scoringZone::nearRed, scoringZone::nearBlue};
 }
 
 }  // namespace screen