From 9062dfb3901611c1dd2a5c872e3c2cee0071ded7 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:08:52 -0500
Subject: [PATCH 01/96] Update main.c add jy sat info

---
 main.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 0d9fd5a9..792660a4 100644
--- a/main.c
+++ b/main.c
@@ -2303,12 +2303,32 @@ void get_tlm_fc() {
 //	printf("\nSYMPBLOCK = %d\n", SYMPBLOCK);
 
 	memset(source_bytes, 0x00, sizeof(source_bytes));
-	source_bytes[0] = 0b00000001 ;   //  10100000 10000001 01000001 10000001 10000001
+	source_bytes[0] = 0b11000001 ;    // 0b00000001 ;
+	
 //	source_bytes[1] = 0b10000010 ;
 
-//	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
-//	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
+	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
+	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
+
+	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
+	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000);
+	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
+	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
+	
+	source_bytes[FC_EPS + 0] = 0xff & (x >> 8);  // mV
+	source_bytes[FC_EPS + 1] = 0xfd & (x << 0);
+
+        source_bytes[FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 14));
+	source_bytes[FC_EPS + 2] = 0xff & (y >> 6);  // mV
+	source_bytes[FC_EPS + 3] = 0xf0 & (y << 2);
 
+	source_bytes[FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 12));
+	source_bytes[FC_EPS + 4] = 0xff & (z >> 4);  // mV
+	source_bytes[FC_EPS + 5] = 0xc0 & (z << 4);
+	
+	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x0d & (b >> 8));  // mV
+	source_bytes[FC_EPS + 6] = 0xff & (b << 6);
+/*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
 	source_bytes[FC_EPS + 2] = 0xff & (((unsigned int)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) >> 8));  // mV
@@ -2326,13 +2346,14 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 11] = 0xff & ((unsigned int)(current[map[BAT]] * 1));
 	source_bytes[FC_EPS + 12] = 0xff & (((unsigned long int)reset_count >> 8));
 	source_bytes[FC_EPS + 13] = 0xff & ((unsigned long int)reset_count);
+*/	
 	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
 	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 /**/
 	printf("\nsource_bytes\n");
 	for (int i=0; i<256; i++)
-		printf("%d ", source_bytes[i]);
+		printf("%x ", source_bytes[i]);
 	printf("\n\n");
 /**/
 

From 66dc8f9adb5050431edf1415f1c1ca8c23a1dd09 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:10:21 -0500
Subject: [PATCH 02/96] Update main.c add hex print

---
 main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 792660a4..b2bca86f 100644
--- a/main.c
+++ b/main.c
@@ -2307,13 +2307,15 @@ void get_tlm_fc() {
 	
 //	source_bytes[1] = 0b10000010 ;
 
-	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
-	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
+//	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
+//	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
 
 	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
 	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000);
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
+
+	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
 	source_bytes[FC_EPS + 0] = 0xff & (x >> 8);  // mV
 	source_bytes[FC_EPS + 1] = 0xfd & (x << 0);

From 74a21dfe49318e1a9d9fa0478c4fc8149902cd2a Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:15:03 -0500
Subject: [PATCH 03/96] Update main.c try test values

---
 main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.c b/main.c
index b2bca86f..4a519a84 100644
--- a/main.c
+++ b/main.c
@@ -2315,6 +2315,11 @@ void get_tlm_fc() {
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
 
+	x = 0xffff;
+	y = 0x0000;
+	z = 0xffff;
+	b = 0xa5a5;
+
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
 	source_bytes[FC_EPS + 0] = 0xff & (x >> 8);  // mV

From 90e463b122d36d185f397c6afd47b41fc730473b Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:20:51 -0500
Subject: [PATCH 04/96] Update main.c try other test cases

---
 main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 4a519a84..213f4150 100644
--- a/main.c
+++ b/main.c
@@ -2315,15 +2315,15 @@ void get_tlm_fc() {
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
 
-	x = 0xffff;
-	y = 0x0000;
-	z = 0xffff;
-	b = 0xa5a5;
+	x = 0x00; // 0xffff;
+	y = 0xffff; // 0x0000;
+	z = 0x00; // 0xffff;
+	b = 0xffff;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
 	source_bytes[FC_EPS + 0] = 0xff & (x >> 8);  // mV
-	source_bytes[FC_EPS + 1] = 0xfd & (x << 0);
+	source_bytes[FC_EPS + 1] = 0xfc & (x << 0);
 
         source_bytes[FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 14));
 	source_bytes[FC_EPS + 2] = 0xff & (y >> 6);  // mV

From 7767fabebbe6b1a4894d7734591e2ecdeb26d9ad Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:29:32 -0500
Subject: [PATCH 05/96] Update main.c fix b

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 213f4150..046bea92 100644
--- a/main.c
+++ b/main.c
@@ -2333,8 +2333,8 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 4] = 0xff & (z >> 4);  // mV
 	source_bytes[FC_EPS + 5] = 0xc0 & (z << 4);
 	
-	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x0d & (b >> 8));  // mV
-	source_bytes[FC_EPS + 6] = 0xff & (b << 6);
+	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 10));  // mV
+	source_bytes[FC_EPS + 6] = 0xff & (b << 2);
 /*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));

From c8111dff0bef0406143c9fd049848ab62dd5dde3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:32:53 -0500
Subject: [PATCH 06/96] Update main.c try fc

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 046bea92..82d9c193 100644
--- a/main.c
+++ b/main.c
@@ -2316,9 +2316,9 @@ void get_tlm_fc() {
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
 
 	x = 0x00; // 0xffff;
-	y = 0xffff; // 0x0000;
+	y = 0xfffc; // 0x0000;
 	z = 0x00; // 0xffff;
-	b = 0xffff;
+	b = 0xfffc;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
@@ -2334,7 +2334,7 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 5] = 0xc0 & (z << 4);
 	
 	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 10));  // mV
-	source_bytes[FC_EPS + 6] = 0xff & (b << 2);
+	source_bytes[FC_EPS + 6] = 0xff & (b >> 2);
 /*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));

From 04b11ee617081a47a819e532b0642a1ca0909c41 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:34:14 -0500
Subject: [PATCH 07/96] Update main.c last test

---
 main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 82d9c193..b26f776e 100644
--- a/main.c
+++ b/main.c
@@ -2315,10 +2315,10 @@ void get_tlm_fc() {
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
 
-	x = 0x00; // 0xffff;
-	y = 0xfffc; // 0x0000;
-	z = 0x00; // 0xffff;
-	b = 0xfffc;
+	x = 0xfffc; // 0xffff;
+	y = 0x0; // 0x0000;
+	z = 0xfffc; // 0xffff;
+	b = 0x000c;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	

From 9cc655235ee7ec5b08a1afd8e860247b4d94b5a2 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:36:40 -0500
Subject: [PATCH 08/96] Update main.c try real values

---
 main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index b26f776e..f9ea25af 100644
--- a/main.c
+++ b/main.c
@@ -2315,10 +2315,10 @@ void get_tlm_fc() {
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
 
-	x = 0xfffc; // 0xffff;
-	y = 0x0; // 0x0000;
-	z = 0xfffc; // 0xffff;
-	b = 0x000c;
+//	x = 0xfffc; // 0xffff;
+//	y = 0x0; // 0x0000;
+//	z = 0xfffc; // 0xffff;
+//	b = 0x000c;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	

From 8bc6d29f5a64e8c97f71c89e0dafde9fb9752ebf Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 11:54:14 -0500
Subject: [PATCH 09/96] Update main.c drop 2 MSB

---
 main.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index f9ea25af..37164e62 100644
--- a/main.c
+++ b/main.c
@@ -2310,10 +2310,10 @@ void get_tlm_fc() {
 //	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
 //	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
 
-	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
-	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000);
-	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000);
-	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000);
+	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff;  // 14 bits
+	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) && 0x3fff;
+	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) && 0x3fff;
+	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) && 0x3fff;
 
 //	x = 0xfffc; // 0xffff;
 //	y = 0x0; // 0x0000;
@@ -2322,19 +2322,19 @@ void get_tlm_fc() {
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
-	source_bytes[FC_EPS + 0] = 0xff & (x >> 8);  // mV
-	source_bytes[FC_EPS + 1] = 0xfc & (x << 0);
+	source_bytes[FC_EPS + 0] = 0xff & (x >> 10);  // mV
+	source_bytes[FC_EPS + 1] = 0xfc & (x << 2);
 
-        source_bytes[FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 14));
-	source_bytes[FC_EPS + 2] = 0xff & (y >> 6);  // mV
-	source_bytes[FC_EPS + 3] = 0xf0 & (y << 2);
+        source_bytes[FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
+	source_bytes[FC_EPS + 2] = 0xff & (y >> 4);  // mV
+	source_bytes[FC_EPS + 3] = 0xf0 & (y << 0);
 
-	source_bytes[FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 12));
-	source_bytes[FC_EPS + 4] = 0xff & (z >> 4);  // mV
-	source_bytes[FC_EPS + 5] = 0xc0 & (z << 4);
+	source_bytes[FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
+	source_bytes[FC_EPS + 4] = 0xff & (z >> 2);  // mV
+	source_bytes[FC_EPS + 5] = 0xc0 & (z << 0);
 	
-	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 10));  // mV
-	source_bytes[FC_EPS + 6] = 0xff & (b >> 2);
+	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  // mV
+	source_bytes[FC_EPS + 6] = 0xff & (b >> 0);
 /*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));

From cab80e13a106066efb624fde75e7859ffe9422a9 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 13:17:24 -0500
Subject: [PATCH 10/96] Update main.c add currents

---
 main.c | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 37164e62..5a56fdee 100644
--- a/main.c
+++ b/main.c
@@ -2315,6 +2315,19 @@ void get_tlm_fc() {
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) && 0x3fff;
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) && 0x3fff;
 
+	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]]) * 1000) && 0x3ff;  // 10 bits
+	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) && 0x3ff;
+	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) && 0x3ff;
+	
+	if (current[map[BAT]] < 0 ) {
+		uint16_t ic = (uint16_t)(current[map[BAT]] * -1000) && 0x3ff;  // charging current
+		uint16_t ib = 0;
+	}
+	else {
+		uint16_t ic = 0;
+		uint16_t ib = (uint16_t)(current[map[BAT]] * 1000) && 0x3ff;  // supplying current
+	}
+	
 //	x = 0xfffc; // 0xffff;
 //	y = 0x0; // 0x0000;
 //	z = 0xfffc; // 0xffff;
@@ -2333,8 +2346,31 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 4] = 0xff & (z >> 2);  // mV
 	source_bytes[FC_EPS + 5] = 0xc0 & (z << 0);
 	
-	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  // mV
+	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  
 	source_bytes[FC_EPS + 6] = 0xff & (b >> 0);
+
+	source_bytes[FC_EPS + 7] = 0xff & (ix >> 2);  
+	source_bytes[FC_EPS + 8] = 0xc0 & (iy << 6);  	
+
+	source_bytes[FC_EPS + 8] = source_bytes[FC_EPS + 8] | (0x3f & (iy >> 4));  
+	source_bytes[FC_EPS + 9] = 0xf0 & (iy << 4);	
+
+	source_bytes[FC_EPS + 9] = source_bytes[FC_EPS + 9] | (0x0f & (iz >> 6));  
+	source_bytes[FC_EPS + 10] = 0x3f & (iz << 2);
+
+	source_bytes[FC_EPS + 10] = source_bytes[FC_EPS + 10] | (0x03 & (ic >> 8));  
+	source_bytes[FC_EPS + 11] = 0xff & (ic << 0);	
+
+	source_bytes[FC_EPS + 12] = 0xff & (ib >> 2);  
+	source_bytes[FC_EPS + 13] = 0xc0 & (ib << 6);  
+
+	source_bytes[FC_EPS + 13] = source_bytes[FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
+	source_bytes[FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6);
+
+	uint8_t temp = (int)(other[IHU_TEMP] + 0.5);
+
+	source_bytes[FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
+	source_bytes[FC_EPS + 18] = 0xff & (temp << 6);
 /*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));

From 7ca536fbe58c82d8fe9ef600a128d853c775edac Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 13:20:04 -0500
Subject: [PATCH 11/96] Update main.c fix currents

---
 main.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/main.c b/main.c
index 5a56fdee..45b7c8ce 100644
--- a/main.c
+++ b/main.c
@@ -2318,15 +2318,14 @@ void get_tlm_fc() {
 	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]]) * 1000) && 0x3ff;  // 10 bits
 	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) && 0x3ff;
 	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) && 0x3ff;
+
+	uint16_t ic = 0, 
+	uint16_t ib = 0;
 	
-	if (current[map[BAT]] < 0 ) {
-		uint16_t ic = (uint16_t)(current[map[BAT]] * -1000) && 0x3ff;  // charging current
-		uint16_t ib = 0;
-	}
-	else {
-		uint16_t ic = 0;
-		uint16_t ib = (uint16_t)(current[map[BAT]] * 1000) && 0x3ff;  // supplying current
-	}
+	if (current[map[BAT]] < 0 ) 
+		ic = (uint16_t)(current[map[BAT]] * -1000) && 0x3ff;  // charging current
+	else 
+		ib = (uint16_t)(current[map[BAT]] * 1000) && 0x3ff;  // supplying current
 	
 //	x = 0xfffc; // 0xffff;
 //	y = 0x0; // 0x0000;

From 6c18f94d06be311b4773759cb69901967bd96f67 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 13:20:53 -0500
Subject: [PATCH 12/96] Update main.c missing ;

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 45b7c8ce..403cd68f 100644
--- a/main.c
+++ b/main.c
@@ -2319,7 +2319,7 @@ void get_tlm_fc() {
 	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) && 0x3ff;
 	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) && 0x3ff;
 
-	uint16_t ic = 0, 
+	uint16_t ic = 0; 
 	uint16_t ib = 0;
 	
 	if (current[map[BAT]] < 0 ) 

From 33f5b2461578607bfdd4e31190b9553632338350 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 13:26:50 -0500
Subject: [PATCH 13/96] Update main.c move sequence number

---
 main.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 403cd68f..e885b67b 100644
--- a/main.c
+++ b/main.c
@@ -2389,9 +2389,15 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 12] = 0xff & (((unsigned long int)reset_count >> 8));
 	source_bytes[FC_EPS + 13] = 0xff & ((unsigned long int)reset_count);
 */	
