Skip to content

Frame count should run from 1-50 not 0-49 #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
n7275 wants to merge 1 commit into
base: Orbiter2016
Choose a base branch
from
Draft

Frame count should run from 1-50 not 0-49 #1313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Orbitersdk/samples/ProjectApollo/src_csm/csm_telecom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ PCM::PCM()
wsk_error = 0;
last_update = 0;
last_rx = 0;
frame_addr = 0;
frame_addr = 1;
frame_count = 0;
m_socket = INVALID_SOCKET;
}
Expand Down Expand Up @@ -4275,7 +4275,7 @@ void PCM::generate_stream_hbr(){
// 10A7
// ...
// 10A148
tx_data[tx_offset] = measure(10,TLM_A,1+(frame_addr*3));
tx_data[tx_offset] = measure(10,TLM_A,(frame_addr*3)-2);
break;
case 52: // 12A13
case 116:
Expand Down Expand Up @@ -4564,7 +4564,7 @@ void PCM::generate_stream_hbr(){
// 10A8
// ...
// 10A149
tx_data[tx_offset] = measure(10,TLM_A,2+(frame_addr*3));
tx_data[tx_offset] = measure(10,TLM_A,(frame_addr*3)-1);
break;
case 88:
switch(frame_count){
Expand Down Expand Up @@ -4821,7 +4821,7 @@ void PCM::generate_stream_hbr(){
// 10A9
// ...
// 10A150
tx_data[tx_offset] = measure(10,TLM_A,3+(frame_addr*3));
tx_data[tx_offset] = measure(10,TLM_A,(frame_addr*3));
break;
case 120:
switch(frame_count){
Expand Down Expand Up @@ -4921,8 +4921,8 @@ void PCM::generate_stream_hbr(){
if(word_addr > 127){
word_addr = 0;
frame_addr++;
if(frame_addr > 49){
frame_addr = 0;
if(frame_addr > 50){
frame_addr = 1;
Copy link
Member

@thewonderidiot thewonderidiot Nov 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the LBR function duplicates this code -- the documentation isn't clear but I would assume this also counts starting from 1. I'll try to capture some LBR data from the real PCM.

}
frame_count++;
if(frame_count > 4){
Expand Down