From b9736dd27a581e3961bb3365260893d478e47748 Mon Sep 17 00:00:00 2001 From: ronyronen Date: Wed, 7 Jun 2023 22:14:56 +0300 Subject: [PATCH 1/4] Broken link on README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4795dc0..f334f13 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The following boards are being used in this repository: ## SATLLA-0 EVM Board The SATLLA-0 evaluation board is specifically designed for flat CubeSats, offering a comprehensive platform for testing and experimenting with various satellite functionalities. This evaluation board incorporates a wide range of satellite sensors, enabling researchers and engineers to assess and explore the full capabilities of the SATLLA-0 system. By providing access to most of the essential sensors used in satellites, the board allows for in-depth evaluation and analysis of different aspects, such as thermal management, power optimization, and communication protocols. -Please refer to [EVM_BOARD](https://github.com/kcglab/satllazero/hardware/evm_board) for more details. +Please refer to [EVM_BOARD](hardware/evm_board) for more details. # Installation From 758842f798562047c350b3bcde44c3b31d865a4f Mon Sep 17 00:00:00 2001 From: ronyronen Date: Wed, 7 Jun 2023 22:16:09 +0300 Subject: [PATCH 2/4] Broken link on README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f334f13..28bf5f2 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The SATLLA-0 flight software platform includes the following key features: ## Supported Hardware -A list of all the hardware required to assemble a functional nanosatellite is available [here](https://github.com/kcglab/satllazero/blob/main/MD/bom.MD). +A list of all the hardware required to assemble a functional nanosatellite is available [here](/MD/bom.MD). The following boards are being used in this repository: + SAT0_Ground: WiFi LoRa ESP32 from Heltec or TTGO. + SAT0_Master: Teensy 3.6/4.1 microcontroller. @@ -56,7 +56,7 @@ The following boards are being used in this repository: ## SATLLA-0 EVM Board The SATLLA-0 evaluation board is specifically designed for flat CubeSats, offering a comprehensive platform for testing and experimenting with various satellite functionalities. This evaluation board incorporates a wide range of satellite sensors, enabling researchers and engineers to assess and explore the full capabilities of the SATLLA-0 system. By providing access to most of the essential sensors used in satellites, the board allows for in-depth evaluation and analysis of different aspects, such as thermal management, power optimization, and communication protocols. -Please refer to [EVM_BOARD](hardware/evm_board) for more details. +Please refer to [EVM_BOARD](/hardware/evm_board) for more details. # Installation From 81781075b7ab0979fa0923e71b183e1b0f79d10f Mon Sep 17 00:00:00 2001 From: ronyronen Date: Sun, 18 Jun 2023 19:19:28 +0300 Subject: [PATCH 3/4] Surround parse_setting() with EEPROM. Fix typo. Add TEENSY3.2 option. --- software/SAT0_Ground/Serial_Event.ino | 4 +++- software/SAT0_Ground/settings.h | 8 +++++--- software/SAT0_Master/settings.h | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/software/SAT0_Ground/Serial_Event.ino b/software/SAT0_Ground/Serial_Event.ino index 8e7dae2..4bee353 100644 --- a/software/SAT0_Ground/Serial_Event.ino +++ b/software/SAT0_Ground/Serial_Event.ino @@ -169,16 +169,18 @@ memset(ser_buffer_g, 0x00, MAX_BUFFER_SIZE); #endif if (cmd == 't') { +#if EEPROM_ENABLE PRINTLN("Settings:"); print_settings(); -#if EEPROM_ENABLE print_eeprom(); #endif if (idx >= 2) { uint8_t opt = (int)ser_buffer_g[0] + 87; PRINT("opt:\t"); PRINTLN((char)opt); +#if EEPROM_ENABLE parse_setting(opt, ser_buffer_g + 1, idx - 1); +#endif } return; } diff --git a/software/SAT0_Ground/settings.h b/software/SAT0_Ground/settings.h index 14b00da..f411812 100644 --- a/software/SAT0_Ground/settings.h +++ b/software/SAT0_Ground/settings.h @@ -136,7 +136,7 @@ char firmware_version[14 + 1] = {0}; #else // TTGO T-BEAM #define LED1 25 #define SCK 5 // GPIO5 -- SX1278's SCK -#define MISO 19 // GPIO19 -- SX1278's MISnO +#define MISO 19 // GPIO19 -- SX1278's MISO #define MOSI 27 // GPIO27 -- SX1278's MOSI #define NSS 18 // GPIO18 -- SX1278's CS #define RST 14 // GPIO14 -- SX1278's RESET @@ -144,7 +144,7 @@ char firmware_version[14 + 1] = {0}; #define OLED_R 16 #define OLED_SDA 21 #define OLED_SCL 22 -#define SERVO_PIN 23 // Servo Signal Pin +#define SERVO_PIN -1 // Servo Signal Pin #endif #define NUM_SATS 1 @@ -214,9 +214,11 @@ bool REPLY_ACK = false; #define LORA_433_CR_4_5 5 #define LORA_433_SF10 10 #define LORA_433_BW_062 6 // table +#define LORA_433_BW_125 7 // table +#define LORA_433_BW_250 9 // table #define LORA_433_CRC_ON 0x01 // Packet CRC is activated -#define LORA_433_CRC_OFF 0x0 // Packet CRC is activated +#define LORA_433_CRC_OFF 0x0 // Packet CRC is deactivated #define LORA_433_LDRO_ON 0x01 // 0x00 OFF, 0x01 ON, 0x02 AUTO #define LORA_433_LDRO_OFF 0x00 // 0x00 OFF, 0x01 ON, 0x02 AUTO #define LORA_433_LDRO_AUTO 0x02 // 0x00 OFF, 0x01 ON, 0x02 AUTO diff --git a/software/SAT0_Master/settings.h b/software/SAT0_Master/settings.h index 7eaa6d2..e5a9446 100644 --- a/software/SAT0_Master/settings.h +++ b/software/SAT0_Master/settings.h @@ -157,7 +157,11 @@ TinyGPSPlus gps; // GPS #define FAT_RPI_1_PIN 5 // #define FAT_LORA_24_PIN 6 // On-Board #define FAT_LASER_PIN 28 // FAT1-ON +#ifdef ARDUINO_TEENSY32 +#define FAT_MAIN_LED_PIN 8 // +#else #define FAT_MAIN_LED_PIN 29 // +#endif #define FAT_ANT_PIN 31 // #define FAT_GEN2_PIN -1 // From f20def0f0ae556137d36da6b5d79760119e82466 Mon Sep 17 00:00:00 2001 From: ronyronen Date: Tue, 20 Jun 2023 17:19:50 +0300 Subject: [PATCH 4/4] Update paper.md --- paper/paper.md | 1 + 1 file changed, 1 insertion(+) diff --git a/paper/paper.md b/paper/paper.md index 16a7684..9575a7e 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -12,6 +12,7 @@ authors: orcid: 0000-0002-1300-5236 affiliation: "1" - name: Michael Britvin + orcid: 0009-0003-5492-4014 affiliation: "2" - name: Boaz Ben Moshe orcid: 0000-0002-1580-5421