-	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
-	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
+	
+//	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
+//	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
+//	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
+
+	source_bytes[46] = 0xff & ((unsigned long int)sequence >> 16);
+	source_bytes[47] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[48] = 0xff & (unsigned long int)sequence++;
+
 /**/
 	printf("\nsource_bytes\n");
 	for (int i=0; i<256; i++)

From 34b07607dfc8f3b01a51360b98b80a2777ce3366 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 16:33:39 -0500
Subject: [PATCH 14/96] Update main.c add extended header

---
 main.c | 59 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/main.c b/main.c
index e885b67b..b9b504f5 100644
--- a/main.c
+++ b/main.c
@@ -2303,7 +2303,10 @@ void get_tlm_fc() {
 //	printf("\nSYMPBLOCK = %d\n", SYMPBLOCK);
 
 	memset(source_bytes, 0x00, sizeof(source_bytes));
-	source_bytes[0] = 0b11000001 ;    // 0b00000001 ;
+//	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
+	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
+	source_bytes[1] = 0x08 ; // extended Nayif
+	int extended = 1;
 	
 //	source_bytes[1] = 0b10000010 ;
 
@@ -2334,42 +2337,42 @@ void get_tlm_fc() {
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 	
-	source_bytes[FC_EPS + 0] = 0xff & (x >> 10);  // mV
-	source_bytes[FC_EPS + 1] = 0xfc & (x << 2);
+	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 10);  // mV
+	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
 
-        source_bytes[FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
-	source_bytes[FC_EPS + 2] = 0xff & (y >> 4);  // mV
-	source_bytes[FC_EPS + 3] = 0xf0 & (y << 0);
+        source_bytes[extended + FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
+	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 4);  // mV
+	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 0);
 
-	source_bytes[FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
-	source_bytes[FC_EPS + 4] = 0xff & (z >> 2);  // mV
-	source_bytes[FC_EPS + 5] = 0xc0 & (z << 0);
+	source_bytes[extended + FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
+	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // mV
+	source_bytes[extended + FC_EPS + 5] = 0xc0 & (z << 0);
 	
-	source_bytes[FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  
-	source_bytes[FC_EPS + 6] = 0xff & (b >> 0);
+	source_bytes[extended + FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  
+	source_bytes[extended + FC_EPS + 6] = 0xff & (b >> 0);
 
-	source_bytes[FC_EPS + 7] = 0xff & (ix >> 2);  
-	source_bytes[FC_EPS + 8] = 0xc0 & (iy << 6);  	
+	source_bytes[extended + FC_EPS + 7] = 0xff & (ix >> 2);  
+	source_bytes[extended + FC_EPS + 8] = 0xc0 & (iy << 6);  	
 
-	source_bytes[FC_EPS + 8] = source_bytes[FC_EPS + 8] | (0x3f & (iy >> 4));  
-	source_bytes[FC_EPS + 9] = 0xf0 & (iy << 4);	
+	source_bytes[extended + FC_EPS + 8] = source_bytes[FC_EPS + 8] | (0x3f & (iy >> 4));  
+	source_bytes[extended + FC_EPS + 9] = 0xf0 & (iy << 4);	
 
-	source_bytes[FC_EPS + 9] = source_bytes[FC_EPS + 9] | (0x0f & (iz >> 6));  
-	source_bytes[FC_EPS + 10] = 0x3f & (iz << 2);
+	source_bytes[extended + FC_EPS + 9] = source_bytes[FC_EPS + 9] | (0x0f & (iz >> 6));  
+	source_bytes[extended + FC_EPS + 10] = 0x3f & (iz << 2);
 
-	source_bytes[FC_EPS + 10] = source_bytes[FC_EPS + 10] | (0x03 & (ic >> 8));  
-	source_bytes[FC_EPS + 11] = 0xff & (ic << 0);	
+	source_bytes[extended + FC_EPS + 10] = source_bytes[FC_EPS + 10] | (0x03 & (ic >> 8));  
+	source_bytes[extended + FC_EPS + 11] = 0xff & (ic << 0);	
 
-	source_bytes[FC_EPS + 12] = 0xff & (ib >> 2);  
-	source_bytes[FC_EPS + 13] = 0xc0 & (ib << 6);  
+	source_bytes[extended + FC_EPS + 12] = 0xff & (ib >> 2);  
+	source_bytes[extended + FC_EPS + 13] = 0xc0 & (ib << 6);  
 
-	source_bytes[FC_EPS + 13] = source_bytes[FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
-	source_bytes[FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6);
+	source_bytes[extended + FC_EPS + 13] = source_bytes[FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
+	source_bytes[extended + FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6);
 
 	uint8_t temp = (int)(other[IHU_TEMP] + 0.5);
 
-	source_bytes[FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
-	source_bytes[FC_EPS + 18] = 0xff & (temp << 6);
+	source_bytes[extended + FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
+	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 /*
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
@@ -2394,9 +2397,9 @@ void get_tlm_fc() {
 //	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 //	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 
-	source_bytes[46] = 0xff & ((unsigned long int)sequence >> 16);
-	source_bytes[47] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[48] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);
+	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
 
 /**/
 	printf("\nsource_bytes\n");

From 94dfa92019a032e2fd2242306c1d18454cfde0e8 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 16:54:08 -0500
Subject: [PATCH 15/96] Update main.c try extended JY-1

---
 main.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index b9b504f5..4eab3c2c 100644
--- a/main.c
+++ b/main.c
@@ -2305,7 +2305,8 @@ void get_tlm_fc() {
 	memset(source_bytes, 0x00, sizeof(source_bytes));
 //	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
 	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
-	source_bytes[1] = 0x08 ; // extended Nayif
+//	source_bytes[1] = 0x08 ; // extended Nayify
+	source_bytes[1] = 0x00 ; // extended JY-1
 	int extended = 1;
 	
 //	source_bytes[1] = 0b10000010 ;
@@ -2326,7 +2327,7 @@ void get_tlm_fc() {
 	uint16_t ib = 0;
 	
 	if (current[map[BAT]] < 0 ) 
-		ic = (uint16_t)(current[map[BAT]] * -1000) && 0x3ff;  // charging current
+		ic = (uint16_t)(current[map[BAT]] * (-1000)) && 0x3ff;  // charging current
 	else 
 		ib = (uint16_t)(current[map[BAT]] * 1000) && 0x3ff;  // supplying current
 	
@@ -2397,9 +2398,9 @@ void get_tlm_fc() {
 //	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 //	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 
-	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);
-	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 45] = 0xff & ((unsigned long int)sequence >> 16);  // was 46
+	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 47] = 0xff & (unsigned long int)sequence++;
 
 /**/
 	printf("\nsource_bytes\n");

From 98f23505b5566d903f9967a990c9da79f845f052 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 17:03:55 -0500
Subject: [PATCH 16/96] Update main.c back to Nayif

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 4eab3c2c..05888c7d 100644
--- a/main.c
+++ b/main.c
@@ -2305,8 +2305,8 @@ void get_tlm_fc() {
 	memset(source_bytes, 0x00, sizeof(source_bytes));
 //	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
 	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
-//	source_bytes[1] = 0x08 ; // extended Nayify
-	source_bytes[1] = 0x00 ; // extended JY-1
+	source_bytes[1] = 0x08 ; // extended Nayify - works
+//	source_bytes[1] = 0x00 ; // extended JY-1 - didn't work
 	int extended = 1;
 	
 //	source_bytes[1] = 0b10000010 ;

From 10715456bff6a9c9e47f95d4b71609fbf5c2a304 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 21:54:23 -0500
Subject: [PATCH 17/96] Update main.c try 0x10 and 50 for seq

---
 main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 05888c7d..19141d39 100644
--- a/main.c
+++ b/main.c
@@ -2305,8 +2305,8 @@ void get_tlm_fc() {
 	memset(source_bytes, 0x00, sizeof(source_bytes));
 //	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
 	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
-	source_bytes[1] = 0x08 ; // extended Nayify - works
-//	source_bytes[1] = 0x00 ; // extended JY-1 - didn't work
+//	source_bytes[1] = 0x08 ; // extended Nayify - works
+	source_bytes[1] = 0x10 ; // extended JY-1 - 0x00 didn't work
 	int extended = 1;
 	
 //	source_bytes[1] = 0b10000010 ;
@@ -2398,9 +2398,9 @@ void get_tlm_fc() {
 //	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 //	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 
-	source_bytes[extended + 45] = 0xff & ((unsigned long int)sequence >> 16);  // was 46
-	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[extended + 47] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 48] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 49] = 0xff & (unsigned long int)sequence++;
 
 /**/
 	printf("\nsource_bytes\n");

From a7bc18c4bb40719df2dd96ee0a33c4d01d75ed79 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 22:01:33 -0500
Subject: [PATCH 18/96] Update main.c move seq

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 19141d39..128c64b3 100644
--- a/main.c
+++ b/main.c
@@ -2398,9 +2398,9 @@ void get_tlm_fc() {
 //	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 //	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 
-	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
-	source_bytes[extended + 48] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[extended + 49] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 45] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 47] = 0xff & (unsigned long int)sequence++;
 
 /**/
 	printf("\nsource_bytes\n");

From a129d1344930848aabc3920111831077dba685d3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 30 Jan 2025 22:18:23 -0500
Subject: [PATCH 19/96] Update main.c eclipse = 1, move seq

---
 main.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 128c64b3..d58ade5e 100644
--- a/main.c
+++ b/main.c
@@ -413,7 +413,8 @@ int main(int argc, char * argv[]) {
 
     batt = rnd_float(3.8, 4.3);
     speed = rnd_float(1.0, 2.5);
-    eclipse = (rnd_float(-1, +4) > 0) ? 1.0 : 0.0;
+//    eclipse = (rnd_float(-1, +4) > 0) ? 1.0 : 0.0;
+    eclipse = 1;	  
     period = rnd_float(150, 300);
     tempS = rnd_float(20, 55);
     temp_max = rnd_float(50, 70);
@@ -728,12 +729,13 @@ int main(int argc, char * argv[]) {
     if (sim_mode) { // simulated telemetry 
 
       double time = ((long int)millis() - time_start) / 1000.0;
-
+/*
       if ((time - eclipse_time) > period) {
         eclipse = (eclipse == 1) ? 0 : 1;
         eclipse_time = time;
         printf("\n\nSwitching eclipse mode! \n\n");
       }
+	    */
 
       double Xi = eclipse * amps_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2);
       double Yi = eclipse * amps_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2);
@@ -2398,9 +2400,9 @@ void get_tlm_fc() {
 //	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 //	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
 
-	source_bytes[extended + 45] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
-	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[extended + 47] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
 
 /**/
 	printf("\nsource_bytes\n");

From 55fa313dfcfe5e3e7e7ceb7c52b1bda919bb8805 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:33:52 -0500
Subject: [PATCH 20/96] Update main.c add FC-EM and JY-1 defines

---
 main.c | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index d58ade5e..ace14e71 100644
--- a/main.c
+++ b/main.c
@@ -2293,10 +2293,12 @@ if (setting == ON) {
 
 void get_tlm_fc() {  
 
+//# define FC-EM
+#define JY-1	
+	
 	/* create data, stream, and waveform buffers */
 
   	unsigned char source_bytes[256];
-//  	unsigned char encoded_bytes[650];
 	int byte_count = 256;
 
 	/* write telemetry into data buffer */
@@ -2305,13 +2307,15 @@ void get_tlm_fc() {
 //	printf("\nSYMPBLOCK = %d\n", SYMPBLOCK);
 
 	memset(source_bytes, 0x00, sizeof(source_bytes));
-//	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
+#ifdef FC-EM	
+	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
+#endif
+#ifdef JY-1	
 	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
 //	source_bytes[1] = 0x08 ; // extended Nayify - works
 	source_bytes[1] = 0x10 ; // extended JY-1 - 0x00 didn't work
 	int extended = 1;
-	
-//	source_bytes[1] = 0b10000010 ;
+#endif	
 
 //	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
 //	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
@@ -2339,7 +2343,7 @@ void get_tlm_fc() {
 //	b = 0x000c;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
-	
+#ifdef JY-1	
 	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 10);  // mV
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
 
@@ -2376,7 +2380,22 @@ void get_tlm_fc() {
 
 	source_bytes[extended + FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
-/*
+
+//	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+//	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
+//	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
+
+	source_bytes[extended + 46] = 0x01;
+	source_bytes[extended + 47] = 0x02;
+	source_bytes[extended + 48] = 0x03;
+	source_bytes[extended + 49] = 0x04;
+	source_bytes[extended + 50] = 0x05;
+	source_bytes[extended + 51] = 0x06;
+	source_bytes[extended + 52] = 0x07;
+	
+#endif
+	
+#ifdef FC-EM
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
 	source_bytes[FC_EPS + 2] = 0xff & (((unsigned int)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) >> 8));  // mV
@@ -2394,15 +2413,11 @@ void get_tlm_fc() {
 	source_bytes[FC_EPS + 11] = 0xff & ((unsigned int)(current[map[BAT]] * 1));
 	source_bytes[FC_EPS + 12] = 0xff & (((unsigned long int)reset_count >> 8));
 	source_bytes[FC_EPS + 13] = 0xff & ((unsigned long int)reset_count);
-*/	
 	
-//	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
-//	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
-//	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
-
-	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
-	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
-	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
+	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
+	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
+#endif
 
 /**/
 	printf("\nsource_bytes\n");

From c9aed9aea5cad94c3128f9e901cced0e74d96f0b Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:35:31 -0500
Subject: [PATCH 21/96] Update main.c fix defines

---
 main.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main.c b/main.c
index ace14e71..6bd1f981 100644
--- a/main.c
+++ b/main.c
@@ -2293,8 +2293,8 @@ if (setting == ON) {
 
 void get_tlm_fc() {  
 
-//# define FC-EM
-#define JY-1	
+//# define FC_EM
+#define JY_1	
 	
 	/* create data, stream, and waveform buffers */
 
@@ -2307,13 +2307,13 @@ void get_tlm_fc() {
 //	printf("\nSYMPBLOCK = %d\n", SYMPBLOCK);
 
 	memset(source_bytes, 0x00, sizeof(source_bytes));
-#ifdef FC-EM	
+#ifdef FC_EM	
 	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
 #endif
-#ifdef JY-1	
+#ifdef JY_1	
 	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
-//	source_bytes[1] = 0x08 ; // extended Nayify - works
-	source_bytes[1] = 0x10 ; // extended JY-1 - 0x00 didn't work
+//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
+	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;
 #endif	
 
@@ -2343,7 +2343,7 @@ void get_tlm_fc() {
 //	b = 0x000c;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
-#ifdef JY-1	
+#ifdef JY_1	
 	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 10);  // mV
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
 
@@ -2395,7 +2395,7 @@ void get_tlm_fc() {
 	
 #endif
 	
-#ifdef FC-EM
+#ifdef FC_EM
 	source_bytes[FC_EPS + 0] = 0xff & (((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) >> 8));  // mV
 	source_bytes[FC_EPS + 1] = 0xff & ((unsigned int)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
 	source_bytes[FC_EPS + 2] = 0xff & (((unsigned int)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) >> 8));  // mV

From ca47edbf945bb6c754e6243c16851eb5a0ef8b24 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:38:57 -0500
Subject: [PATCH 22/96] Update main.c fix JY-1 seq

---
 main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 6bd1f981..57491bb1 100644
--- a/main.c
+++ b/main.c
@@ -2381,10 +2381,11 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
-//	source_bytes[extended + 46] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
-//	source_bytes[extended + 47] = 0xff & ((unsigned long int)sequence >> 8);
-//	source_bytes[extended + 48] = 0xff & (unsigned long int)sequence++;
+	source_bytes[extended + 49 = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
+	source_bytes[extended + 51] = 0xff & (unsigned long int)sequence++;
 
+	/*
 	source_bytes[extended + 46] = 0x01;
 	source_bytes[extended + 47] = 0x02;
 	source_bytes[extended + 48] = 0x03;
@@ -2392,7 +2393,7 @@ void get_tlm_fc() {
 	source_bytes[extended + 50] = 0x05;
 	source_bytes[extended + 51] = 0x06;
 	source_bytes[extended + 52] = 0x07;
-	
+*/	
 #endif
 	
 #ifdef FC_EM

From f781b59b11d847a20e4e14564a0556171984d4dc Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:40:13 -0500
Subject: [PATCH 23/96] Update main.c missing ]

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 57491bb1..82d650e2 100644
--- a/main.c
+++ b/main.c
@@ -2381,7 +2381,7 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
-	source_bytes[extended + 49 = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
 	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[extended + 51] = 0xff & (unsigned long int)sequence++;
 

From 7bc97bb30bbc442945c9070fce8e316a625c72db Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:43:59 -0500
Subject: [PATCH 24/96] Update main.c turn on DEBUG_LOGGING

---
 main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 82d650e2..bfbafb25 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+#define DEBUG_LOGGING
+
 #include "main.h"
 
 //#define HAB  // uncomment to change APRS icon from Satellite to Balloon and only BAT telemetry

From 2d77bb7ab89bd4fed52793077a060ae3c7d7e65a Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:48:12 -0500
Subject: [PATCH 25/96] Update main.c sim_mode debugging

---
 main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index bfbafb25..d27a12b4 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define DEBUG_LOGGING
 
 #include "main.h"
 
@@ -421,11 +420,11 @@ int main(int argc, char * argv[]) {
     temp_max = rnd_float(50, 70);
     temp_min = rnd_float(10, 20);
 
-    #ifdef DEBUG_LOGGING
+//    #ifdef DEBUG_LOGGING
     for (int i = 0; i < 3; i++)
       printf("axis: %f angle: %f v: %f i: %f \n", axis[i], angle[i], volts_max[i], amps_max[i]);
     printf("batt: %f speed: %f eclipse_time: %f eclipse: %f period: %f temp: %f max: %f min: %f\n", batt, speed, eclipse_time, eclipse, period, tempS, temp_max, temp_min);
-    #endif
+//    #endif
 
     time_start = (long int) millis();
 
@@ -736,7 +735,7 @@ int main(int argc, char * argv[]) {
         eclipse_time = time;
         printf("\n\nSwitching eclipse mode! \n\n");
       }
-	    */
+*/
 
       double Xi = eclipse * amps_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2);
       double Yi = eclipse * amps_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2);
@@ -746,7 +745,7 @@ int main(int argc, char * argv[]) {
       double Yv = eclipse * volts_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-0.2, 0.2);
       double Zv = 2.0 * eclipse * volts_max[2] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-0.2, 0.2);
 
-   //    printf("Yi: %f Zi: %f %f %f Zv: %f \n", Yi, Zi, amps_max[2], angle[2], Zv);
+       printf("Yi: %f Zi: %f %f %f Zv: %f \n", Yi, Zi, amps_max[2], angle[2], Zv);
 
       current[map[PLUS_X]] = (Xi >= 0) ? Xi : 0;
       current[map[MINUS_X]] = (Xi >= 0) ? 0 : ((-1.0f) * Xi);

From c3056f1cc4c0a52ba7668676b1001ab16aba59b4 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 13:57:52 -0500
Subject: [PATCH 26/96] Update main.c prints

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index d27a12b4..13d10ebf 100644
--- a/main.c
+++ b/main.c
@@ -2317,8 +2317,8 @@ void get_tlm_fc() {
 	int extended = 1;
 #endif	
 
-//	printf("Volt: %f  Int: %d \n", voltage[map[BAT]], (unsigned int)(voltage[map[BAT]] * 1000)); 
-//	printf("Amps: %f  Int: %d \n", current[map[BAT]], (unsigned int)(current[map[BAT]] * 1)); 
+	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
+	printf("Amps: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
 
 	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff;  // 14 bits
 	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) && 0x3fff;

From b88d8804f4094eaa1392434fe42c7dc562063f7c Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:05:29 -0500
Subject: [PATCH 27/96] Update main.c prints for x

---
 main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.c b/main.c
index 13d10ebf..20b9ea07 100644
--- a/main.c
+++ b/main.c
@@ -2320,6 +2320,11 @@ void get_tlm_fc() {
 	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
 	printf("Amps: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
 
+	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]));
+	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
+	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
+	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff);
+
 	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff;  // 14 bits
 	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) && 0x3fff;
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) && 0x3fff;

From 8f957e0045a45c7034855ec010125a44b2dc97f6 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:08:55 -0500
Subject: [PATCH 28/96] Update main.c change && to &

---
 main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/main.c b/main.c
index 20b9ea07..c92126ba 100644
--- a/main.c
+++ b/main.c
@@ -2323,24 +2323,24 @@ void get_tlm_fc() {
 	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]));
 	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
 	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
-	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff);
+	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) & 0x3fff);
 
-	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) && 0x3fff;  // 14 bits
-	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) && 0x3fff;
-	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) && 0x3fff;
-	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) && 0x3fff;
+	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) & 0x3fff;  // 14 bits
+	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) & 0x3fff;
+	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) & 0x3fff;
+	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) & 0x3fff;
 
-	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]]) * 1000) && 0x3ff;  // 10 bits
-	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) && 0x3ff;
-	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) && 0x3ff;
+	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]]) * 1000) & 0x3ff;  // 10 bits
+	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) & 0x3ff;
+	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) & 0x3ff;
 
 	uint16_t ic = 0; 
 	uint16_t ib = 0;
 	
 	if (current[map[BAT]] < 0 ) 
