move files around

Makefile

@@ -17,7 +17,7 @@ EXTRA_CFLAGS=
 EXTRA_CXXFLAGS=
 
 # Set to 1 to enable hot/cold linking
-USE_PACKAGE:=1
+USE_PACKAGE:=0
 
 # Add libraries you do not wish to include in the cold image here
 # EXCLUDE_COLD_LIBRARIES:= $(FWDIR)/your_library.a

src/Nanopb/pb_common.c

@@ -3,7 +3,7 @@
  * 2014 Petteri Aimonen <[email protected]>
  */
 
-#include "pb_common.h"
+#include "nanopb/pb_common.h"
 
 static bool load_descriptor_values(pb_field_iter_t *iter)
 {

src/Nanopb/pb_decode.c

@@ -13,9 +13,9 @@
     #define checkreturn __attribute__((warn_unused_result))
 #endif
 
-#include "pb.h"
-#include "pb_decode.h"
-#include "pb_common.h"
+#include "nanopb/pb.h"
+#include "nanopb/pb_decode.h"
+#include "nanopb/pb_common.h"
 
 /**************************************
  * Declarations internal to this file *

src/Nanopb/pb_encode.c

@@ -3,9 +3,9 @@
  * 2011 Petteri Aimonen <[email protected]>
  */
 
-#include "pb.h"
-#include "pb_encode.h"
-#include "pb_common.h"
+#include "nanopb/pb.h"
+#include "nanopb/pb_encode.h"
+#include "nanopb/pb_common.h"
 
 /* Use the GCC warn_unused_result attribute to check that all return values
  * are propagated correctly. On other compilers and gcc before 3.4.0 just

src/cobs/cobs.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include "cobs.h"
+#include "cobs/cobs.h"
 
 
 /*****************************************************************************

src/cobs/cobsr.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include "cobsr.h"
+#include "cobs/cobsr.h"
 
 
 /*****************************************************************************

src/main.cpp

@@ -4,7 +4,7 @@
 #include "okapi/impl/device/rotarysensor/IMU.hpp"
 #include "pros/misc.h"
 #include "pros/rtos.hpp"
-#include "robotControl.h"
+#include "proto/robotControl.h"
 #include "cartesian.h"
 #include "polar.h"
 #include "odom.h"
@@ -77,6 +77,7 @@ void on_center_button() {
  * to keep execution time for this mode under a few seconds.
  */
 void initialize() {
+    printf("eneterd initialize.\n");
 		pros::lcd::initialize();
 	pros::lcd::set_text(1, "Hello PROS User!");
 
@@ -195,7 +196,7 @@ void opcontrol() {
 	okapi::QAngle robotHeading = 0_rad;
 	odom odom1 = odom();
 	double drivePow=0;
-	pros::Motor intake ();
+	//pros::Motor intake ();
 	while (true) {
 		//pros::lcd::print(0, "AMT21_left value: %d", amt21_left.get_value());
         pros::lcd::print(2, "AMT21_right value: %d", up.get_value());

src/proto/messages.pb.h

@@ -3,9 +3,9 @@
 
 #ifndef PB_MESSAGES_PB_H_INCLUDED
 #define PB_MESSAGES_PB_H_INCLUDED
-#include "../Nanopb/pb.h"
-#include "../Nanopb/pb_encode.h"
-#include "../Nanopb/pb_decode.h"
+#include "nanopb/pb.h"
+#include "nanopb/pb_encode.h"
+#include "nanopb/pb_decode.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.

src/robotControl.cpp

@@ -1,5 +1,5 @@
 #include "main.h"
-#include "robotControl.h"
+#include "proto/robotControl.h"
 #include "okapi/api/units/QAngle.hpp"
 using namespace okapi::literals;