Some changes inside it_handlers and station_config. Propaly for RF_MUTE

pull/2/head
Mateusz Lubecki 2018-01-01 19:57:29 +01:00
rodzic 4ca61f9e9d
commit 06e970e5d7
2 zmienionych plików z 11 dodań i 4 usunięć

Wyświetl plik

@ -13,7 +13,7 @@
// Uncomment to enable all meteo functionality. TX20 anemometer, dallas termometer, MS5611 pressure sens
//#define _METEO
#define _DIGI // Comment this do disable WIDE1-1 digipeating
//#define _DIGI // Comment this do disable WIDE1-1 digipeating
#define _MUTE_RF // TODO: Not yet implemented - This will make station RXonly and disable all data transmission
#define _MUTE_OWN // TODO: Not yet implemented - This will disable all self-generated packets (wx, telemetry, beacon)
@ -51,7 +51,7 @@
#define _BCN_INTERVAL 10 // Own beacon interval in minutes
//#define _PTT_PUSHPULL // Uncomment this if you want PTT line to work as Push-pull instead of Open Drain
#define _SERIAL_BAUDRATE 9600
#define _SERIAL_BAUDRATE 19200
// Transmitting delay
#define _DELAY_BASE 12 // * 50ms. For example setting 10 gives 500msec delay. Maximum value is 16

Wyświetl plik

@ -16,6 +16,8 @@
#include "diag/Trace.h"
#include "station_config.h"
// TIM2 w dallas
@ -87,6 +89,7 @@ void TIM3_IRQHandler(void) {
// wysylanie wlasnej pozycji i danych WX
TIM3->SR &= ~(1<<0);
#ifdef _METEO
#ifndef _MUTE_OWN
if (WXInterval != 0 && WXI >= WXInterval) {
trace_printf("Pogoda\r\n");
@ -103,17 +106,20 @@ void TIM3_IRQHandler(void) {
else
WXI++;
#endif
if (BcnInterval != 0 && BcnI >= BcnInterval) {
#endif
if (BcnInterval != 0 && BcnI >= BcnInterval) {
#ifndef _MUTE_OWN
// while(ax25.afsk->hdlc.raw_dcd == TRUE);
trace_printf("Wlasny beacon\r\n");
SendOwnBeacon();
while (a.sending == 1);
#endif
BcnI = 1;
}
else
BcnI++;
if (TelemInterval != 0 && TelemI >= TelemInterval) {
#ifndef _MUTE_OWN
trace_printf("Telemetria\r\n");
// ch14 = ADCReturnChannel(14);
// ch15 = ADCReturnChannel(15);
@ -124,6 +130,7 @@ void TIM3_IRQHandler(void) {
else
SendSimpleTelemetry(0);
while (a.sending == 1);
#endif
TelemI = 1;
}
else