-		ic = (uint16_t)(current[map[BAT]] * (-1000)) && 0x3ff;  // charging current
+		ic = (uint16_t)(current[map[BAT]] * (-1000)) & 0x3ff;  // charging current
 	else 
-		ib = (uint16_t)(current[map[BAT]] * 1000) && 0x3ff;  // supplying current
+		ib = (uint16_t)(current[map[BAT]] * 1000) & 0x3ff;  // supplying current
 	
 //	x = 0xfffc; // 0xffff;
 //	y = 0x0; // 0x0000;

From 45cb44b6fc6075ff03f506b3589a6446647e2db5 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:26:31 -0500
Subject: [PATCH 29/96] Update main.c find max of plus and minus

---
 main.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/main.c b/main.c
index c92126ba..b0dffaee 100644
--- a/main.c
+++ b/main.c
@@ -2320,12 +2320,9 @@ void get_tlm_fc() {
 	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
 	printf("Amps: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
 
-	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]));
-	printf(" %f\n", (voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000);
-	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000));
-	printf(" %d\n", (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) & 0x3fff);
-
-	uint16_t x = (uint16_t)((voltage[map[PLUS_X]] + voltage[map[MINUS_X]]) * 1000) & 0x3fff;  // 14 bits
+	float xmax = (voltage[map[PLUS_X]] > voltage[map[MINUS_X]]) ? voltage[map[PLUS_X]] : voltage[map[MINUS_X]];
+	
+	uint16_t x = (uint16_t)(xmax * 1000) & 0x3fff;  // 14 bits
 	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) & 0x3fff;
 	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) & 0x3fff;
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) & 0x3fff;

From 44891ff9c34cbbd34c0f39d9682a4d6f81bbcdc9 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:39:04 -0500
Subject: [PATCH 30/96] Update main.c don't multiply current by 1000

---
 main.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/main.c b/main.c
index b0dffaee..79490305 100644
--- a/main.c
+++ b/main.c
@@ -2321,23 +2321,27 @@ void get_tlm_fc() {
 	printf("Amps: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
 
 	float xmax = (voltage[map[PLUS_X]] > voltage[map[MINUS_X]]) ? voltage[map[PLUS_X]] : voltage[map[MINUS_X]];
+	float ymax = (voltage[map[PLUS_Y]] > voltage[map[MINUS_Y]]) ? voltage[map[PLUS_Y]] : voltage[map[MINUS_Y]];
+	float zmax = (voltage[map[PLUS_Z]] > voltage[map[MINUS_Z]]) ? voltage[map[PLUS_Z]] : voltage[map[MINUS_Z]];
+
+	printf("Vmax: %f %f %f \n", xmax, ymax, zmax);
 	
 	uint16_t x = (uint16_t)(xmax * 1000) & 0x3fff;  // 14 bits
-	uint16_t y = (uint16_t)((voltage[map[PLUS_Y]] + voltage[map[MINUS_Y]]) * 1000) & 0x3fff;
-	uint16_t z = (uint16_t)((voltage[map[PLUS_Z]] + voltage[map[MINUS_Z]]) * 1000) & 0x3fff;
+	uint16_t y = (uint16_t)(ymax * 1000) & 0x3fff;
+	uint16_t z = (uint16_t)(zmax * 1000) & 0x3fff;
 	uint16_t b = (uint16_t)(voltage[map[BAT]] * 1000) & 0x3fff;
 
-	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]]) * 1000) & 0x3ff;  // 10 bits
-	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]]) * 1000) & 0x3ff;
-	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]]) * 1000) & 0x3ff;
+	uint16_t ix = (uint16_t)((current[map[PLUS_X]] + current[map[MINUS_X]])) & 0x3ff;  // 10 bits
+	uint16_t iy = (uint16_t)((current[map[PLUS_Y]] + current[map[MINUS_Y]])) & 0x3ff;
+	uint16_t iz = (uint16_t)((current[map[PLUS_Z]] + current[map[MINUS_Z]])) & 0x3ff;
 
 	uint16_t ic = 0; 
 	uint16_t ib = 0;
 	
 	if (current[map[BAT]] < 0 ) 
-		ic = (uint16_t)(current[map[BAT]] * (-1000)) & 0x3ff;  // charging current
+		ic = (uint16_t)(current[map[BAT]] * (-1)) & 0x3ff;  // charging current
 	else 
-		ib = (uint16_t)(current[map[BAT]] * 1000) & 0x3ff;  // supplying current
+		ib = (uint16_t)(current[map[BAT]]) & 0x3ff;  // supplying current
 	
 //	x = 0xfffc; // 0xffff;
 //	y = 0x0; // 0x0000;

From 98c791ca48f0e2e8a663c2ee73688412c93a66e1 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:43:43 -0500
Subject: [PATCH 31/96] Update main.c print current minus

---
 main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 79490305..3df7825d 100644
