From 69c459d2933da4aacd9ff85b87f7ee6602c22192 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 20 Jul 2019 08:09:54 -0400 Subject: [PATCH 01/17] Update main.c --- afsk/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index c8ea7caf..53730c90 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -84,7 +84,7 @@ uint16_t config = (0x2000 | 0x1800 | 0x0180 | 0x0018 | 0x0007 ); int x_fd; // I2C bus 0 address 0x40 int x_powerMultiplier; int x_currentDivider; -int x_calValue; +int x_calValue_x; int y_fd; // I2C bus 0 address 0x41 int z_fd; // I2C bos 0 address 0x44 @@ -142,7 +142,7 @@ int main(void) { // new INA219 current reading code - x_calValue = 8192; + x_calValue_x = 8192; x_powerMultiplier = 1; x_currentDivider = 20; config = INA219_CONFIG_BVOLTAGERANGE_16V | @@ -356,19 +356,19 @@ int get_tlm(int tlm[][5]) { // read i2c current sensors // double current = 0, power = 0, y_current = 0, y_power = 0, z_current = 0, z_power = 0; if (x_fd != -1) { - wiringPiI2CWriteReg16(x_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(x_fd, INA219_REG_CALIBRATION, x_calValue_x); wiringPiI2CWriteReg16(x_fd, INA219_REG_CONFIG, config); - wiringPiI2CWriteReg16(x_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(x_fd, INA219_REG_CALIBRATION, x_calValue_x); current = wiringPiI2CReadReg16(x_fd, INA219_REG_CURRENT) / x_currentDivider; power = wiringPiI2CReadReg16(x_fd, INA219_REG_POWER) * x_powerMultiplier; - wiringPiI2CWriteReg16(y_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(y_fd, INA219_REG_CALIBRATION, x_calValue_x); wiringPiI2CWriteReg16(y_fd, INA219_REG_CONFIG, config); - wiringPiI2CWriteReg16(y_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(y_fd, INA219_REG_CALIBRATION, x_calValue_x); y_current = wiringPiI2CReadReg16(y_fd, INA219_REG_CURRENT) / x_currentDivider; y_power = wiringPiI2CReadReg16(y_fd, INA219_REG_POWER) * x_powerMultiplier; - wiringPiI2CWriteReg16(z_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(z_fd, INA219_REG_CALIBRATION, x_calValue_x); wiringPiI2CWriteReg16(z_fd, INA219_REG_CONFIG, config); - wiringPiI2CWriteReg16(z_fd, INA219_REG_CALIBRATION, x_calValue); + wiringPiI2CWriteReg16(z_fd, INA219_REG_CALIBRATION, x_calValue_x); z_current = wiringPiI2CReadReg16(z_fd, INA219_REG_CURRENT) / x_currentDivider; z_power = wiringPiI2CReadReg16(z_fd, INA219_REG_POWER) * x_powerMultiplier; } From b3553b9df9f05fd6657a60017ee1524b2bc4e66d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:48:04 -0400 Subject: [PATCH 02/17] added FoxTelem spacecraft files --- CubeSat_Simulator_BPSK_fm.MASTER | 65 ++++++++++++++++++++++++++++++++ CubeSat_Simulator_FSK_fm.MASTER | 65 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 CubeSat_Simulator_BPSK_fm.MASTER create mode 100644 CubeSat_Simulator_FSK_fm.MASTER diff --git a/CubeSat_Simulator_BPSK_fm.MASTER b/CubeSat_Simulator_BPSK_fm.MASTER new file mode 100644 index 00000000..a7461ae7 --- /dev/null +++ b/CubeSat_Simulator_BPSK_fm.MASTER @@ -0,0 +1,65 @@ +#CubeSat Simulator Telemetry Decoder Properties +#Thu Feb 09 21:13:22 EST 2017 +foxId=99 +IHU_SN=7 +catalogNumber=0 +model=1 +mpptResistanceError=6.58 +mpptSensorOffThreshold=1600 +name=CubeSat Simulator BPSK +BATTERY_CURRENT_ZERO=-1.834 +hasImprovedCommandReceiver=true +EXP1=6 +EXP2=1 +EXP3=8 +EXP4=7 +description=CubeSat Simulator is a functional satellite model that generates real telemetry from solar panels, batteries, and temperature sensors. For more information see http://cubesatsim.org +numberOfFrameLayouts=5 +frameLayout0.filename=FOX1E_Type0_ALL_WOD.frame +frameLayout0.name=All WOD +frameLayout1.filename=FOX1E_Type1_HEALTH.frame +frameLayout1.name=Health +frameLayout2.filename=FOX1E_Type2_MINMAX.frame +frameLayout2.name=MinMax +frameLayout3.filename=FOX1E_Type3_REALTIME_BEACON.frame +frameLayout3.name=Realtime Beacon +frameLayout4.filename=FOX1E_Type4_WOD_BEACON.frame +frameLayout4.name=WOD Beacon +numberOfLayouts=9 +layout0.filename=FOX1A_debug.csv +layout0.name=DEBUG +layout1.filename=FOX1E_maxtelemetry.csv +layout1.name=maxtelemetry +layout2.filename=FOX1E_rttelemetry.csv +layout2.name=rttelemetry +layout3.filename=FOX1E_mintelemetry.csv +layout3.name=mintelemetry +layout4.filename=FOX1E_radtelemetry.csv +layout4.name=radtelemetry +layout5.filename=FOX1E_radtelemetry2.csv +layout5.name=radtelemetry2 +layout5.parentLayout=radtelemetry +layout6.filename=FOX1E_wodtelemetry.csv +layout6.name=wodtelemetry +layout7.filename=FOX1E_wodradtelemetry.csv +layout7.name=wodradtelemetry +layout8.filename=FOX1E_wodradtelemetry2.csv +layout8.name=wodradtelemetry2 +layout8.parentLayout=wodradtelemetry +numberOfLookupTables=3 +lookupTable0.filename=FOX1A_rssiFM.tab +lookupTable0=RSSI +lookupTable1.filename=FOX1E_ihuVBattSNx.tab +lookupTable1=IHU_VBATT +lookupTable2.filename=FOX1A_ihutempSN7.tab +lookupTable2=IHU_TEMP +maxFreqBoundkHz=44950 +measurementsFileName=measurements.csv +memsRestValueX=2129 +memsRestValueY=2131 +memsRestValueZ=2103 +minFreqBoundkHz=434850 +passMeasurementsFileName=passmeasurements.csv +telemetryDownlinkFreqkHz=434900 +track=false +useIHUVBatt=false \ No newline at end of file diff --git a/CubeSat_Simulator_FSK_fm.MASTER b/CubeSat_Simulator_FSK_fm.MASTER new file mode 100644 index 00000000..9e3a2bcb --- /dev/null +++ b/CubeSat_Simulator_FSK_fm.MASTER @@ -0,0 +1,65 @@ +#CubeSat Simulator Telemetry Decoder Properties +#Thu Feb 09 21:13:22 EST 2017 +foxId=7 +IHU_SN=7 +catalogNumber=0 +model=1 +mpptResistanceError=6.58 +mpptSensorOffThreshold=1600 +name=CubeSat Simulator FSK +BATTERY_CURRENT_ZERO=-1.834 +hasImprovedCommandReceiver=true +EXP1=6 +EXP2=1 +EXP3=8 +EXP4=7 +description=CubeSat Simulator is a functional satellite model that generates real telemetry from solar panels, batteries, and temperature sensors. For more information see http://cubesatsim.org +numberOfFrameLayouts=5 +frameLayout0.filename=FOX1E_Type0_ALL_WOD.frame +frameLayout0.name=All WOD +frameLayout1.filename=FOX1E_Type1_HEALTH.frame +frameLayout1.name=Health +frameLayout2.filename=FOX1E_Type2_MINMAX.frame +frameLayout2.name=MinMax +frameLayout3.filename=FOX1E_Type3_REALTIME_BEACON.frame +frameLayout3.name=Realtime Beacon +frameLayout4.filename=FOX1E_Type4_WOD_BEACON.frame +frameLayout4.name=WOD Beacon +numberOfLayouts=9 +layout0.filename=FOX1A_debug.csv +layout0.name=DEBUG +layout1.filename=FOX1E_maxtelemetry.csv +layout1.name=maxtelemetry +layout2.filename=FOX1E_rttelemetry.csv +layout2.name=rttelemetry +layout3.filename=FOX1E_mintelemetry.csv +layout3.name=mintelemetry +layout4.filename=FOX1E_radtelemetry.csv +layout4.name=radtelemetry +layout5.filename=FOX1E_radtelemetry2.csv +layout5.name=radtelemetry2 +layout5.parentLayout=radtelemetry +layout6.filename=FOX1E_wodtelemetry.csv +layout6.name=wodtelemetry +layout7.filename=FOX1E_wodradtelemetry.csv +layout7.name=wodradtelemetry +layout8.filename=FOX1E_wodradtelemetry2.csv +layout8.name=wodradtelemetry2 +layout8.parentLayout=wodradtelemetry +numberOfLookupTables=3 +lookupTable0.filename=FOX1A_rssiFM.tab +lookupTable0=RSSI +lookupTable1.filename=FOX1E_ihuVBattSNx.tab +lookupTable1=IHU_VBATT +lookupTable2.filename=FOX1A_ihutempSN7.tab +lookupTable2=IHU_TEMP +maxFreqBoundkHz=435760 +measurementsFileName=measurements.csv +memsRestValueX=2129 +memsRestValueY=2131 +memsRestValueZ=2103 +minFreqBoundkHz=435740 +passMeasurementsFileName=passmeasurements.csv +telemetryDownlinkFreqkHz=435750 +track=false +useIHUVBatt=false \ No newline at end of file From ee9482940b755e5b20d4a48a6b7ad9b24f5c656f Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:50:22 -0400 Subject: [PATCH 03/17] Update README.md --- groundstation/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/groundstation/README.md b/groundstation/README.md index 941a15cf..fdc48b3a 100644 --- a/groundstation/README.md +++ b/groundstation/README.md @@ -1,4 +1,6 @@ -These files relate to the optional Raspberry Pi Ground Station. +In the spacecraft directory, there are .MASTER files which are spacecraft configuration files for FoxTelem. Download them into the spacecraft folder of your FoxTelem software and add the spacecraft. + +The rest of the files relate to the optional Raspberry Pi Ground Station. The Ground Station can be installed on any Windows or Linux PC or laptop, but it does require drivers to be installed (RTL-SDR) and virtual audio cable (for sound) to be installed. This requires administrator privileges on the computer. From 2b9bdd9ab5fc422f1a3036476e9f30bc93629665 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:51:08 -0400 Subject: [PATCH 04/17] Update README.md --- groundstation/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/groundstation/README.md b/groundstation/README.md index fdc48b3a..9d757a08 100644 --- a/groundstation/README.md +++ b/groundstation/README.md @@ -1,6 +1,4 @@ -In the spacecraft directory, there are .MASTER files which are spacecraft configuration files for FoxTelem. Download them into the spacecraft folder of your FoxTelem software and add the spacecraft. - -The rest of the files relate to the optional Raspberry Pi Ground Station. +The files relate to the optional Raspberry Pi Ground Station. The Ground Station can be installed on any Windows or Linux PC or laptop, but it does require drivers to be installed (RTL-SDR) and virtual audio cable (for sound) to be installed. This requires administrator privileges on the computer. From dd837e4a59a648bae645bc8df903ae613479936d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:54:45 -0400 Subject: [PATCH 05/17] Rename CubeSat_Simulator_BPSK_fm.MASTER to spacecraft/CubeSat_Simulator_BPSK_fm.MASTER --- .../CubeSat_Simulator_BPSK_fm.MASTER | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename CubeSat_Simulator_BPSK_fm.MASTER => spacecraft/CubeSat_Simulator_BPSK_fm.MASTER (96%) diff --git a/CubeSat_Simulator_BPSK_fm.MASTER b/spacecraft/CubeSat_Simulator_BPSK_fm.MASTER similarity index 96% rename from CubeSat_Simulator_BPSK_fm.MASTER rename to spacecraft/CubeSat_Simulator_BPSK_fm.MASTER index a7461ae7..40ac7bed 100644 --- a/CubeSat_Simulator_BPSK_fm.MASTER +++ b/spacecraft/CubeSat_Simulator_BPSK_fm.MASTER @@ -62,4 +62,4 @@ minFreqBoundkHz=434850 passMeasurementsFileName=passmeasurements.csv telemetryDownlinkFreqkHz=434900 track=false -useIHUVBatt=false \ No newline at end of file +useIHUVBatt=false From cb134a953a55d78f3d363daf688e97f6fb3d2175 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:55:16 -0400 Subject: [PATCH 06/17] Rename CubeSat_Simulator_FSK_fm.MASTER to spacecraft/CubeSat_Simulator_FSK_fm.MASTER --- .../CubeSat_Simulator_FSK_fm.MASTER | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename CubeSat_Simulator_FSK_fm.MASTER => spacecraft/CubeSat_Simulator_FSK_fm.MASTER (96%) diff --git a/CubeSat_Simulator_FSK_fm.MASTER b/spacecraft/CubeSat_Simulator_FSK_fm.MASTER similarity index 96% rename from CubeSat_Simulator_FSK_fm.MASTER rename to spacecraft/CubeSat_Simulator_FSK_fm.MASTER index 9e3a2bcb..da155364 100644 --- a/CubeSat_Simulator_FSK_fm.MASTER +++ b/spacecraft/CubeSat_Simulator_FSK_fm.MASTER @@ -62,4 +62,4 @@ minFreqBoundkHz=435740 passMeasurementsFileName=passmeasurements.csv telemetryDownlinkFreqkHz=435750 track=false -useIHUVBatt=false \ No newline at end of file +useIHUVBatt=false From 18f2df49cace3efaacd2b05983bd03dea44a414d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 16:58:02 -0400 Subject: [PATCH 07/17] Create README.md --- spacecraft/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spacecraft/README.md diff --git a/spacecraft/README.md b/spacecraft/README.md new file mode 100644 index 00000000..3dcd50d8 --- /dev/null +++ b/spacecraft/README.md @@ -0,0 +1,9 @@ +These files are for FoxTelem, the AMSAT software for decoding and displaying Fox-1 series CubeSat telemetry. + +To use FoxTelem with the CubeSat Simulator, you will need to download the 1.09 version: + +https://www.g0kla.com/foxtelem/downloads/test/ + +Next, download the .MASTER files in this directory and put them in the FoxTelem spacecraft folder. + +Run FoxTelem, then go under Spacecraft/Add and select the .MASTER files to add the CubeSat Simulator to FoxTelem. From 6462394bec3ac17e620acef70082528ab8bd5f39 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 22:14:23 -0400 Subject: [PATCH 08/17] changed from FSK to DUV --- ..._Simulator_FSK_fm.MASTER => CubeSat_Simulator_DUV_fm.MASTER} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename spacecraft/{CubeSat_Simulator_FSK_fm.MASTER => CubeSat_Simulator_DUV_fm.MASTER} (95%) diff --git a/spacecraft/CubeSat_Simulator_FSK_fm.MASTER b/spacecraft/CubeSat_Simulator_DUV_fm.MASTER similarity index 95% rename from spacecraft/CubeSat_Simulator_FSK_fm.MASTER rename to spacecraft/CubeSat_Simulator_DUV_fm.MASTER index da155364..362e0f55 100644 --- a/spacecraft/CubeSat_Simulator_FSK_fm.MASTER +++ b/spacecraft/CubeSat_Simulator_DUV_fm.MASTER @@ -6,7 +6,7 @@ catalogNumber=0 model=1 mpptResistanceError=6.58 mpptSensorOffThreshold=1600 -name=CubeSat Simulator FSK +name=CubeSat Simulator DUV BATTERY_CURRENT_ZERO=-1.834 hasImprovedCommandReceiver=true EXP1=6 From a2837e235a5eee402656e9b72a61d911745e836d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 22:15:12 -0400 Subject: [PATCH 09/17] Delete CubeSat_Simulator_BPSK_fm.MASTER --- spacecraft/CubeSat_Simulator_BPSK_fm.MASTER | 65 --------------------- 1 file changed, 65 deletions(-) delete mode 100644 spacecraft/CubeSat_Simulator_BPSK_fm.MASTER diff --git a/spacecraft/CubeSat_Simulator_BPSK_fm.MASTER b/spacecraft/CubeSat_Simulator_BPSK_fm.MASTER deleted file mode 100644 index 40ac7bed..00000000 --- a/spacecraft/CubeSat_Simulator_BPSK_fm.MASTER +++ /dev/null @@ -1,65 +0,0 @@ -#CubeSat Simulator Telemetry Decoder Properties -#Thu Feb 09 21:13:22 EST 2017 -foxId=99 -IHU_SN=7 -catalogNumber=0 -model=1 -mpptResistanceError=6.58 -mpptSensorOffThreshold=1600 -name=CubeSat Simulator BPSK -BATTERY_CURRENT_ZERO=-1.834 -hasImprovedCommandReceiver=true -EXP1=6 -EXP2=1 -EXP3=8 -EXP4=7 -description=CubeSat Simulator is a functional satellite model that generates real telemetry from solar panels, batteries, and temperature sensors. For more information see http://cubesatsim.org -numberOfFrameLayouts=5 -frameLayout0.filename=FOX1E_Type0_ALL_WOD.frame -frameLayout0.name=All WOD -frameLayout1.filename=FOX1E_Type1_HEALTH.frame -frameLayout1.name=Health -frameLayout2.filename=FOX1E_Type2_MINMAX.frame -frameLayout2.name=MinMax -frameLayout3.filename=FOX1E_Type3_REALTIME_BEACON.frame -frameLayout3.name=Realtime Beacon -frameLayout4.filename=FOX1E_Type4_WOD_BEACON.frame -frameLayout4.name=WOD Beacon -numberOfLayouts=9 -layout0.filename=FOX1A_debug.csv -layout0.name=DEBUG -layout1.filename=FOX1E_maxtelemetry.csv -layout1.name=maxtelemetry -layout2.filename=FOX1E_rttelemetry.csv -layout2.name=rttelemetry -layout3.filename=FOX1E_mintelemetry.csv -layout3.name=mintelemetry -layout4.filename=FOX1E_radtelemetry.csv -layout4.name=radtelemetry -layout5.filename=FOX1E_radtelemetry2.csv -layout5.name=radtelemetry2 -layout5.parentLayout=radtelemetry -layout6.filename=FOX1E_wodtelemetry.csv -layout6.name=wodtelemetry -layout7.filename=FOX1E_wodradtelemetry.csv -layout7.name=wodradtelemetry -layout8.filename=FOX1E_wodradtelemetry2.csv -layout8.name=wodradtelemetry2 -layout8.parentLayout=wodradtelemetry -numberOfLookupTables=3 -lookupTable0.filename=FOX1A_rssiFM.tab -lookupTable0=RSSI -lookupTable1.filename=FOX1E_ihuVBattSNx.tab -lookupTable1=IHU_VBATT -lookupTable2.filename=FOX1A_ihutempSN7.tab -lookupTable2=IHU_TEMP -maxFreqBoundkHz=44950 -measurementsFileName=measurements.csv -memsRestValueX=2129 -memsRestValueY=2131 -memsRestValueZ=2103 -minFreqBoundkHz=434850 -passMeasurementsFileName=passmeasurements.csv -telemetryDownlinkFreqkHz=434900 -track=false -useIHUVBatt=false From 6d0934bb1837769dc715925e7b37ee5c8ff4e2c0 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 22:15:35 -0400 Subject: [PATCH 10/17] Delete CubeSat_Simulator_DUV_fm.MASTER --- spacecraft/CubeSat_Simulator_DUV_fm.MASTER | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 spacecraft/CubeSat_Simulator_DUV_fm.MASTER diff --git a/spacecraft/CubeSat_Simulator_DUV_fm.MASTER b/spacecraft/CubeSat_Simulator_DUV_fm.MASTER deleted file mode 100644 index 362e0f55..00000000 --- a/spacecraft/CubeSat_Simulator_DUV_fm.MASTER +++ /dev/null @@ -1,65 +0,0 @@ -#CubeSat Simulator Telemetry Decoder Properties -#Thu Feb 09 21:13:22 EST 2017 -foxId=7 -IHU_SN=7 -catalogNumber=0 -model=1 -mpptResistanceError=6.58 -mpptSensorOffThreshold=1600 -name=CubeSat Simulator DUV -BATTERY_CURRENT_ZERO=-1.834 -hasImprovedCommandReceiver=true -EXP1=6 -EXP2=1 -EXP3=8 -EXP4=7 -description=CubeSat Simulator is a functional satellite model that generates real telemetry from solar panels, batteries, and temperature sensors. For more information see http://cubesatsim.org -numberOfFrameLayouts=5 -frameLayout0.filename=FOX1E_Type0_ALL_WOD.frame -frameLayout0.name=All WOD -frameLayout1.filename=FOX1E_Type1_HEALTH.frame -frameLayout1.name=Health -frameLayout2.filename=FOX1E_Type2_MINMAX.frame -frameLayout2.name=MinMax -frameLayout3.filename=FOX1E_Type3_REALTIME_BEACON.frame -frameLayout3.name=Realtime Beacon -frameLayout4.filename=FOX1E_Type4_WOD_BEACON.frame -frameLayout4.name=WOD Beacon -numberOfLayouts=9 -layout0.filename=FOX1A_debug.csv -layout0.name=DEBUG -layout1.filename=FOX1E_maxtelemetry.csv -layout1.name=maxtelemetry -layout2.filename=FOX1E_rttelemetry.csv -layout2.name=rttelemetry -layout3.filename=FOX1E_mintelemetry.csv -layout3.name=mintelemetry -layout4.filename=FOX1E_radtelemetry.csv -layout4.name=radtelemetry -layout5.filename=FOX1E_radtelemetry2.csv -layout5.name=radtelemetry2 -layout5.parentLayout=radtelemetry -layout6.filename=FOX1E_wodtelemetry.csv -layout6.name=wodtelemetry -layout7.filename=FOX1E_wodradtelemetry.csv -layout7.name=wodradtelemetry -layout8.filename=FOX1E_wodradtelemetry2.csv -layout8.name=wodradtelemetry2 -layout8.parentLayout=wodradtelemetry -numberOfLookupTables=3 -lookupTable0.filename=FOX1A_rssiFM.tab -lookupTable0=RSSI -lookupTable1.filename=FOX1E_ihuVBattSNx.tab -lookupTable1=IHU_VBATT -lookupTable2.filename=FOX1A_ihutempSN7.tab -lookupTable2=IHU_TEMP -maxFreqBoundkHz=435760 -measurementsFileName=measurements.csv -memsRestValueX=2129 -memsRestValueY=2131 -memsRestValueZ=2103 -minFreqBoundkHz=435740 -passMeasurementsFileName=passmeasurements.csv -telemetryDownlinkFreqkHz=435750 -track=false -useIHUVBatt=false From 7767ed4d674cdd001947e4aa45e117b6dcc05844 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 9 Oct 2019 22:15:46 -0400 Subject: [PATCH 11/17] Delete README.md --- spacecraft/README.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 spacecraft/README.md diff --git a/spacecraft/README.md b/spacecraft/README.md deleted file mode 100644 index 3dcd50d8..00000000 --- a/spacecraft/README.md +++ /dev/null @@ -1,9 +0,0 @@ -These files are for FoxTelem, the AMSAT software for decoding and displaying Fox-1 series CubeSat telemetry. - -To use FoxTelem with the CubeSat Simulator, you will need to download the 1.09 version: - -https://www.g0kla.com/foxtelem/downloads/test/ - -Next, download the .MASTER files in this directory and put them in the FoxTelem spacecraft folder. - -Run FoxTelem, then go under Spacecraft/Add and select the .MASTER files to add the CubeSat Simulator to FoxTelem. From 64a127928b0c4c034d4acfc5856348ff8e16957b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 17:57:15 -0500 Subject: [PATCH 12/17] simplified autoboot --- systemd/cubesatsim.service | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/systemd/cubesatsim.service b/systemd/cubesatsim.service index 3261bf57..4dc168ba 100644 --- a/systemd/cubesatsim.service +++ b/systemd/cubesatsim.service @@ -1,10 +1,13 @@ [Unit] -Description=My last command -After=multi-user.target +Description=My service [Service] -Type=simple ExecStart=/home/pi/CubeSatSim/demo.sh > /home/pi/CubeSatSim/log.txt 2>&1 - +WorkingDirectory=/home/pi/CubeSatSim +StandardOutput=inherit +StandardError=inherit +Restart=always +User=root + [Install] -WantedBy=custom.target +WantedBy=multi-user.target From 3a1cf11b782588eab567537ce2ca326e13e5e15d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 17:57:43 -0500 Subject: [PATCH 13/17] Delete custom.target --- systemd/custom.target | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 systemd/custom.target diff --git a/systemd/custom.target b/systemd/custom.target deleted file mode 100644 index 05b22684..00000000 --- a/systemd/custom.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Custom Target -Requires=multi-user.target -After=multi-user.target -AllowIsolate=yes From 417a6b27ed56fb0350a8b3e78431d62f555521aa Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 17:57:59 -0500 Subject: [PATCH 14/17] Delete new.service --- systemd/new.service | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 systemd/new.service diff --git a/systemd/new.service b/systemd/new.service deleted file mode 100644 index 7f12e2c8..00000000 --- a/systemd/new.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=My last command -After=multi-user.target - -[Service] -Type=simple -ExecStart=/home/pi/CubeSatSim/demo.sh - -[Install] -WantedBy=custom.target From 2859f223b6ad0c14600f8c985054a82a7b86ffe6 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 17:59:33 -0500 Subject: [PATCH 15/17] Update README.md --- systemd/README.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/systemd/README.md b/systemd/README.md index 3b324b68..1bce6657 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -1,18 +1,13 @@ -To make the CubeSat Simulator transmit automatically on boot, follow these steps, which were derived from https://www.mauras.ch/systemd-run-it-last.html +To make the CubeSat Simulator transmit automatically on boot, follow these steps, which were derived from https://www.raspberrypi.org/documentation/linux/usage/systemd.md -On the Pi, if you are not already in this directory: - -cd ~/CubeSatSim/systemd -sudo cp custom.target /etc/systemd/system/custom.target - -sudo mkdir /etc/systemd/system/custom.target.wants +On the Pi, if you are not already in this directory: -sudo cp cubesatsim.service /etc/systemd/system/custom.target.wants/cubesatsim.service +cd systemd -sudo systemctl isolate custom.target +sudo cp ~/CubeSatSim/cubesatsim.service /etc/systemd/system/cubesatsim.service -sudo ln -sf /etc/systemd/system/custom.target /etc/systemd/system/default.target +sudo systemctl service enable cubesatsim Now after a reboot (sudo reboot now), the demo.sh script will run automatically, and the console will log to ~/CubeSatSim/log.txt To see it: From 3a4c95ebba46b191d2c23ba1accf66c1eaeed5a1 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 18:00:30 -0500 Subject: [PATCH 16/17] Update README.md --- systemd/README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/systemd/README.md b/systemd/README.md index 1bce6657..326916b2 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -1,14 +1,16 @@ To make the CubeSat Simulator transmit automatically on boot, follow these steps, which were derived from https://www.raspberrypi.org/documentation/linux/usage/systemd.md -On the Pi, if you are not already in this directory: - -cd systemd +Log into the Pi and type: sudo cp ~/CubeSatSim/cubesatsim.service /etc/systemd/system/cubesatsim.service sudo systemctl service enable cubesatsim -Now after a reboot (sudo reboot now), the demo.sh script will run automatically, and the console will log to ~/CubeSatSim/log.txt To see it: +Reboot to start the autoboot service: + +sudo reboot now + +Now after the Pi starts up, the demo.sh script will run automatically, and the console will log to ~/CubeSatSim/log.txt To see it: tail ~/CubeSatSim/log.txt From 0beb8a29e0ea27db8cb73a84ace8cd1ca1e6c32a Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 23 Jan 2020 18:03:48 -0500 Subject: [PATCH 17/17] Update README.md --- systemd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/README.md b/systemd/README.md index 326916b2..248f7683 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -5,7 +5,7 @@ Log into the Pi and type: sudo cp ~/CubeSatSim/cubesatsim.service /etc/systemd/system/cubesatsim.service -sudo systemctl service enable cubesatsim +sudo systemctl enable cubesatsim Reboot to start the autoboot service: