E220 can merge #27

nihinihikun · 2024-03-15T15:40:46Z

以下確認して消してからプルリク出してください

各項目は今回のプロジェクトでのGitHubの使い方を参考に書く
画面右のreviewrを @771_8bit に，assigneeを自分に設定する
作業中のメモはプルリク上に残す
レビューができる状態になったらレビュー時を参考にコメントを書く

概要

E220のcanとの統合

ここまで

ここまではpayloadがちゃんと受信できるかの確認．CAN→payload用の配列にいれるところは一切実機テストしてない

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

cpplint

test/E220_vertual_rocket/E220_vertual_rocket.ino|81| Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-15T15:41:12Z

test/E220_can/E220_can.ino

+  static bool send_allowed = false;//送信許可
+  static bool payload_semapho = false;//payloadの生成が終わるまで送信を許可しない
+  static uint32_t latest_send_time = 0;//最後に送信した時間
+  GeneratePayload(tx_payload,payload_semapho);


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:12Z

test/E220_can/E220_can.ino

+  }
+}
+
+void GeneratePayload(byte* tx_payload,bool _payload_semapho){


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:12Z

test/E220_can/E220_can.ino

+
+  switch (CCP.id) {
+        case CCP_nose_status:
+          if(CCP.str_match("OK",2)){


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:12Z

test/E220_can/E220_can.ino

+        case CCP_nose_status:
+          if(CCP.str_match("OK",2)){
+            status_byte|=0b10000000;
+          }        


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-15T15:41:12Z

test/E220_can/E220_can.ino

+          }        
+          break;
+        case CCP_surface_pressure1_status:
+          if(CCP.str_match("OK",2)){


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:13Z

test/E220_ground/E220_ground.ino

+  }else{
+    Serial.println("");
+  }
+


[cpplint] _{reported by reviewdog 🐶}
Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3]

github-actions · 2024-03-15T15:41:13Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+  static bool send_allowed = false;//送信許可
+  static bool payload_semapho = false;//payloadの生成が終わるまで送信を許可しない
+  static uint32_t latest_send_time = 0;//最後に送信した時間
+  GeneratePayload(tx_payload,payload_semapho);


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:13Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+  }
+}
+
+void GeneratePayload(byte* tx_payload,bool _payload_semapho){


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-15T15:41:13Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+  tx_payload[12] = buf.b[1];
+  tx_payload[13] = buf.b[2];
+  tx_payload[14] = buf.b[3];
+


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-15T15:41:14Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+  tx_payload[20] = buf.b[1];
+  tx_payload[21] = buf.b[2];
+  tx_payload[22] = buf.b[3];
+


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

nihinihikun · 2024-03-15T15:43:42Z

ソフトってこんな感じでいいの？test/E220_can.inoがロケット側，test/E220_ground.inoが地上局側．

nihinihikun · 2024-03-15T16:04:50Z

Nose/Nose.inoは別のブランチでいろいろ修正済みなのでこのブランチではむししてもらってかまわん

771-8bit · 2024-03-15T16:13:22Z

CANが繋がったXIAO RP2040のMissionInterfaceと，E220が繋がったラズピコのMainそれぞれ書いてほしい．

MIFは電源のONOFFとかも管理してて，Main→MIFのUARTはアップリンクの文字列，MIF→MainのUARTはそのままパススルーしてE220に繋げるとかがいいと思う（E220からのレスポンス受け取る必要あるなら大変だけど）

https://github.com/core-rocket/24th-ise/blob/837d332fb67b22d7dbe3abd70689ffa748867726/MissionInterface/MissionInterface.ino#L40C1-L45C6

github-actions · 2024-03-16T03:18:43Z

test/MIFE220/MIFcan/MIFcan.ino

+  static bool payload_semapho = false;   //payloadの生成が終わるまで送信を許可しない
+  static uint32_t latest_send_time = 0;  //最後に送信した時間
+  GeneratePayload(tx_payload, payload_semapho);
+


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-16T03:18:44Z

test/MIFE220/MIFcan/MIFcan.ino

+  GeneratePayload(tx_payload, payload_semapho);
+
+  //ToDO:tx_payloadをMain基板に送信する処理を書く
+


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-16T03:18:44Z

test/MIFE220/MIFcan/MIFcan.ino

+  GeneratePayload(tx_payload, payload_semapho);
+
+  //ToDO:tx_payloadをMain基板に送信する処理を書く
+


[cpplint] _{reported by reviewdog 🐶}
Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3]

github-actions · 2024-03-16T03:18:44Z

test/MIFE220/MainE220/MainE220.ino

+  static bool send_allowed = false;      //送信許可
+  static uint32_t latest_send_time = 0;  //最後に送信した時間
+
+  //TODO:ここにMIF基板からのデータを受け取ってtx_payloadにいれる処理を書く


[cpplint] _{reported by reviewdog 🐶}
Missing username in TODO; it should look like "// TODO(my_username): Stuff." [readability/todo] [2]

github-actions · 2024-03-16T03:18:44Z