--- a/main.c
+++ b/main.c
@@ -2318,7 +2318,8 @@ void get_tlm_fc() {
 #endif	
 
 	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
-	printf("Amps: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
+	printf("AmpsPlus: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
+	printf("AmpsMinus: %f %f %f %f \n", current[map[BAT2]], current[map[MINUS_X]] , current[map[MINUS_Y]], current[map[MINUS_Z]]); 
 
 	float xmax = (voltage[map[PLUS_X]] > voltage[map[MINUS_X]]) ? voltage[map[PLUS_X]] : voltage[map[MINUS_X]];
 	float ymax = (voltage[map[PLUS_Y]] > voltage[map[MINUS_Y]]) ? voltage[map[PLUS_Y]] : voltage[map[MINUS_Y]];

From fd69f62a798b3cb57d2dd9f58956defc3d70d416 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 14:47:40 -0500
Subject: [PATCH 32/96] Update main.c print currents

---
 main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.c b/main.c
index 3df7825d..34415c42 100644
--- a/main.c
+++ b/main.c
@@ -2350,6 +2350,8 @@ void get_tlm_fc() {
 //	b = 0x000c;
 
 	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
+	printf("iX %x iY %x iZ %x iB %x iC\n", ix, iy, iz, ib, ic);
+	
 #ifdef JY_1	
 	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 10);  // mV
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);

From 11e8a88489786f78bbc7d5da4fac3be6e5feb3e4 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 16:12:25 -0500
Subject: [PATCH 33/96] Update main.c shift fixes

---
 main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 34415c42..e0b92676 100644
--- a/main.c
+++ b/main.c
@@ -2353,16 +2353,21 @@ void get_tlm_fc() {
 	printf("iX %x iY %x iZ %x iB %x iC\n", ix, iy, iz, ib, ic);
 	
 #ifdef JY_1	
-	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 10);  // mV
+	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 6);  // 10
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
 
+	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
+
         source_bytes[extended + FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
-	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 4);  // mV
-	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 0);
+
+	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
+	
+	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // mV
+	source_bytes[extended + FC_EPS + 3] = 0f0 & (y << 4);
 
 	source_bytes[extended + FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
 	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // mV
-	source_bytes[extended + FC_EPS + 5] = 0xc0 & (z << 0);
+	source_bytes[extended + FC_EPS + 5] = 0xc0 & (z << 6);
 	
 	source_bytes[extended + FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  
 	source_bytes[extended + FC_EPS + 6] = 0xff & (b >> 0);

From b53b6f4079d81005d1f6c8abf15b6d8ad7b0537d Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 16:13:07 -0500
Subject: [PATCH 34/96] Update main.c typo

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index e0b92676..b5508978 100644
--- a/main.c
+++ b/main.c
@@ -2363,7 +2363,7 @@ void get_tlm_fc() {
 	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
 	
 	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // mV
-	source_bytes[extended + FC_EPS + 3] = 0f0 & (y << 4);
+	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 4);
 
 	source_bytes[extended + FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
 	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // mV

From c61f48b3a9d57d92a97290e3faee288f3021faa0 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 16:25:57 -0500
Subject: [PATCH 35/96] Update main.c more prints

---
 main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main.c b/main.c
index b5508978..5d1ebbd0 100644
--- a/main.c
+++ b/main.c
@@ -2357,6 +2357,9 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
 
 	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
+	printf("1: %x\n", (0x03 & (y >> 12)));
+	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] + (0x03 & (y >> 12)));
+	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12)));
 
         source_bytes[extended + FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
 

From e035b7514f2753997131e1be48a9f46b9257041e Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 16:35:28 -0500
Subject: [PATCH 36/96] Update main.c added missing extended +

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 5d1ebbd0..efd4a993 100644
--- a/main.c
+++ b/main.c
@@ -2361,7 +2361,7 @@ void get_tlm_fc() {
 	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] + (0x03 & (y >> 12)));
 	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12)));
 
-        source_bytes[extended + FC_EPS + 1] = source_bytes[FC_EPS + 1] | (0x03 & (y >> 12));
+        source_bytes[extended + FC_EPS + 1] = source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12));
 
 	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
 	

From b9674ad1d811853ac99fd1f29d5184abddf882e0 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 17:04:51 -0500
Subject: [PATCH 37/96] Update main.c missing extended

---
 main.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.c b/main.c
index efd4a993..d71e9123 100644
--- a/main.c
+++ b/main.c
@@ -2368,34 +2368,34 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // mV
 	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 4);
 
-	source_bytes[extended + FC_EPS + 3] = source_bytes[FC_EPS + 3] | (0x0f & (z >> 10));
+	source_bytes[extended + FC_EPS + 3] = source_bytes[extended + FC_EPS + 3] | (0x0f & (z >> 10));
 	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // mV
 	source_bytes[extended + FC_EPS + 5] = 0xc0 & (z << 6);
 	
-	source_bytes[extended + FC_EPS + 5] = source_bytes[FC_EPS + 5] | (0x3f & (b >> 8));  
+	source_bytes[extended + FC_EPS + 5] = source_bytes[extended + FC_EPS + 5] | (0x3f & (b >> 8));  
 	source_bytes[extended + FC_EPS + 6] = 0xff & (b >> 0);
 
 	source_bytes[extended + FC_EPS + 7] = 0xff & (ix >> 2);  
 	source_bytes[extended + FC_EPS + 8] = 0xc0 & (iy << 6);  	
 
-	source_bytes[extended + FC_EPS + 8] = source_bytes[FC_EPS + 8] | (0x3f & (iy >> 4));  
+	source_bytes[extended + FC_EPS + 8] = source_bytes[extended + FC_EPS + 8] | (0x3f & (iy >> 4));  
 	source_bytes[extended + FC_EPS + 9] = 0xf0 & (iy << 4);	
 
-	source_bytes[extended + FC_EPS + 9] = source_bytes[FC_EPS + 9] | (0x0f & (iz >> 6));  
+	source_bytes[extended + FC_EPS + 9] = source_bytes[extended + FC_EPS + 9] | (0x0f & (iz >> 6));  
 	source_bytes[extended + FC_EPS + 10] = 0x3f & (iz << 2);
 
-	source_bytes[extended + FC_EPS + 10] = source_bytes[FC_EPS + 10] | (0x03 & (ic >> 8));  
+	source_bytes[extended + FC_EPS + 10] = source_bytes[extended + FC_EPS + 10] | (0x03 & (ic >> 8));  
 	source_bytes[extended + FC_EPS + 11] = 0xff & (ic << 0);	
 
 	source_bytes[extended + FC_EPS + 12] = 0xff & (ib >> 2);  
 	source_bytes[extended + FC_EPS + 13] = 0xc0 & (ib << 6);  
 
-	source_bytes[extended + FC_EPS + 13] = source_bytes[FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
+	source_bytes[extended + FC_EPS + 13] = source_bytes[extended + FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
 	source_bytes[extended + FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6);
 
 	uint8_t temp = (int)(other[IHU_TEMP] + 0.5);
 
-	source_bytes[extended + FC_EPS + 17] = source_bytes[FC_EPS + 17] | 0x3f & (temp >> 2);
+	source_bytes[extended + FC_EPS + 17] = source_bytes[extended + FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
 	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46

From 028b0de5419da326b2c8fecc75b0ae80056b8ded Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 17:10:05 -0500
Subject: [PATCH 38/96] Update main.c put eclipse back in

---
 main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index d71e9123..46709d69 100644
--- a/main.c
+++ b/main.c
@@ -413,8 +413,8 @@ int main(int argc, char * argv[]) {
 
     batt = rnd_float(3.8, 4.3);
     speed = rnd_float(1.0, 2.5);
-//    eclipse = (rnd_float(-1, +4) > 0) ? 1.0 : 0.0;
-    eclipse = 1;	  
+    eclipse = (rnd_float(-1, +4) > 0) ? 1.0 : 0.0;
+//    eclipse = 1;	  
     period = rnd_float(150, 300);
     tempS = rnd_float(20, 55);
     temp_max = rnd_float(50, 70);
@@ -729,13 +729,12 @@ int main(int argc, char * argv[]) {
     if (sim_mode) { // simulated telemetry 
 
       double time = ((long int)millis() - time_start) / 1000.0;
-/*
+
       if ((time - eclipse_time) > period) {
         eclipse = (eclipse == 1) ? 0 : 1;
         eclipse_time = time;
         printf("\n\nSwitching eclipse mode! \n\n");
       }
-*/
 
       double Xi = eclipse * amps_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2);
       double Yi = eclipse * amps_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2);

From 94779f8a968f15982e2b1ba535be3010cc563bb6 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 31 Jan 2025 17:25:16 -0500
Subject: [PATCH 39/96] Update main.c remove prints

---
 main.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/main.c b/main.c
index 46709d69..86a98e62 100644
--- a/main.c
+++ b/main.c
@@ -2316,15 +2316,15 @@ void get_tlm_fc() {
 	int extended = 1;
 #endif	
 
-	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
-	printf("AmpsPlus: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
-	printf("AmpsMinus: %f %f %f %f \n", current[map[BAT2]], current[map[MINUS_X]] , current[map[MINUS_Y]], current[map[MINUS_Z]]); 
+//	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 
+//	printf("AmpsPlus: %f %f %f %f \n", current[map[BAT]], current[map[PLUS_X]] , current[map[PLUS_Y]], current[map[PLUS_Z]]); 
+//	printf("AmpsMinus: %f %f %f %f \n", current[map[BAT2]], current[map[MINUS_X]] , current[map[MINUS_Y]], current[map[MINUS_Z]]); 
 
 	float xmax = (voltage[map[PLUS_X]] > voltage[map[MINUS_X]]) ? voltage[map[PLUS_X]] : voltage[map[MINUS_X]];
 	float ymax = (voltage[map[PLUS_Y]] > voltage[map[MINUS_Y]]) ? voltage[map[PLUS_Y]] : voltage[map[MINUS_Y]];
 	float zmax = (voltage[map[PLUS_Z]] > voltage[map[MINUS_Z]]) ? voltage[map[PLUS_Z]] : voltage[map[MINUS_Z]];
 
-	printf("Vmax: %f %f %f \n", xmax, ymax, zmax);
+//	printf("Vmax: %f %f %f \n", xmax, ymax, zmax);
 	
 	uint16_t x = (uint16_t)(xmax * 1000) & 0x3fff;  // 14 bits
 	uint16_t y = (uint16_t)(ymax * 1000) & 0x3fff;
@@ -2348,22 +2348,13 @@ void get_tlm_fc() {
 //	z = 0xfffc; // 0xffff;
 //	b = 0x000c;
 
-	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
-	printf("iX %x iY %x iZ %x iB %x iC\n", ix, iy, iz, ib, ic);
+//	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
+//	printf("iX %x iY %x iZ %x iB %x iC\n", ix, iy, iz, ib, ic);
 	
 #ifdef JY_1	
 	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 6);  // 10
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
-
-	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
-	printf("1: %x\n", (0x03 & (y >> 12)));
-	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] + (0x03 & (y >> 12)));
-	printf("1: %x\n", source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12)));
-
         source_bytes[extended + FC_EPS + 1] = source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12));
-
-	printf("1: %x\n", source_bytes[extended + FC_EPS + 1]);
-	
 	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // mV
 	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 4);
 

From b1f4d72074c94f1b2ff5d4b773beb27e016a501f Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 08:03:01 -0500
Subject: [PATCH 40/96] Update main.c add command count and safe mode to FC

---
 main.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/main.c b/main.c
index 86a98e62..f0e91e10 100644
--- a/main.c
+++ b/main.c
@@ -2388,10 +2388,27 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 17] = source_bytes[extended + FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
+//	source_bytes[extended + FC_EPS + 45] = 0x0a;		
+	source_bytes[extended + FC_EPS + 48] = 0x0a;
+	
 	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
 	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[extended + 51] = 0xff & (unsigned long int)sequence++;
 
+	uint8_t groundCommandCount = 0;
+	FILE * command_count_file = fopen("/home/pi/CubeSatSim/command_count.txt", "r");
+	if (command_count_file != NULL) {	
+		char count_string[10];	
+		if ( (fgets(count_string, 10, command_count_file)) != NULL)
+			groundCommandCount = (uint8_t) atoi(count_string);     
+	} else 
+		printf("Error opening command_count.txt!\n");
+	fclose(command_count_file);
+
+	source_bytes[extended + 52] = 0xfc & (groundCommandCount << 2);
+
+	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);
+
 	/*
 	source_bytes[extended + 46] = 0x01;
 	source_bytes[extended + 47] = 0x02;
@@ -2425,6 +2442,7 @@ void get_tlm_fc() {
 	source_bytes[FC_SW + 0] = 0xff & ((unsigned long int)sequence >> 16); // Sequence number
 	source_bytes[FC_SW + 1] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[FC_SW + 2] = 0xff & (unsigned long int)sequence++;
+		
 #endif
 
 /**/

From 2ca84d08e577419884310b325c96c34efb8419c9 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 08:20:30 -0500
Subject: [PATCH 41/96] Update main.c try antenna deployment

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index f0e91e10..d221320f 100644
--- a/main.c
+++ b/main.c
@@ -2389,18 +2389,18 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
 //	source_bytes[extended + FC_EPS + 45] = 0x0a;		
-	source_bytes[extended + FC_EPS + 48] = 0x0a;
+	source_bytes[extended + 48] = 0x0a;
 	
 	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
 	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[extended + 51] = 0xff & (unsigned long int)sequence++;
 
-	uint8_t groundCommandCount = 0;
+	uint16_t groundCommandCount = 0;
 	FILE * command_count_file = fopen("/home/pi/CubeSatSim/command_count.txt", "r");
 	if (command_count_file != NULL) {	
 		char count_string[10];	
 		if ( (fgets(count_string, 10, command_count_file)) != NULL)
-			groundCommandCount = (uint8_t) atoi(count_string);     
+			groundCommandCount = (uint16_t) atoi(count_string);     
 	} else 
 		printf("Error opening command_count.txt!\n");
 	fclose(command_count_file);

From 2f370a238dc6dee0a2c8074fc0f5a6a0c64572ee Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 09:00:05 -0500
Subject: [PATCH 42/96] Update main.c SW valid, Ant 1 and 2

---
 main.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/main.c b/main.c
