Fixed image sampling (stage 1, working, not finished yet)

pull/1/head
Sven Steudte 2018-02-11 05:42:17 +01:00
rodzic bc71efd6aa
commit 2f68054525
6 zmienionych plików z 651 dodań i 659 usunięć

Wyświetl plik

@ -66,7 +66,7 @@ endif
# Stack size to the allocated to the Cortex-M main/exceptions stack. This
# stack is used for processing interrupts and exceptions.
ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
USE_EXCEPTIONS_STACKSIZE = 0x1000
USE_EXCEPTIONS_STACKSIZE = 0x1500
endif
# Enables the use of FPU (no, softfp, hard).

Wyświetl plik

@ -7,7 +7,7 @@ conf_t config = {
// Primary position transmission thread
.pos_pri = {
.thread_conf = {
.active = true,
.active = false,
.cycle = TIME_S2I(120)
},
.radio_conf = {
@ -47,8 +47,9 @@ conf_t config = {
// Primary image transmission thread
.img_pri = {
.thread_conf = {
.active = false,
.cycle = CYCLE_CONTINUOUSLY
.active = true,
.cycle = CYCLE_CONTINUOUSLY,
.init_delay = TIME_S2I(5)
},
.radio_conf = {
.pwr = 0x7F,
@ -60,9 +61,9 @@ conf_t config = {
.call = "DL7AD-12",
.path = "",
.res = RES_QVGA,
.res = RES_VGA,
.quality = 4,
.buf_size = 32*1024
.buf_size = 64*1024
},
// Secondary image transmission thread
@ -104,7 +105,7 @@ conf_t config = {
},
.rx = {
.thread_conf = {
.active = true
.active = false
},
.radio_conf = {
.pwr = 0x7F,
@ -113,8 +114,8 @@ conf_t config = {
.preamble = 200
},
.call = "VK2GJ-15",
.path = "WIDE2-1",
.call = "DL7AD-12",
.path = "WIDE1-1",
.symbol = SYM_DIGIPEATER
},

Wyświetl plik

@ -665,6 +665,7 @@ static void Si446x_shutdown(void)
static void lockRadio(void)
{
TRACE_DEBUG("LOCK");
// Initialize mutex
if(!radio_mtx_init)
chMtxObjectInit(&radio_mtx);
@ -672,16 +673,19 @@ static void lockRadio(void)
chMtxLock(&radio_mtx);
nextTransmissionWaiting = true;
TRACE_DEBUG("LOCKED1");
// Wait for old feeder thread to terminate
if(feeder_thd != NULL) // No waiting on first use
chThdWait(feeder_thd);
TRACE_DEBUG("LOCKED2");
}
void unlockRadio(void)
{
TRACE_DEBUG("UNLOCK");
nextTransmissionWaiting = false;
chMtxUnlock(&radio_mtx);
TRACE_DEBUG("UNLOCKED");
}
void lockRadioByCamera(void)
@ -1003,6 +1007,9 @@ THD_FUNCTION(si_fifo_feeder_afsk, arg)
// Free packet object memory
ax25_delete(pp);
TRACE_DEBUG("FIFO Feeder finished");
chThdExit(MSG_OK);
}

Wyświetl plik

@ -58,7 +58,7 @@
#define STM32_MCO1SEL STM32_MCO1SEL_PLL
#define STM32_MCO1PRE STM32_MCO1PRE_DIV1
#define STM32_MCO2SEL STM32_MCO2SEL_PLL
#define STM32_MCO2PRE STM32_MCO2PRE_DIV2 /* Camera XCLK 24MHz */
#define STM32_MCO2PRE STM32_MCO2PRE_DIV4 /* Camera XCLK 24MHz */
#define STM32_I2SSRC STM32_I2SSRC_CKIN
#define STM32_PLLI2SN_VALUE 192
#define STM32_PLLI2SR_VALUE 5

Wyświetl plik

@ -45,6 +45,7 @@ void start_rx_thread(uint32_t freq, uint8_t rssi) {
bool transmitOnRadio(packet_t pp, uint32_t freq, uint8_t pwr, mod_t mod)
{
TRACE_DEBUG("A -------------------------------------------------");
if(freq == FREQ_APRS_DYNAMIC)
freq = getAPRSRegionFrequency(); // Get transmission frequency by geofencing
@ -80,6 +81,8 @@ bool transmitOnRadio(packet_t pp, uint32_t freq, uint8_t pwr, mod_t mod)
}
TRACE_DEBUG("B -------------------------------------------------");
return true;
}