test/MIFE220/MainE220/MainE220.ino

+  static bool send_allowed = false;      //送信許可
+  static uint32_t latest_send_time = 0;  //最後に送信した時間
+
+  //TODO:ここにMIF基板からのデータを受け取ってtx_payloadにいれる処理を書く


[cpplint] _{reported by reviewdog 🐶}
TODO(my_username) should be followed by a space [whitespace/todo] [2]

github-actions · 2024-03-16T03:18:44Z

test/MIFE220/MainE220/MainE220.ino

+  static uint32_t latest_send_time = 0;  //最後に送信した時間
+
+  //TODO:ここにMIF基板からのデータを受け取ってtx_payloadにいれる処理を書く
+


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-16T04:09:01Z

test/E220_ground/E220_ground.ino

+    Serial.println(surface5_pressure.f, 6);
+    Serial.print(",");
+    Serial.println(surface6_pressure.f, 6);
+  } 


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-16T04:09:01Z

test/E220_ground/E220_ground.ino

+    Serial.print(",");
+    Serial.println(surface6_pressure.f, 6);
+  } 
+}


[cpplint] _{reported by reviewdog 🐶}
Could not find a newline character at the end of the file. [whitespace/ending_newline] [5]

github-actions · 2024-03-16T09:50:08Z

test/E220_ground/E220_ground.ino

+  static byte rx_payload[199] = { 0 };
+  int rssi = 0;
+  int Rxlength = 0;
+  Rxlength = e220.ReceiveDataVariebleLength(rx_payload,47,&rssi);//surface6_pressureまでの長さ


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-16T09:50:08Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+  }
+  if (send_allowed == true && payload_semapho == false) {
+    Serial.println("send!");
+    e220.TransmissionDataVariebleLength(tx_payload,47);


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-16T09:50:08Z

test/formerE220lib/E220_ground/E220_ground.ino

+    Serial.println(surface5_pressure.f, 6);
+    Serial.print(",");
+    Serial.println(surface6_pressure.f, 6);
+  } 


[cpplint] _{reported by reviewdog 🐶}
Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4]

github-actions · 2024-03-16T09:50:08Z

test/formerE220lib/E220_ground/E220_ground.ino

+    Serial.print(",");
+    Serial.println(surface6_pressure.f, 6);
+  } 
+}


[cpplint] _{reported by reviewdog 🐶}
Could not find a newline character at the end of the file. [whitespace/ending_newline] [5]

test/MIFE220/MainE220/MainE220.ino

nihinihikun · 2024-03-17T06:51:29Z

@771-8bit こういう感じでいかが？
test/MIFE220/MainE220/MainE220.ino
test/MIFE220/MIFcan/MIFcan.ino
軽くみてみて

771-8bit · 2024-03-18T03:58:18Z

イメージ通りだったので結構良さそう
ToDoのところこのまま追加お願い

github-actions · 2024-03-19T19:08:52Z

test/E220_can/E220_can.ino

+
+#define SEND_PERIOD_MS 1000
+
+E220 e220(Serial1,0xFF, 0xFF, 0x00);         //TARGETADRESS=0xFFFF,CHANNEL=0x00


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-19T19:08:52Z

test/E220_ground/E220_ground.ino

+
+#define SEND_PERIOD_MS 1000
+
+E220 e220(Serial1,0xFF, 0xFF, 0x0A);  //TARGETADRESS=0xFFFF,CHANNEL=0x0A=10ch=ARIB 34-35


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-19T19:08:52Z

test/E220_vertual_rocket/E220_vertual_rocket.ino

+
+#define SEND_PERIOD_MS 1000
+
+E220 e220(Serial1,0xFF, 0xFF, 0x0A);  //TARGETADRESS=0xFFFF,CHANNEL=0x0A=10ch=ARIB 34-35


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

github-actions · 2024-03-19T19:08:52Z

test/MIFE220/MainE220/MainE220.ino

+#define PAYLOAD_SIZE 47
+#define ROCKET_INSIDE_PACKET_LETTER 0x4E
+
+E220 e220(Serial2,0xFF, 0xFF, 0x0A);         //TARGETADRESS=0xFFFF,CHANNEL=0x0A


[cpplint] _{reported by reviewdog 🐶}
Missing space after , [whitespace/comma] [3]

test/MIFE220/MainE220/MainE220.ino

nihinihikun · 2024-03-19T19:14:57Z

どうでしょう．Main基板のSerialはとりあえず1,2にしといた．そこはいい感じにマージしといて． @771-8bit

771-8bit

@nihinihikun 見たわよ

test/MIFE220/MIFcan/MIFcan.ino

771-8bit · 2024-03-20T06:07:23Z

test/MIFE220/MainE220/MainE220.ino

