diff --git a/Eagle/satcam_v3_mini.brd b/Eagle/satcam_v3_mini.brd index c1267b4..a902c5a 100644 --- a/Eagle/satcam_v3_mini.brd +++ b/Eagle/satcam_v3_mini.brd @@ -6,7 +6,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -123,7 +123,7 @@ -OK2ALP v3/2019 +OK2ALP v3/2020 GND SW- VCC @@ -1109,7 +1109,7 @@ design rules under a new name. - + @@ -1209,15 +1209,15 @@ design rules under a new name. - + - - - + + + @@ -1247,6 +1247,10 @@ design rules under a new name. + + + + @@ -1605,7 +1609,7 @@ design rules under a new name. - + @@ -1617,7 +1621,6 @@ design rules under a new name. - @@ -1640,6 +1643,11 @@ design rules under a new name. + + + + + @@ -1936,12 +1944,12 @@ design rules under a new name. - - - + + + - - + + @@ -1993,12 +2001,15 @@ design rules under a new name. - - - - - + + + + + + + + @@ -2416,9 +2427,9 @@ design rules under a new name. - - - + + + @@ -2504,6 +2515,8 @@ design rules under a new name. + + diff --git a/Eagle/satcam_v3_mini.sch b/Eagle/satcam_v3_mini.sch index af44005..97f358e 100644 --- a/Eagle/satcam_v3_mini.sch +++ b/Eagle/satcam_v3_mini.sch @@ -8020,6 +8020,8 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf + + @@ -8149,7 +8151,7 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf - + @@ -8165,6 +8167,8 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf + + @@ -8570,6 +8574,7 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf + @@ -8591,6 +8596,10 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf + + + + @@ -8904,7 +8913,11 @@ http://www.fairchildsemi.com/ds/LM/LM7805.pdf diff --git a/Eagle/satcam_v3_mini_sch.pdf b/Eagle/satcam_v3_mini_sch.pdf index ad7675b..5eb7192 100644 Binary files a/Eagle/satcam_v3_mini_sch.pdf and b/Eagle/satcam_v3_mini_sch.pdf differ diff --git a/Eagle/satcam_v3_mini_tvalues.pdf b/Eagle/satcam_v3_mini_tvalues.pdf index 5cb7f79..5672c69 100644 Binary files a/Eagle/satcam_v3_mini_tvalues.pdf and b/Eagle/satcam_v3_mini_tvalues.pdf differ diff --git a/PHP/multitlm.php b/PHP/multitlm.php index 27df953..12206b8 100644 --- a/PHP/multitlm.php +++ b/PHP/multitlm.php @@ -2,6 +2,8 @@

PSAT-2 TLM stream decoder

+Insert separator

+ + +

PSAT-2 TLM decoder

+ +Separator OK. + + + + diff --git a/PHP/psat2tlm.php b/PHP/psat2tlm.php index 99b2334..260b1c6 100644 --- a/PHP/psat2tlm.php +++ b/PHP/psat2tlm.php @@ -227,7 +227,7 @@ if ($tlm != "") { if ($tlm2[0] == 'A' || $tlm2[0] == 'B' || $tlm2[0] == 'C' || $tlm2[0] == 'D') { echo "

PSK TLM

\n"; echo "
\n";
-            $excel = parse_tlm_psk($tlm2, $comment);
+            $excel = parse_tlm_psk($tlm2, $comment.' '.date('Y-m-d'));
             echo "
"; legend_psk(); $fp = fopen("tlm_psk.txt", "a"); @@ -240,7 +240,7 @@ if ($tlm != "") { else if ($tlm2[0] == 'S') { echo "

SSTV TLM

\n"; echo "
\n";
-            $excel = parse_tlm_sstv($tlm2, $comment);
+            $excel = parse_tlm_sstv($tlm2, $comment.' '.date('Y-m-d'));
             echo "
"; legend_sstv(); $fp = fopen("tlm_sstv.txt", "a");