Merge pull request #244 from brian4685380/RPi-#242

Rpi #242

Author: ArthurNieh

README.md

@@ -1,61 +1,32 @@
-# 2023-LightDance-RPi
+# 2024-LightDance-RPi
 
-## playloop
+## Develope flow
+Step 1. Fork a copy from the organization repo  to your personal repo
 
-### OF
+Step 2. Clone the repo to your local machine
 
-```c++
-struct Status {
-	int r;
-	int g;
-	int b;
-	int a;
-};
+```shell
+# USERNAME – your Github user account name.
+# flag --recursive to completely clone repos including hardware
+git clone --recursive [email protected]:${USERNAME}/LightDance-RPi.git
+cd LightDance-RPi
+# set upstream
+git remote add upstream [email protected]:NTUEELightDance/LightDance-RPi.git
 
-vector<vector<Status>> frames;
 
-class OpticalFiberController {
-	public:
-		OpticalFiberController();
-		int init(vector<int> map);
-		int sendAll(vector<Status> status); // lightall, darkall
-};
-
-// logic
-while(1) {
-	status = findFrame(getTime());
-	sendAll(status);
-	sleep(5ms);
-}
+# Make sure don’t accidentally merge
+git config --add merge.ff only
+git config --add pull.ff only
 ```
 
-### LED
-
-```c++
-struct Status {
-	int r;
-	int g;
-	int b;
-	int a;
-};
-
-vector<LEDStatus> stripStatus(size);
-
-class LEDStripController {
-	public:
-		LEDStripController();
-		int init(vector<int> shape);
-		int checkReady();
-		int sendAll(vector<vector<Status>> status);
-};
-
-// logic
-while(1) {
-	while(checkReady() == 0){
-		sleep(1ms);
-  }
-	status = findFrame(getTime());
-	sendAll(status);
-	sleep(5ms);
-}
-```
+Step 3. Build your local project
+
+```shell
+cd controller/hardware/
+git checkout origin/local_test
+cd ..
+mkdir build
+cd build
+cmake ..
+make install
+```

controller/software/inc/player.h

@@ -11,7 +11,8 @@
 #include <sstream>
 #include <unordered_map>
 
-#include "nlohmann/json.hpp"
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 // serialize
 #include <boost/archive/text_iarchive.hpp>
@@ -22,12 +23,13 @@
 #include <boost/serialization/vector.hpp>
 #include <boost/serialization/version.hpp>
 
+
 #include "LEDPlayer.h"
 #include "OFPlayer.h"
 #include "const.h"
 
 using namespace std;
-using json = nlohmann::json;
+using namespace boost;
 
 struct LEDStripeSetting {
     LEDStripeSetting(){};
@@ -45,7 +47,7 @@ class Player {
     Player() : LEDloaded(false), OFloaded(false){};
     Player(const string &_dancerName)
         : dancerName(_dancerName), LEDloaded(false), OFloaded(false){};
-    bool setDancer(const string &_dancerName, json &dancerData);
+    bool setDancer(const string &_dancerName, property_tree::ptree &dancerData);
     string list() const;
     string getDancerName();
     template <class Archive>
@@ -68,8 +70,8 @@ class Player {
     // serialization
     friend class boost::serialization::access;
     friend ostream &operator<<(ostream &ostream, const Player &player);
-    friend void LEDload(Player &Player, json &data_json);
-    friend void OFload(Player &Player, json &data_json);
+    friend void LEDload(Player &Player, property_tree::ptree &data_json);
+    friend void OFload(Player &Player, property_tree::ptree &data_json);
 };
 
 void savePlayer(const Player &savePlayer, const char *filename);

controller/software/src/commands/load.cpp

@@ -8,9 +8,11 @@
 #include <fstream>
 #include <iostream>
 
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
 #include "LEDPlayer.h"
 #include "const.h"
-#include "nlohmann/json.hpp"
 #include "player.h"
 
 /*
@@ -62,7 +64,6 @@ have a mismatch. (e.g. load LED OF.json).
 
 */
 using namespace std;
-using json = nlohmann::json;
 
 int main(int argc, char *argv[]) {
     setuid(1000);
@@ -117,39 +118,42 @@ int main(int argc, char *argv[]) {
     // string dancerName = path.substr(fileNameStart, path.find_last_of(".") -
     // fileNameStart);
     string dancerName = "DANCER";
-    json controlJsonFile;
+    boost::property_tree::ptree controlJsonFile;
     if (loadControl) {
         ifstream infile(controlPath.c_str());
         if (!infile) {
             cerr << "Cannot open file: " << controlPath << endl;
             exit(1);
         }
-        infile >> controlJsonFile;
+        boost::property_tree::read_json(infile, controlJsonFile);
         infile.close();
     }
-    json LEDJsonFile;
+    boost::property_tree::ptree LEDJsonFile;
     if (loadLED) {
         ifstream infile(LEDpath.c_str());
         if (!infile) {
             cerr << "Cannot open file: " << LEDpath << endl;
             exit(1);
         }
-        infile >> LEDJsonFile;
+        boost::property_tree::read_json(infile, LEDJsonFile);
         infile.close();
     }
-    json OFJsonFile;
+    boost::property_tree::ptree OFJsonFile;
     if (loadOF) {
         ifstream infile(OFpath.c_str());
         if (!infile) {
             cerr << "Cannot open file: " << OFpath << endl;
             exit(1);
         }
-        infile >> OFJsonFile;
+        boost::property_tree::read_json(infile, OFJsonFile);
         infile.close();
     }
 
     string outputFileName = basePath + "data/dancer.dat";
     if (loadControl) {
+        
+        boost::property_tree::write_json(std::cout, controlJsonFile);
+
         Player dancer;
         dancer.setDancer(dancerName, controlJsonFile);
         cout << "Dancer control data loaded successfully\n";
@@ -162,11 +166,12 @@ int main(int argc, char *argv[]) {
     }
 
     Player dancerData;
-    if (!restorePlayer(dancerData, outputFileName.c_str())) {
-        cerr << "Please load dancer's control data first !" << endl;
-        exit(1);
-    };
+    // if (!restorePlayer(dancerData, outputFileName.c_str())) {
+    //     cerr << "Please load dancer's control data first !" << endl;
+    //     exit(1);
+    // };
     if (loadLED) {
+        boost::property_tree::write_json(std::cout, LEDJsonFile);
         LEDload(dancerData, LEDJsonFile);
         cout << "LED data loaded successfully\n";
         cout << "Stored at: " << outputFileName << endl;
@@ -178,6 +183,7 @@ int main(int argc, char *argv[]) {
         // return 0;
     }
     if (loadOF) {
+        boost::property_tree::write_json(std::cout, OFJsonFile);
         OFload(dancerData, OFJsonFile);
         cout << "OF data loaded successfully\n";
         cout << "Stored at: " << outputFileName << endl;