+  static bool comingdata = false;        //MIF基板からデータが来ているか
+
+  //MIF基板からのデータを受け取ってtx_payloadにいれる処理
+  if(Serial1.readBytesUntil(ROCKET_INSIDE_PACKET_LETTER,tx_payload,PAYLOAD_SIZE)){


readBytesUntilはデータが来るまで待つ(orタイムアウト)ブロッキング関数だから，Serial.available()で受信バイト数読んでSerial.read()で一文字ずつ読み出して手動で終端判定するプログラムに変えてほしい．

ブロッキング関数でここで処理が止まるとMainだからまずい

test/MIFE220/MainE220/MainE220.ino

771-8bit · 2024-03-20T06:14:14Z

test/MIFE220/MIFcan/MIFcan.ino

+  static byte tx_payload[199] = { 0 };
+  static byte rocket_inside_packet[200]={0};
+  static bool payload_semapho = false;   //payloadの生成が終わるまで送信を許可しない
+  GeneratePayload(tx_payload, payload_semapho);


payload_semapho ，ポインタ渡しするかグローバルにしないと意味なくない？

というか割り込みじゃないからセマフォ自体いらなそう

771-8bit · 2024-03-20T06:19:09Z

test/MIFE220/MIFcan/MIFcan.ino

+  GeneratePayload(tx_payload, payload_semapho);
+  //tx_payloadをMain基板に送信する処理
+  if (payload_semapho == false) {
+    SendMainDataPacket(tx_payload);


これMIF→MainのUARTは爆速大量でデータ送って，Main側でダウンリンク頻度絞ってるってことよね？
Main側の処理がパンクしそうだからMIF側でデータ送信頻度絞ってほしい．

MainのプログラムはSerial_E220.write(SerialMIF.read());だけぐらいの感覚．

CAN系のデータはMIFのFlashに保存できるから大量のデータをMainに送る必要はない．

test/MIFE220/MainE220/MainE220.ino

771-8bit · 2024-03-20T07:19:49Z

test/MIFE220/MainE220/MainE220.ino

+    comingdata = false;
+  }
+  //ここから送信処理
+  if (((millis() - latest_send_time) > SEND_PERIOD_MS) && comingdata) {  //前の送信から一定時間経過しているか


MIF側でダウンリンクレート絞ってるからSEND_PERIOD_MSいらないよね？
comingdataがtrueのときにすぐデータ出さないと次のループでcomingdataがfalseになるから消したい

nihinihikun added 7 commits March 11, 2024 19:15

Create E220_can.ino

32488c9

Update E220_can.ino

a00e6c9

Update E220_can.ino

02e3f56

fix spellmiss, add E220_ground

e8c6fc3

Update E220_ground.ino

6a58853

test-payload sending

feb574f

Update E220_ground.ino

35e495a

nihinihikun requested a review from 771-8bit March 15, 2024 15:40

nihinihikun self-assigned this Mar 15, 2024

github-actions bot reviewed Mar 15, 2024

View reviewed changes

fix white space

a535879

nihinihikun added 2 commits March 16, 2024 12:00

refactoring E220_can

901ac3f

seperate roles(can, E220)

a57df0d

github-actions bot reviewed Mar 16, 2024

View reviewed changes

change address, sf, UARTbaudrate

5638d4d

github-actions bot reviewed Mar 16, 2024

View reviewed changes

送信関係を修正．送信時間を短縮

a3cca00

github-actions bot reviewed Mar 16, 2024

View reviewed changes

Update MainE220.ino

848bb91

github-actions bot reviewed Mar 17, 2024

View reviewed changes

test/MIFE220/MainE220/MainE220.ino Outdated Show resolved Hide resolved

fix for update E220(v2.0.2)

3b6b1c1

github-actions bot reviewed Mar 19, 2024

View reviewed changes

fix white spaces

dbb9867

771-8bit requested changes Mar 20, 2024

View reviewed changes

コメント対応

992d1ef

771-8bit requested changes Mar 20, 2024

View reviewed changes

Update MainE220.ino

6c77bf6

771-8bit mentioned this pull request Mar 24, 2024

MIF・E220統合 #35

Open

		GeneratePayload(tx_payload, payload_semapho);

		//ToDO:tx_payloadをMain基板に送信する処理を書く

		static uint32_t latest_send_time = 0; //最後に送信した時間

		//TODO:ここにMIF基板からのデータを受け取ってtx_payloadにいれる処理を書く


		#define SEND_PERIOD_MS 1000

		E220 e220(Serial1,0xFF, 0xFF, 0x00); //TARGETADRESS=0xFFFF,CHANNEL=0x00


		#define SEND_PERIOD_MS 1000

		E220 e220(Serial1,0xFF, 0xFF, 0x0A); //TARGETADRESS=0xFFFF,CHANNEL=0x0A=10ch=ARIB 34-35

E220 can merge #27

Are you sure you want to change the base?

E220 can merge #27

Uh oh!

Conversation

nihinihikun commented Mar 15, 2024

概要

ここまで

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

nihinihikun commented Mar 15, 2024

Uh oh!

nihinihikun commented Mar 15, 2024

Uh oh!

771-8bit commented Mar 15, 2024

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Mar 16, 2024

Choose a reason for hiding this comment