index d221320f..22ca7473 100644
--- a/main.c
+++ b/main.c
@@ -2388,8 +2388,7 @@ void get_tlm_fc() {
 	source_bytes[extended + FC_EPS + 17] = source_bytes[extended + FC_EPS + 17] | 0x3f & (temp >> 2);
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
-//	source_bytes[extended + FC_EPS + 45] = 0x0a;		
-	source_bytes[extended + 48] = 0x0a;
+	source_bytes[extended + 48] = 0x0c;  // Antenna 1 and 2 deployed
 	
 	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
 	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
@@ -2405,19 +2404,13 @@ void get_tlm_fc() {
 		printf("Error opening command_count.txt!\n");
 	fclose(command_count_file);
 
-	source_bytes[extended + 52] = 0xfc & (groundCommandCount << 2);
+//	source_bytes[extended + 52] = 0xfc & (groundCommandCount << 2);  // doesn't work
 
-	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);
+//	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);  // doesn't work
+
+	source_bytes[extended + 53] = 0x0f;  // SW valid 
+	source_bytes[extended + 54] = 0xf0;
 
-	/*
-	source_bytes[extended + 46] = 0x01;
-	source_bytes[extended + 47] = 0x02;
-	source_bytes[extended + 48] = 0x03;
-	source_bytes[extended + 49] = 0x04;
-	source_bytes[extended + 50] = 0x05;
-	source_bytes[extended + 51] = 0x06;
-	source_bytes[extended + 52] = 0x07;
-*/	
 #endif
 	
 #ifdef FC_EM

From 13f60f539a4ff11f0cdc443ca06ef2d9e6a40366 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 09:07:01 -0500
Subject: [PATCH 43/96] Update main.c safe mode

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 22ca7473..b208b80a 100644
--- a/main.c
+++ b/main.c
@@ -2409,7 +2409,7 @@ void get_tlm_fc() {
 //	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);  // doesn't work
 
 	source_bytes[extended + 53] = 0x0f;  // SW valid 
-	source_bytes[extended + 54] = 0xf0;
+	source_bytes[extended + 54] = 0xe8;  // SW valid and safe mode
 
 #endif
 	

From 0d6a845b263c6a97a6e9d844792edcc5dec0861c Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 09:19:48 -0500
Subject: [PATCH 44/96] Update main.c eclipse and safe mode set

---
 main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index b208b80a..55efcb84 100644
--- a/main.c
+++ b/main.c
@@ -2409,7 +2409,12 @@ void get_tlm_fc() {
 //	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);  // doesn't work
 
 	source_bytes[extended + 53] = 0x0f;  // SW valid 
-	source_bytes[extended + 54] = 0xe8;  // SW valid and safe mode
+	source_bytes[extended + 54] = 0xe8;  // SW valid
+
+	if (ix + iy + iz) < 4))
+		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x10;  // eclipse
+	if (SafeMode == 1)
+		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x08;  // safe mode
 
 #endif
 	

From 6870ad11635fa33f0e01b33a5c7fc6c618a262e1 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 09:20:50 -0500
Subject: [PATCH 45/96] Update main.c fix typo

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 55efcb84..0861c578 100644
--- a/main.c
+++ b/main.c
@@ -2411,7 +2411,7 @@ void get_tlm_fc() {
 	source_bytes[extended + 53] = 0x0f;  // SW valid 
 	source_bytes[extended + 54] = 0xe8;  // SW valid
 
-	if (ix + iy + iz) < 4))
+	if ((ix + iy + iz) < 4)
 		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x10;  // eclipse
 	if (SafeMode == 1)
 		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x08;  // safe mode

From d9fadf4d471b043eab2ed8edd136315be91a312c Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 09:32:55 -0500
Subject: [PATCH 46/96] Update main.c safe mode off

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 0861c578..eba4ed14 100644
--- a/main.c
+++ b/main.c
@@ -2409,7 +2409,7 @@ void get_tlm_fc() {
 //	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);  // doesn't work
 
 	source_bytes[extended + 53] = 0x0f;  // SW valid 
-	source_bytes[extended + 54] = 0xe8;  // SW valid
+	source_bytes[extended + 54] = 0xe0;  // SW valid
 
 	if ((ix + iy + iz) < 4)
 		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x10;  // eclipse

From d7664224de7cd22b037a054611e7bf5a00772903 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 22:21:33 -0500
Subject: [PATCH 47/96] Update main.c add socket_send

---
 main.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index eba4ed14..fc71c4d2 100644
--- a/main.c
+++ b/main.c
@@ -1770,6 +1770,8 @@ void get_tlm_fox() {
 
   // socket write
 
+socket_send(ctr);
+/*	
   if (!socket_open && transmit) {
     printf("Opening socket!\n");
  //   struct sockaddr_in address;
@@ -1858,6 +1860,7 @@ void get_tlm_fox() {
       sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0);
 //      printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret);
     }
+*/	  
 	  
     loop_count++;	  
     if ((firstTime == 1) || (((loop_count % 180) == 0) && (mode == FSK)) || (((loop_count % 80) == 0) && (mode == BPSK))) // do first time and was every 180 samples
@@ -2546,6 +2549,12 @@ void get_tlm_fc() {
 
   // socket write
 
+//  socket_send((((headerLen + syncBits + dataLen) * samples) * 2) + 2);
+  socket_send(ctr);
+	
+}
+void socket_send(int length)
+
   if (!socket_open && transmit) {
     printf("Opening socket!\n");
  //   struct sockaddr_in address;
@@ -2616,8 +2625,9 @@ void get_tlm_fc() {
 
 /* write waveform buffer over socket */
 
-  int length = (((headerLen + syncBits + dataLen) * samples) * 2) + 2;	// ctr * 2 + 2 like bpsk due to 2 bytes per sample.
-  printf("length: %d ctr: %d\n", length, ctr);	
+//  int length = (((headerLen + syncBits + dataLen) * samples) * 2) + 2;	// ctr * 2 + 2 like bpsk due to 2 bytes per sample.
+  length = length * 2 + 2;  // convert from samples to bytes
+//  printf("length in bytes: %d\n", length);	
 
   if (!error && transmit) {
     //	digitalWrite (0, LOW);

From 7f90dbcfb8a2291a4464bd47c1d61939e62f3d4f Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 22:22:27 -0500
Subject: [PATCH 48/96] Update main.h add socket_send

---
 main.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.h b/main.h
index 23a1f5a0..01f08db8 100644
--- a/main.h
+++ b/main.h
@@ -94,6 +94,7 @@ extern int Encode_8b10b[][256];
 extern const unsigned char ALPHA_TO[];
 // const unsigned char *CCodecAO40::encode(unsigned char *source_bytes, int byte_count);
 void program_radio();
+void socket_send(int length);
 
 int socket_open = 0;
 int sock = 0;

From d6a5c81bbc45f71f488e2eddc095c3e6f6207ad3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sat, 1 Feb 2025 22:29:39 -0500
Subject: [PATCH 49/96] Update main.c cleanup

---
 main.c | 64 +++++++++++++++++-----------------------------------------
 1 file changed, 19 insertions(+), 45 deletions(-)

diff --git a/main.c b/main.c
index fc71c4d2..e461314a 100644
--- a/main.c
+++ b/main.c
@@ -2293,7 +2293,7 @@ if (setting == ON) {
   return;
 }
 
-void get_tlm_fc() {  
+void get_tlm_fc() {  // FunCube Mode telemetry generation
 
 //# define FC_EM
 #define JY_1	
@@ -2345,55 +2345,50 @@ void get_tlm_fc() {
 		ic = (uint16_t)(current[map[BAT]] * (-1)) & 0x3ff;  // charging current
 	else 
 		ib = (uint16_t)(current[map[BAT]]) & 0x3ff;  // supplying current
-	
-//	x = 0xfffc; // 0xffff;
-//	y = 0x0; // 0x0000;
-//	z = 0xfffc; // 0xffff;
-//	b = 0x000c;
 
 //	printf("X %x Y %x Z %x B %x\n", x, y, z, b);
 //	printf("iX %x iY %x iZ %x iB %x iC\n", ix, iy, iz, ib, ic);
 	
 #ifdef JY_1	
-	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 6);  // 10
+	source_bytes[extended + FC_EPS + 0] = 0xff & (x >> 6);  // Vx
 	source_bytes[extended + FC_EPS + 1] = 0xfc & (x << 2);
         source_bytes[extended + FC_EPS + 1] = source_bytes[extended + FC_EPS + 1] | (0x03 & (y >> 12));
-	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // mV
+	source_bytes[extended + FC_EPS + 2] = 0xff & (y >> 2);  // Vy
 	source_bytes[extended + FC_EPS + 3] = 0xf0 & (y << 4);
 
 	source_bytes[extended + FC_EPS + 3] = source_bytes[extended + FC_EPS + 3] | (0x0f & (z >> 10));
-	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // mV
+	source_bytes[extended + FC_EPS + 4] = 0xff & (z >> 2);  // Vz
 	source_bytes[extended + FC_EPS + 5] = 0xc0 & (z << 6);
 	
 	source_bytes[extended + FC_EPS + 5] = source_bytes[extended + FC_EPS + 5] | (0x3f & (b >> 8));  
-	source_bytes[extended + FC_EPS + 6] = 0xff & (b >> 0);
+	source_bytes[extended + FC_EPS + 6] = 0xff & (b >> 0);  // Vb
 
-	source_bytes[extended + FC_EPS + 7] = 0xff & (ix >> 2);  
-	source_bytes[extended + FC_EPS + 8] = 0xc0 & (iy << 6);  	
+	source_bytes[extended + FC_EPS + 7] = 0xff & (ix >> 2);   // ix
+	source_bytes[extended + FC_EPS + 8] = 0xc0 & (iy << 6);   // iy
 
 	source_bytes[extended + FC_EPS + 8] = source_bytes[extended + FC_EPS + 8] | (0x3f & (iy >> 4));  
 	source_bytes[extended + FC_EPS + 9] = 0xf0 & (iy << 4);	
 
 	source_bytes[extended + FC_EPS + 9] = source_bytes[extended + FC_EPS + 9] | (0x0f & (iz >> 6));  
-	source_bytes[extended + FC_EPS + 10] = 0x3f & (iz << 2);
+	source_bytes[extended + FC_EPS + 10] = 0x3f & (iz << 2);  // iz
 
 	source_bytes[extended + FC_EPS + 10] = source_bytes[extended + FC_EPS + 10] | (0x03 & (ic >> 8));  
-	source_bytes[extended + FC_EPS + 11] = 0xff & (ic << 0);	
+	source_bytes[extended + FC_EPS + 11] = 0xff & (ic << 0);  // ic battery charging curent	
 
-	source_bytes[extended + FC_EPS + 12] = 0xff & (ib >> 2);  
+	source_bytes[extended + FC_EPS + 12] = 0xff & (ib >> 2);  // ib battery discharging current
 	source_bytes[extended + FC_EPS + 13] = 0xc0 & (ib << 6);  
 
 	source_bytes[extended + FC_EPS + 13] = source_bytes[extended + FC_EPS + 13] | 0x3f & (((unsigned long int)reset_count) >> 2);
-	source_bytes[extended + FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6);
+	source_bytes[extended + FC_EPS + 14] = 0xff & (((unsigned long int)reset_count) << 6); // reset count
 
 	uint8_t temp = (int)(other[IHU_TEMP] + 0.5);
 
-	source_bytes[extended + FC_EPS + 17] = source_bytes[extended + FC_EPS + 17] | 0x3f & (temp >> 2);
+	source_bytes[extended + FC_EPS + 17] = source_bytes[extended + FC_EPS + 17] | 0x3f & (temp >> 2);  // cpu temp
 	source_bytes[extended + FC_EPS + 18] = 0xff & (temp << 6);
 
 	source_bytes[extended + 48] = 0x0c;  // Antenna 1 and 2 deployed
 	
-	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // was 45 46
+	source_bytes[extended + 49] = 0xff & ((unsigned long int)sequence >> 16);  // sequence number
 	source_bytes[extended + 50] = 0xff & ((unsigned long int)sequence >> 8);
 	source_bytes[extended + 51] = 0xff & (unsigned long int)sequence++;
 
@@ -2407,9 +2402,7 @@ void get_tlm_fc() {
 		printf("Error opening command_count.txt!\n");
 	fclose(command_count_file);
 
-//	source_bytes[extended + 52] = 0xfc & (groundCommandCount << 2);  // doesn't work
-
-//	source_bytes[extended + 53] = 0x40 & (SafeMode == 1);  // doesn't work
+//	source_bytes[extended + 52] = 0xfc & (groundCommandCount << 2);  // command doesn't work
 
 	source_bytes[extended + 53] = 0x0f;  // SW valid 
 	source_bytes[extended + 54] = 0xe0;  // SW valid
@@ -2418,7 +2411,6 @@ void get_tlm_fc() {
 		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x10;  // eclipse
 	if (SafeMode == 1)
 		source_bytes[extended + 54] = source_bytes[extended + 54] | 0x08;  // safe mode
-
 #endif
 	
 #ifdef FC_EM
@@ -2512,12 +2504,6 @@ void get_tlm_fc() {
     {
       write_wave(ctr, buffer);
       if ((i % samples) == 0) {
- //       int symbol = (int)((i - 1) / (samples * 8));
- //       int bit = 8 - (i - symbol * samples * 8) / samples + 1;
-//        val = encoded_bytes[symbol];
-//       data = val & 1 << (bit - 1);
-        //		printf ("%d i: %d new frame %d data10[%d] = %x bit %d = %d \n",
-        //	    		 ctr/SAMPLES, i, frames, symbol, val, bit, (data > 0) );
         symbol = i / samples - 1;
 //	if (i < 100) printf("symbol = %d\n",symbol);      
 	data = encoded_bytes[symbol];      
@@ -2537,25 +2523,16 @@ void get_tlm_fc() {
 // printf("symbol = %d\n",symbol);
 // printf("\nctr = %d\n\n", ctr);
 
-
-/* open socket */
-
-  int error = 0;
-  // int count;
-  //  for (count = 0; count < dataLen; count++) {
-  //      printf("%02X", b[count]);
-  //  }
-  //  printf("\n");
-
-  // socket write
-
 //  socket_send((((headerLen + syncBits + dataLen) * samples) * 2) + 2);
   socket_send(ctr);
 	
 }
-void socket_send(int length)
 
-  if (!socket_open && transmit) {
+void socket_send(int length) {
+
+  int error = 0;
+
+  if (!socket_open && transmit) { // open socket if not open
     printf("Opening socket!\n");
  //   struct sockaddr_in address;
  //   int valread;
@@ -2630,7 +2607,6 @@ void socket_send(int length)
 //  printf("length in bytes: %d\n", length);	
 
   if (!error && transmit) {
-    //	digitalWrite (0, LOW);
  //   printf("Sending %d buffer bytes over socket after %d ms!\n", ctr, (long unsigned int)millis() - start);
     start = millis();
     int sock_ret = send(sock, buffer, length, 0);
@@ -2667,6 +2643,4 @@ void socket_send(int length)
 	
   if (socket_open == 1)	
     firstTime = 0;
-
-  return;
 }

From 94781acc9d5eb1ac034dfe48d2d061327a9ba527 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 08:30:00 -0500
Subject: [PATCH 50/96] Update main.c move more

---
 main.c | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/main.c b/main.c
index e461314a..c643e46f 100644
--- a/main.c
+++ b/main.c
@@ -1761,7 +1761,7 @@ void get_tlm_fox() {
   //	printf("\ctr/samples = %d ctr/(samples*10) = %d\n\n", ctr/samples, ctr/(samples*10));
   #endif
 
-  int error = 0;
+  //int error = 0;
   // int count;
   //  for (count = 0; count < dataLen; count++) {
   //      printf("%02X", b[count]);
@@ -1770,7 +1770,7 @@ void get_tlm_fox() {
 
   // socket write
 
-socket_send(ctr);
+//socket_send(ctr);
 /*	
   if (!socket_open && transmit) {
     printf("Opening socket!\n");
@@ -1881,41 +1881,42 @@ socket_send(ctr);
 	    
       for (int times = 0; times < max; times++) 	    
       {
-	      start = millis();  // send frame until buffer fills
-	      sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0);
+///	      start = millis();  // send frame until buffer fills
+	      socket_send(ctr);
+///	      sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0);
 //	      printf("socket send %d in %d ms bytes: %d \n\n",times + 2, (unsigned int)millis() - start, sock_ret);
 	      
-	      if ((millis() - start) > 500) {
-		      printf("Buffer over filled!\n");
-		      break;
-	      }
+///	      if ((millis() - start) > 500) {
+///		      printf("Buffer over filled!\n");
+///		      break;
+///	      }
 
-	      if (sock_ret < (ctr * 2 + 2)) {
+///	      if (sock_ret < (ctr * 2 + 2)) {
 	  //    printf("Not resending\n");
-		sleep(0.5);
-		sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0);
-		printf("socket resend %d in %d ms bytes: %d \n\n",times, millis() - start, sock_ret);
-	      }
+///		sleep(0.5);
+///		sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0);
+///		printf("socket resend %d in %d ms bytes: %d \n\n",times, millis() - start, sock_ret);
+///	      }
       }
       sampleTime = (unsigned int) millis(); // resetting time for sleeping
-      fflush(stdout);
+ //     fflush(stdout);
 //      if (firstTime == 1)
 //	      max -= 1;
     }
 
-    if (sock_ret == -1) {
-      printf("Error: %s \n", strerror(errno));
-      socket_open = 0;
+///    if (sock_ret == -1) {
+///      printf("Error: %s \n", strerror(errno));
+///      socket_open = 0;
       //transmitStatus = -1;
-    }
-  }
-  if (!transmit) {
-    fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
-    fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
-  }
-
-  if (socket_open == 1)	
-    firstTime = 0;
+///    }
+///  }
+///  if (!transmit) {
+///    fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
+///    fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
+///  }
+
+///  if (socket_open == 1)	
+///    firstTime = 0;
 //  else if (frames_sent > 0) //5)
 //    firstTime = 0;
 
@@ -2620,7 +2621,7 @@ void socket_send(int length) {
 //      printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret);
     }
 	  
-    loop_count++;	  
+//    loop_count++;	  
 
     if (sock_ret == -1) {
       printf("Error: %s \n", strerror(errno));

From c65288e05ac1c39097b34f12720078896e7e5561 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 08:49:47 -0500
Subject: [PATCH 51/96] Update main.c add socket_send print

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index c643e46f..820d5ac4 100644
--- a/main.c
+++ b/main.c
@@ -2611,8 +2611,8 @@ void socket_send(int length) {
  //   printf("Sending %d buffer bytes over socket after %d ms!\n", ctr, (long unsigned int)millis() - start);
     start = millis();
     int sock_ret = send(sock, buffer, length, 0);
-//    printf("socket send 1 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret);
-//    fflush(stdout);	  
+    printf("socket send 1 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret);
+    fflush(stdout);	  
     
     if (sock_ret < length) {
   //    printf("Not resending\n");

From e88d2d0dd14b51553a71bedde7c1d5040f5de7c0 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 08:55:10 -0500
Subject: [PATCH 52/96] Update main.c print Socket_send

---
 main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.c b/main.c
index 820d5ac4..9d034b9e 100644
--- a/main.c
+++ b/main.c
@@ -2531,6 +2531,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 
 void socket_send(int length) {
 
+  printf("Socket_send!\n");	
   int error = 0;
 
   if (!socket_open && transmit) { // open socket if not open

From 7da5486e68275c8f2bd2a1eaa4dee36ebe7873e2 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 09:02:28 -0500
Subject: [PATCH 53/96] Update main.c add back missing socket_send

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 9d034b9e..9ce8a1bb 100644
--- a/main.c
+++ b/main.c
@@ -1770,7 +1770,7 @@ void get_tlm_fox() {
 
   // socket write
 
-//socket_send(ctr);
+  socket_send(ctr);
 /*	
   if (!socket_open && transmit) {
     printf("Opening socket!\n");

From 984e15bed5893bc485e21111240efdf84aa3e046 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 09:10:02 -0500
Subject: [PATCH 54/96] Update main.c remove extra sleep

---
 main.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 9ce8a1bb..a66e0682 100644
--- a/main.c
+++ b/main.c
@@ -1910,10 +1910,10 @@ void get_tlm_fox() {
       //transmitStatus = -1;
 ///    }
 ///  }
-///  if (!transmit) {
-///    fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
-///    fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
-///  }
+  if (!transmit) {
+    fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
+    fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
+  }
 
 ///  if (socket_open == 1)	
 ///    firstTime = 0;
@@ -2527,6 +2527,19 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 //  socket_send((((headerLen + syncBits + dataLen) * samples) * 2) + 2);
   socket_send(ctr);
 	
+  if (!transmit) {
+    fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
+    fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
+  }
+
+  int startSleep = millis();	    
+  if ((millis() - sampleTime) < ((unsigned int)frameTime)) // - 750 + pi_zero_2_offset))  
+        sleep(1.0); 
+  while ((millis() - sampleTime) < ((unsigned int)frameTime)) // - 750 + pi_zero_2_offset))  
+        sleep(0.1); 
+  printf("Start sleep %d Sleep period: %d  while period: %d\n", startSleep, millis() - startSleep, millis() - sampleTime);
+  sampleTime = (unsigned int) millis(); // resetting time for sleeping
+  fflush(stdout);
 }
 
 void socket_send(int length) {
@@ -2629,6 +2642,8 @@ void socket_send(int length) {
       socket_open = 0;
     }
   }
+
+/*	
   if (!transmit) {
     fprintf(stderr, "\nNo CubeSatSim Band Pass Filter detected.  No transmissions after the CW ID.\n");
     fprintf(stderr, " See http://cubesatsim.org/wiki for info about building a CubeSatSim\n\n");
@@ -2642,6 +2657,7 @@ void socket_send(int length) {
   printf("Start sleep %d Sleep period: %d  while period: %d\n", startSleep, millis() - startSleep, millis() - sampleTime);
   sampleTime = (unsigned int) millis(); // resetting time for sleeping
   fflush(stdout);
+	*/
 	
   if (socket_open == 1)	
     firstTime = 0;

From 249444a19ebb949d52c2999c5c44a4be6573d2d9 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 13:31:00 -0500
Subject: [PATCH 55/96] Update main.c add Frame IMG2

---
 main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index a66e0682..bb998bab 100644
--- a/main.c
+++ b/main.c
@@ -2314,8 +2314,10 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	source_bytes[0] = 0b00000001 ;	// Sat Id is FunCube-EM
 #endif
 #ifdef JY_1	
-	source_bytes[0] = 0b11000001 ;    // Sat Id is extended
-//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
+//	source_bytes[0] = 0b11000001 ;    // Sat Id is extended, Frame 2 (RT2 + WO2)
+	source_bytes[0] = 0xE0 | 0x20 | 0x01;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
+
+	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;
 #endif	

From cd038e0ae5af2a7b7482b3895172f58af2bdfcb3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 13:34:42 -0500
Subject: [PATCH 56/96] Update main.c try RT1

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index bb998bab..8eacff66 100644
--- a/main.c
+++ b/main.c
@@ -2315,7 +2315,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 #endif
 #ifdef JY_1	
 //	source_bytes[0] = 0b11000001 ;    // Sat Id is extended, Frame 2 (RT2 + WO2)
-	source_bytes[0] = 0xE0 | 0x20 | 0x01;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
+	source_bytes[0] = 0xE0 | 0x20 | 0x00; // 1;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
 
 	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation

From 23eb29adc3b067a89c8e6d68d00c5cdbec8df037 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:22:16 -0500
Subject: [PATCH 57/96] Update main.h add image_id and image_file

---
 main.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.h b/main.h
index 01f08db8..c64d265f 100644
--- a/main.h
+++ b/main.h
@@ -109,6 +109,8 @@ short int buffer[2336400]; // max size for 10 frames count of BPSK
 FILE *sopen(const char *program);
 FILE *telem_file;	
 long int sequence = 0;
+int image_id = 0;
+FILE *image_file;
 
 #define S_RATE	(48000) // (44100)
 

From a3820ed7dd77aeb8cd93435c3f2929dd582ed749 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:22:27 -0500
Subject: [PATCH 58/96] Update main.c add image read

---
 main.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/main.c b/main.c
index 8eacff66..a60a63e2 100644
--- a/main.c
+++ b/main.c
@@ -2320,6 +2320,28 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;
+
+	if (image_file == NULL) {
+		file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
+		image_id++;
+		printf("Opening file image_file.bin for image_id: %d\n", image_id);
+	}
+	int pos = 56;	
+	source_bytes[pos++] = 0x55;
+	source_bytes[pos++] = 0x68;
+	int val;
+	if (image_file == NULL) {
+		printf("Writing image data to payload\n");
+		while (((val = getc(image_file)) != EOF) && (pos < 256)) {
+			source_bytes[pos++] = val;
+			printf("%2x ", val);
+		}
+		if (val == EOF) {
+			image_file = NULL;
+			printf("End of file reached!");
+		}
+	}
+	
 #endif	
 
 //	printf("Volts: %f %f %f %f \n", voltage[map[BAT]], voltage[map[PLUS_X]] , voltage[map[PLUS_Y]], voltage[map[PLUS_Z]]); 

From 2288de9b635cb61f336635c5f2d7c8d07e2df429 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:24:00 -0500
Subject: [PATCH 59/96] Update main.c fixed image_file

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index a60a63e2..4e59fae6 100644
--- a/main.c
+++ b/main.c
@@ -2322,7 +2322,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	int extended = 1;
 
 	if (image_file == NULL) {
-		file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
+		image_file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
 		image_id++;
 		printf("Opening file image_file.bin for image_id: %d\n", image_id);
 	}
@@ -2330,7 +2330,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	source_bytes[pos++] = 0x55;
 	source_bytes[pos++] = 0x68;
 	int val;
-	if (image_file == NULL) {
+	if (image_file != NULL) {
 		printf("Writing image data to payload\n");
 		while (((val = getc(image_file)) != EOF) && (pos < 256)) {
 			source_bytes[pos++] = val;

From 4970765985635b1f9b2df237f4a647a923dfe74d Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:24:57 -0500
Subject: [PATCH 60/96] Update main.c don't need to redefine val

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 4e59fae6..e9fab87d 100644
--- a/main.c
+++ b/main.c
@@ -2329,7 +2329,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	int pos = 56;	
 	source_bytes[pos++] = 0x55;
 	source_bytes[pos++] = 0x68;
-	int val;
+//	int val;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");
 		while (((val = getc(image_file)) != EOF) && (pos < 256)) {

From adf41188da3b5897956df16641b7ece5740b9a44 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:25:36 -0500
Subject: [PATCH 61/96] Update main.c change to value

---
 main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index e9fab87d..e3330202 100644
--- a/main.c
+++ b/main.c
@@ -2329,12 +2329,12 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	int pos = 56;	
 	source_bytes[pos++] = 0x55;
 	source_bytes[pos++] = 0x68;
-//	int val;
+	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");
-		while (((val = getc(image_file)) != EOF) && (pos < 256)) {
-			source_bytes[pos++] = val;
-			printf("%2x ", val);
+		while (((value = getc(image_file)) != EOF) && (pos < 256)) {
+			source_bytes[pos++] = value;
+			printf("%2x ", value);
 		}
 		if (val == EOF) {
 			image_file = NULL;

From 8baab38270885a32f0d4d8205d7f3e5dca8873ed Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:26:15 -0500
Subject: [PATCH 62/96] Update main.c typo

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index e3330202..e076b3df 100644
--- a/main.c
+++ b/main.c
@@ -2336,7 +2336,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 			source_bytes[pos++] = value;
 			printf("%2x ", value);
 		}
-		if (val == EOF) {
+		if (value == EOF) {
 			image_file = NULL;
 			printf("End of file reached!");
 		}

From ddc3292b414d25c8341113e813245c944ce6d13c Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:34:08 -0500
Subject: [PATCH 63/96] Update main.c don't do 55 and 68

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index e076b3df..3a67f44a 100644
--- a/main.c
+++ b/main.c
@@ -2326,9 +2326,9 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		image_id++;
 		printf("Opening file image_file.bin for image_id: %d\n", image_id);
 	}
-	int pos = 56;	
-	source_bytes[pos++] = 0x55;
-	source_bytes[pos++] = 0x68;
+	int pos = 56;	  // 56
+//	source_bytes[pos++] = 0x55;
+//	source_bytes[pos++] = 0x68;
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");

From 0ef6c60bcb4837c4c0b6f7885496e8d3fa48573d Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:36:27 -0500
Subject: [PATCH 64/96] Update main.c try 57

---
 main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 3a67f44a..89c20f1d 100644
--- a/main.c
+++ b/main.c
@@ -2326,9 +2326,9 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		image_id++;
 		printf("Opening file image_file.bin for image_id: %d\n", image_id);
 	}
-	int pos = 56;	  // 56
-//	source_bytes[pos++] = 0x55;
-//	source_bytes[pos++] = 0x68;
+	int pos = 57;	  // 56
+	source_bytes[pos++] = 0x55;
+	source_bytes[pos++] = 0x68;
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");

From 75515ce24b69dc0260b2f15f812b1a0c54ed0487 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:38:25 -0500
Subject: [PATCH 65/96] Update main.c back to 56

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 89c20f1d..a04a96ae 100644
--- a/main.c
+++ b/main.c
@@ -2326,7 +2326,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		image_id++;
 		printf("Opening file image_file.bin for image_id: %d\n", image_id);
 	}
-	int pos = 57;	  // 56
+	int pos = 56;	  // 56
 	source_bytes[pos++] = 0x55;
 	source_bytes[pos++] = 0x68;
 	int value;

From 0e3e5a50e29356cee176f76d60786a4b251236d6 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:42:24 -0500
Subject: [PATCH 66/96] Update main.c start after sequence > 10

---
 main.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index a04a96ae..673866bd 100644
--- a/main.c
+++ b/main.c
@@ -2321,10 +2321,12 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;
 
-	if (image_file == NULL) {
-		image_file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
-		image_id++;
-		printf("Opening file image_file.bin for image_id: %d\n", image_id);
+	if (sequence > 10) {
+		if (image_file == NULL)  {
+			image_file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
+			image_id++;
+			printf("Opening file image_file.bin for image_id: %d\n", image_id);
+		}
 	}
 	int pos = 56;	  // 56
 	source_bytes[pos++] = 0x55;

From 41cfd26c5d0d67610d10bef508ffb1ff0a1e5883 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 16:59:05 -0500
Subject: [PATCH 67/96] Update main.c remove duplicate 55 and 68

---
 main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 673866bd..f1b089cd 100644
--- a/main.c
+++ b/main.c
@@ -2329,8 +2329,8 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		}
 	}
 	int pos = 56;	  // 56
-	source_bytes[pos++] = 0x55;
-	source_bytes[pos++] = 0x68;
+//	source_bytes[pos++] = 0x55;
+//	source_bytes[pos++] = 0x68;
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");

From 6a25bd055ef0bba95c9251ec2552f25f20eacb2f Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 20:31:45 -0500
Subject: [PATCH 68/96] Update transmit.py add FC image

---
 transmit.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/transmit.py b/transmit.py
index 9e37acf7..48cd7e33 100644
--- a/transmit.py
+++ b/transmit.py
@@ -756,6 +756,7 @@ if __name__ == "__main__":
 #				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float &")
 				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
 			print("Turning LED on/off and listening for carrier")
+			image_index = 0;
 			while 1:
 				output(txLed, txLedOff)
 				sleep(0.4)
@@ -771,10 +772,26 @@ if __name__ == "__main__":
 					output(txLed, txLedOn)
 #					print(txLed)
 #					print(txLedOn)
+
 				if (mode == 'b'):
-					sleep(4.2)
-				else:
-					sleep(4.6)
+					sleep(4.2)	
+				else:  # FunCube mode image
+					try:
+						file = open("/home/pi/CubeSatSim/image_file.bin")
+						file.close()
+						image_present = True
+					except:
+						image_present = False
+					
+					if (!image_present):
+						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
+						print("Photo taken")
+						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + image_index + " -q 3 -J camera_out.jpg image_file.bin")
+						print("image_index " + image_index + "\n")
+						image_index = ( index_image + 1 ) % 256
+						sleep(2)
+					else:	
+						sleep(4.6)
 		elif (mode == 'e'):  # code based on https://zr6aic.blogspot.com/2016/11/creating-2m-fm-repeater-with-raspberry.html
 			print("Repeater")
 			print("Stopping command and control")

From 572c05c0d3517695217a934fd2fe301f7cb408f4 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 20:34:48 -0500
Subject: [PATCH 69/96] Update main.c delete image_file.bin when done

---
 main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main.c b/main.c
index f1b089cd..ffc5f713 100644
--- a/main.c
+++ b/main.c
@@ -2340,7 +2340,9 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		}
 		if (value == EOF) {
 			image_file = NULL;
-			printf("End of file reached!");
+			printf("End of file reached! Delete image_file.bin");
+			FILE * delete_image = popen("sudo rm /home/pi/CubeSatSim/image_file.bin", "r");
+  			pclose(delete_image); 
 		}
 	}
 	

From 450fb2aa353e752129f3c5149d083d97cb485921 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 20:38:54 -0500
Subject: [PATCH 70/96] Update transmit.py fix not

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 48cd7e33..cd771503 100644
--- a/transmit.py
+++ b/transmit.py
@@ -783,7 +783,7 @@ if __name__ == "__main__":
 					except:
 						image_present = False
 					
-					if (!image_present):
+					if (image_present == False):
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
 						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + image_index + " -q 3 -J camera_out.jpg image_file.bin")

From 6236ed301d8c97db7f4c9a7b719368435e6a4e1e Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Sun, 2 Feb 2025 20:41:50 -0500
Subject: [PATCH 71/96] Update transmit.py fix str

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index cd771503..78fbfc6d 100644
--- a/transmit.py
+++ b/transmit.py
@@ -786,7 +786,7 @@ if __name__ == "__main__":
 					if (image_present == False):
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + image_index + " -q 3 -J camera_out.jpg image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + image_index + "\n")
 						image_index = ( index_image + 1 ) % 256
 						sleep(2)

From 1ee36692d370ce4594393620a8640f55547ea7af Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 08:44:45 -0500
Subject: [PATCH 72/96] Update transmit.py add str() to print

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 78fbfc6d..4c01e21f 100644
--- a/transmit.py
+++ b/transmit.py
@@ -787,7 +787,7 @@ if __name__ == "__main__":
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
 						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
-						print("image_index " + image_index + "\n")
+						print("image_index " + str(image_index) + "\n")
 						image_index = ( index_image + 1 ) % 256
 						sleep(2)
 					else:	

From d6c2745e154846d423445a3632e764df3f271838 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:00:49 -0500
Subject: [PATCH 73/96] Update transmit.py image_index  typo

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 4c01e21f..92ab89e4 100644
--- a/transmit.py
+++ b/transmit.py
@@ -788,7 +788,7 @@ if __name__ == "__main__":
 						print("Photo taken")
 						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
-						image_index = ( index_image + 1 ) % 256
+						image_index = ( image_index + 1 ) % 256
 						sleep(2)
 					else:	
 						sleep(4.6)

From 98f93f5706a441e3277d44082de2ab039cc407fa Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:04:00 -0500
Subject: [PATCH 74/96] Update transmit.py turn off rpitx

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 92ab89e4..4c4f0fc4 100644
--- a/transmit.py
+++ b/transmit.py
@@ -754,7 +754,7 @@ if __name__ == "__main__":
 			
 			if (command_tx == True):
 #				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float &")
-				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
+##				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
 			print("Turning LED on/off and listening for carrier")
 			image_index = 0;
 			while 1:

From 51d05521fa572cea58af7bd9a22ccdb829b76318 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:05:02 -0500
Subject: [PATCH 75/96] Update transmit.py comment out if

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 4c4f0fc4..405b6c9e 100644
--- a/transmit.py
+++ b/transmit.py
@@ -752,7 +752,7 @@ if __name__ == "__main__":
 			GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
 			GPIO.setup(txLed, GPIO.OUT)
 			
-			if (command_tx == True):
+##			if (command_tx == True):
 #				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float &")
 ##				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
 			print("Turning LED on/off and listening for carrier")

From 85fc2da06d983d2e4286c14c3297c80b324401f4 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:07:54 -0500
Subject: [PATCH 76/96] Update transmit.py add prints

---
 transmit.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/transmit.py b/transmit.py
index 405b6c9e..292ef37f 100644
--- a/transmit.py
+++ b/transmit.py
@@ -758,6 +758,7 @@ if __name__ == "__main__":
 			print("Turning LED on/off and listening for carrier")
 			image_index = 0;
 			while 1:
+				print ("LED on")
 				output(txLed, txLedOff)
 				sleep(0.4)
 #				if (command_tx == False):
@@ -776,6 +777,7 @@ if __name__ == "__main__":
 				if (mode == 'b'):
 					sleep(4.2)	
 				else:  # FunCube mode image
+					print("Checking image_file.bin")
 					try:
 						file = open("/home/pi/CubeSatSim/image_file.bin")
 						file.close()

From 315d824f7557cea2b56e418d7a22d86d03a4f3d6 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:11:44 -0500
Subject: [PATCH 77/96] Update transmit.py CALL, image index start at 1

---
 transmit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/transmit.py b/transmit.py
index 292ef37f..8a7290d6 100644
--- a/transmit.py
+++ b/transmit.py
@@ -756,7 +756,7 @@ if __name__ == "__main__":
 #				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float &")
 ##				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
 			print("Turning LED on/off and listening for carrier")
-			image_index = 0;
+			image_index = 1;
 			while 1:
 				print ("LED on")
 				output(txLed, txLedOff)
@@ -788,7 +788,7 @@ if __name__ == "__main__":
 					if (image_present == False):
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -c CALLSIGN -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -c CALL -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)

From ca10f464302089cba1370bbeca088071ad283677 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:13:53 -0500
Subject: [PATCH 78/96] Update transmit.py turning transmit back on

---
 transmit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/transmit.py b/transmit.py
index 8a7290d6..cc295bbe 100644
--- a/transmit.py
+++ b/transmit.py
@@ -752,9 +752,9 @@ if __name__ == "__main__":
 			GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
 			GPIO.setup(txLed, GPIO.OUT)
 			
-##			if (command_tx == True):
+			if (command_tx == True):
 #				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float &")
-##				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
+				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f " + tx + "e6 -t float &")
 			print("Turning LED on/off and listening for carrier")
 			image_index = 1;
 			while 1:

From 377929ce58bfe7c08e25166ec78d33f2c8a07d80 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 09:15:29 -0500
Subject: [PATCH 79/96] Update transmit.py fix camera image path

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index cc295bbe..690b9e04 100644
--- a/transmit.py
+++ b/transmit.py
@@ -788,7 +788,7 @@ if __name__ == "__main__":
 					if (image_present == False):
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -c CALL -i " + str(image_index) + " -q 3 -J camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -c CALL -i " + str(image_index) + " -q 3 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)

From 4ee431033d555effeb625b51796fac602faf9f57 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 11:56:04 -0500
Subject: [PATCH 80/96] Update install add ssdv install for FunCube images

---
 install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install b/install
index 046ab3c8..7294539d 100755
--- a/install
+++ b/install
@@ -125,6 +125,10 @@ cd rpitx
 
 cd
 
+git clone https://github.com/alanbjohnston/ssdv.git  # install ssdv for FunCube images
+cd ssdv
+make
+
 cd
 
 sudo cp ~/CubeSatSim/systemd/cubesatsim.service /etc/systemd/system/cubesatsim.service

From 305129c995effbbfd4dc507c668ff2e03bdcf6ae Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 11:59:03 -0500
Subject: [PATCH 81/96] Update main.c alternate last bit of frame id

---
 main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.c b/main.c
index ffc5f713..c8dd4945 100644
--- a/main.c
+++ b/main.c
@@ -2317,6 +2317,8 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 //	source_bytes[0] = 0b11000001 ;    // Sat Id is extended, Frame 2 (RT2 + WO2)
 	source_bytes[0] = 0xE0 | 0x20 | 0x00; // 1;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
 
+	source_bytes[0] = source_bytes[0] | ( 0x01 & (uint_8)(sequence % 2))  // alternate last bit for RT1, RT2.
+
 	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;

From 14d52e7925bc5d068ddcdd357953ecba126710e3 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 12:00:24 -0500
Subject: [PATCH 82/96] Update main.c unit typo

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index c8dd4945..3a9677ea 100644
--- a/main.c
+++ b/main.c
@@ -2317,7 +2317,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 //	source_bytes[0] = 0b11000001 ;    // Sat Id is extended, Frame 2 (RT2 + WO2)
 	source_bytes[0] = 0xE0 | 0x20 | 0x00; // 1;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
 
-	source_bytes[0] = source_bytes[0] | ( 0x01 & (uint_8)(sequence % 2))  // alternate last bit for RT1, RT2.
+	source_bytes[0] = source_bytes[0] | ( 0x01 & (uint8_t)(sequence % 2))  // alternate last bit for RT1, RT2.
 
 	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation

From 792304ce7e4aaf4ad57ff72b373a55fc9e264f83 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 12:01:01 -0500
Subject: [PATCH 83/96] Update main.c missing ;

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 3a9677ea..524abd32 100644
--- a/main.c
+++ b/main.c
@@ -2317,7 +2317,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 //	source_bytes[0] = 0b11000001 ;    // Sat Id is extended, Frame 2 (RT2 + WO2)
 	source_bytes[0] = 0xE0 | 0x20 | 0x00; // 1;    // Sat Id is extended, Frame 34 (RT2 + IMG2)
 
-	source_bytes[0] = source_bytes[0] | ( 0x01 & (uint8_t)(sequence % 2))  // alternate last bit for RT1, RT2.
+	source_bytes[0] = source_bytes[0] | ( 0x01 & (uint8_t)(sequence % 2));  // alternate last bit for RT1, RT2.
 
 	//	source_bytes[1] = 0x08 ; // extended Nayify - works per code
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation

From 794bb40ff2ace2ba0fce807c48e7472234d82a38 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 12:24:56 -0500
Subject: [PATCH 84/96] Update transmit.py no call, no FEC

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index 690b9e04..b636b5a9 100644
--- a/transmit.py
+++ b/transmit.py
@@ -788,7 +788,7 @@ if __name__ == "__main__":
 					if (image_present == False):
 						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -c CALL -i " + str(image_index) + " -q 3 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 3 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)

From a5a0f1a8a11e4a67edbb0191d12508c3226248ea Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 12:46:23 -0500
Subject: [PATCH 85/96] Update main.c check pos before getc

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 524abd32..9e47c212 100644
--- a/main.c
+++ b/main.c
@@ -2336,7 +2336,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");
-		while (((value = getc(image_file)) != EOF) && (pos < 256)) {
+		while ((pos < 256) && ((value = getc(image_file)) != EOF)) {
 			source_bytes[pos++] = value;
 			printf("%2x ", value);
 		}

From 024e2cdf32e8bcb66899b2f5d52ebe50893ed60c Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 16:11:08 -0500
Subject: [PATCH 86/96] Update transmit.py camera_photo function, -q 2

---
 transmit.py | 82 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 27 deletions(-)

diff --git a/transmit.py b/transmit.py
index b636b5a9..caf827b6 100644
--- a/transmit.py
+++ b/transmit.py
@@ -135,6 +135,33 @@ def increment_mode():
 	except:
 		print("can't write to .mode file")
 		
+def camera_photo():
+	
+	system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
+	print("Photo taken")
+
+	file='/home/pi/CubeSatSim/camera_out.jpg'
+	font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
+	font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
+
+	try:
+		filep = open("/home/pi/CubeSatSim/telem_string.txt")
+		telem_string = filep.readline()
+	except:
+		telem_string = ""
+		if (debug_mode == 1):
+			print("Can't read telem_string.txt")		
+	print(telem_string)
+	
+	img = Image.open(file)
+	draw = ImageDraw.Draw(img) 
+#					draw.text((10, 10), callsign, font=font2, fill='white')
+#					draw.text((120, 10), telem_string, font=font2, fill='white')					
+	draw.text((12, 12), callsign, font=font1, fill='black')
+	draw.text((10, 10), callsign, font=font1, fill='white')
+	draw.text((122, 12), telem_string, font=font2, fill='black')
+	draw.text((120, 10), telem_string, font=font2, fill='white')
+	img.save(file)
 
 print("CubeSatSim v2.0 transmit.py starting...")
 
@@ -580,32 +607,32 @@ if __name__ == "__main__":
 					print("image 2 did not load - copy from CubeSatSim/sstv directory")
 				while 1:
 #					command_control_check()			
-					
-					system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
-					print("Photo taken")
-
-					file='/home/pi/CubeSatSim/camera_out.jpg'
-					font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
-					font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
-
-					try:
-						filep = open("/home/pi/CubeSatSim/telem_string.txt")
-						telem_string = filep.readline()
-					except:
-						telem_string = ""
-						if (debug_mode == 1):
-							print("Can't read telem_string.txt")		
-					print(telem_string)
-					
-					img = Image.open(file)
-					draw = ImageDraw.Draw(img) 
+					camera_photo()
+##					system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
+##					print("Photo taken")
+##
+##					file='/home/pi/CubeSatSim/camera_out.jpg'
+##					font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
+##					font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
+##
+##					try:
+##						filep = open("/home/pi/CubeSatSim/telem_string.txt")
+##						telem_string = filep.readline()
+##					except:
+##						telem_string = ""
+##						if (debug_mode == 1):
+##							print("Can't read telem_string.txt")		
+##					print(telem_string)
+##					
+##					img = Image.open(file)
+##					draw = ImageDraw.Draw(img) 
 #					draw.text((10, 10), callsign, font=font2, fill='white')
 #					draw.text((120, 10), telem_string, font=font2, fill='white')					
-					draw.text((12, 12), callsign, font=font1, fill='black')
-					draw.text((10, 10), callsign, font=font1, fill='white')
-					draw.text((122, 12), telem_string, font=font2, fill='black')
-					draw.text((120, 10), telem_string, font=font2, fill='white')
-					img.save(file)
+##					draw.text((12, 12), callsign, font=font1, fill='black')
+##					draw.text((10, 10), callsign, font=font1, fill='white')
+##					draw.text((122, 12), telem_string, font=font2, fill='black')
+##					draw.text((120, 10), telem_string, font=font2, fill='white')
+##					img.save(file)
 					
 #					command_control_check()			
 					
@@ -786,9 +813,10 @@ if __name__ == "__main__":
 						image_present = False
 					
 					if (image_present == False):
-						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
-						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 3 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						camera_photo()
+##						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
+##						print("Photo taken")
+						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 2 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)

From a1985178cc3b5074fd019b3f7d07e4726d1377b5 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 16:21:53 -0500
Subject: [PATCH 87/96] Update main.c

---
 main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 9e47c212..79051464 100644
--- a/main.c
+++ b/main.c
@@ -526,7 +526,10 @@ int main(int argc, char * argv[]) {
 	   
       sin_samples = S_RATE/freq_Hz;	 		
       for (int j = 0; j < sin_samples; j++) {	 		
-        sin_map[j] = (short int)(amplitude * sin((float)(2 * M_PI * j / sin_samples)));	 		
+        sin_map[j] = (short int)(amplitude * sin((float)(2 * M_PI * j / sin_samples)));	 
+
+      FILE * delete_image = popen("sudo rm /home/pi/CubeSatSim/image_file.bin", "r");  // delete any previous camera images
+      pclose(delete_image); 	      
       }	 		
       printf("\n");
    }
@@ -2323,13 +2326,13 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 	source_bytes[1] = 0x10 ; // extended JY-1 - works, no documentation
 	int extended = 1;
 
-	if (sequence > 10) {
+//	if (sequence > 10) {
 		if (image_file == NULL)  {
 			image_file = fopen("/home/pi/CubeSatSim/image_file.bin", "r");
 			image_id++;
 			printf("Opening file image_file.bin for image_id: %d\n", image_id);
 		}
-	}
+//	}
 	int pos = 56;	  // 56
 //	source_bytes[pos++] = 0x55;
 //	source_bytes[pos++] = 0x68;
@@ -2338,7 +2341,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 		printf("Writing image data to payload\n");
 		while ((pos < 256) && ((value = getc(image_file)) != EOF)) {
 			source_bytes[pos++] = value;
-			printf("%2x ", value);
+//			printf("%2x ", value);
 		}
 		if (value == EOF) {
 			image_file = NULL;

From ed45ad6eb142de1ffc2f2b8aa4a6d58ccb7b5201 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 16:22:16 -0500
Subject: [PATCH 88/96] Update transmit.py -q 4

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index caf827b6..e5eb5cd6 100644
--- a/transmit.py
+++ b/transmit.py
@@ -816,7 +816,7 @@ if __name__ == "__main__":
 						camera_photo()
 ##						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 ##						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 2 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 4 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)

From 30aa9bb4224ce635fcca33bcd6710b36e6831738 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:05:55 -0500
Subject: [PATCH 89/96] add non-progressive jpeg for ssd

---
 sstv/sstv_image_2_320_x_256.jpeg | Bin 0 -> 24002 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sstv/sstv_image_2_320_x_256.jpeg

diff --git a/sstv/sstv_image_2_320_x_256.jpeg b/sstv/sstv_image_2_320_x_256.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..588a1aa78589f76bdd85e7daee181e0ccd1d8277
GIT binary patch
literal 24002
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

literal 0
HcmV?d00001


From 6baa23169e125a95a2345d36bbb662851dbf928f Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:17:02 -0500
Subject: [PATCH 90/96] Update transmit.py FC send stored image if no camera

---
 transmit.py | 55 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/transmit.py b/transmit.py
index e5eb5cd6..2e16f767 100644
--- a/transmit.py
+++ b/transmit.py
@@ -135,33 +135,40 @@ def increment_mode():
 	except:
 		print("can't write to .mode file")
 		
-def camera_photo():
-	
-	system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
-	print("Photo taken")
-
-	file='/home/pi/CubeSatSim/camera_out.jpg'
-	font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
-	font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
-
+def camera_photo():	
+	stored_image = False
 	try:
-		filep = open("/home/pi/CubeSatSim/telem_string.txt")
-		telem_string = filep.readline()
+		system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
+		f = open("/home/pi/CubeSatSim/camera_out.jpg")
+		f.close()
+		print("Photo taken")
 	except:
-		telem_string = ""
-		if (debug_mode == 1):
-			print("Can't read telem_string.txt")		
-	print(telem_string)
+		system("cp /home/pi/CubeSatSim/sstv//sstv_image_2_320_x_256.jpeg /home/pi/CubeSatSim/camera_out.jpg")
+		print("Using stored image")
+		stored_image = True
+	if (stored_image == False):	
+		file='/home/pi/CubeSatSim/camera_out.jpg'
+		font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
+		font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
 	
-	img = Image.open(file)
-	draw = ImageDraw.Draw(img) 
-#					draw.text((10, 10), callsign, font=font2, fill='white')
-#					draw.text((120, 10), telem_string, font=font2, fill='white')					
-	draw.text((12, 12), callsign, font=font1, fill='black')
-	draw.text((10, 10), callsign, font=font1, fill='white')
-	draw.text((122, 12), telem_string, font=font2, fill='black')
-	draw.text((120, 10), telem_string, font=font2, fill='white')
-	img.save(file)
+		try:
+			filep = open("/home/pi/CubeSatSim/telem_string.txt")
+			telem_string = filep.readline()
+		except:
+			telem_string = ""
+			if (debug_mode == 1):
+				print("Can't read telem_string.txt")		
+		print(telem_string)
+		
+		img = Image.open(file)
+		draw = ImageDraw.Draw(img) 
+	#					draw.text((10, 10), callsign, font=font2, fill='white')
+	#					draw.text((120, 10), telem_string, font=font2, fill='white')					
+		draw.text((12, 12), callsign, font=font1, fill='black')
+		draw.text((10, 10), callsign, font=font1, fill='white')
+		draw.text((122, 12), telem_string, font=font2, fill='black')
+		draw.text((120, 10), telem_string, font=font2, fill='white')
+		img.save(file)
 
 print("CubeSatSim v2.0 transmit.py starting...")
 

From b19dc85b80a3d6376ca569d363c611c82a924b8e Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:18:53 -0500
Subject: [PATCH 91/96] Update main.h add FC_PAYLOAD

---
 main.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.h b/main.h
index c64d265f..4082e5c3 100644
--- a/main.h
+++ b/main.h
@@ -56,6 +56,7 @@
 #define FC_EPS 1
 #define FC_BOB 25
 #define FC_SW 50
+#define FC_PAYLOAD 45
 
 #define RSSI 0
 #define IHU_TEMP 2

From 28a7318db879c5416d7c996234238159e58c2d69 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:19:25 -0500
Subject: [PATCH 92/96] Update main.c add FC_PAYLOAD

---
 main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 79051464..8c499bd3 100644
--- a/main.c
+++ b/main.c
@@ -2333,9 +2333,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 			printf("Opening file image_file.bin for image_id: %d\n", image_id);
 		}
 //	}
-	int pos = 56;	  // 56
-//	source_bytes[pos++] = 0x55;
-//	source_bytes[pos++] = 0x68;
+	int pos = FC_PAYLOAD + extended;	  /
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");

From 6401fd236e0fbea1066825b14bb1d7cd16f844f5 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:20:14 -0500
Subject: [PATCH 93/96] Update main.c fix FC_PAYLOAD

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 8c499bd3..de0e06b3 100644
--- a/main.c
+++ b/main.c
@@ -2333,7 +2333,7 @@ void get_tlm_fc() {  // FunCube Mode telemetry generation
 			printf("Opening file image_file.bin for image_id: %d\n", image_id);
 		}
 //	}
-	int pos = FC_PAYLOAD + extended;	  /
+	int pos = FC_PAYLOAD + extended;	  
 	int value;
 	if (image_file != NULL) {
 		printf("Writing image data to payload\n");

From b1bbaeb7d9c2729c4f24f5e430307c4c3f5e14a0 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:28:27 -0500
Subject: [PATCH 94/96] Update main.h payload starts at 55

---
 main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.h b/main.h
index 4082e5c3..8c886988 100644
--- a/main.h
+++ b/main.h
@@ -56,7 +56,7 @@
 #define FC_EPS 1
 #define FC_BOB 25
 #define FC_SW 50
-#define FC_PAYLOAD 45
+#define FC_PAYLOAD 55
 
 #define RSSI 0
 #define IHU_TEMP 2

From a9a1c767807125987865d886d90c96d618818115 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:35:39 -0500
Subject: [PATCH 95/96] Update transmit.py fix camera test

---
 transmit.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/transmit.py b/transmit.py
index 2e16f767..a3844747 100644
--- a/transmit.py
+++ b/transmit.py
@@ -135,7 +135,8 @@ def increment_mode():
 	except:
 		print("can't write to .mode file")
 		
-def camera_photo():	
+def camera_photo():
+	system("sudo rm /home/pi/CubeSatSim/camera_out.jpg")
 	stored_image = False
 	try:
 		system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
@@ -792,7 +793,7 @@ if __name__ == "__main__":
 			print("Turning LED on/off and listening for carrier")
 			image_index = 1;
 			while 1:
-				print ("LED on")
+#				print ("LED on")
 				output(txLed, txLedOff)
 				sleep(0.4)
 #				if (command_tx == False):
@@ -811,7 +812,7 @@ if __name__ == "__main__":
 				if (mode == 'b'):
 					sleep(4.2)	
 				else:  # FunCube mode image
-					print("Checking image_file.bin")
+#					print("Checking image_file.bin")
 					try:
 						file = open("/home/pi/CubeSatSim/image_file.bin")
 						file.close()

From ea1448b6cf2dfc8b66dfd548bef50e121392de6a Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 3 Feb 2025 22:38:55 -0500
Subject: [PATCH 96/96] Update transmit.py quality 3

---
 transmit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transmit.py b/transmit.py
index a3844747..f7246370 100644
--- a/transmit.py
+++ b/transmit.py
@@ -824,7 +824,7 @@ if __name__ == "__main__":
 						camera_photo()
 ##						system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 ##						print("Photo taken")
-						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 4 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
+						system("/home/pi/ssdv/ssdv -e -n -i " + str(image_index) + " -q 3 -J /home/pi/CubeSatSim/camera_out.jpg /home/pi/CubeSatSim/image_file.bin")
 						print("image_index " + str(image_index) + "\n")
 						image_index = ( image_index + 1 ) % 256
 						sleep(2)