Git-Mirrors/OpenModem
1
0
Fork 0
mirror of https://github.com/markqvist/OpenModem.git synced 2025-08-03 12:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Configuration and audio level monitoring implemented

Browse source
This commit is contained in:
Mark Qvist 2019-02-08 15:48:13 +01:00
parent 474f3ad4d2
commit 77e022f03b
9 changed files with 594 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

119
protocol/KISS.c
View file

@ -26,7 +26,10 @@ size_t packet_lengths_buf[CONFIG_QUEUE_MAX_LENGTH+1];
AX25Ctx *ax25ctx;
Afsk *channel;
Serial *serial;
volatile ticks_t last_serial_read = 0;
extern volatile int8_t afsk_peak;
size_t frame_len;
bool IN_FRAME;
bool ESCAPE;
@ -283,9 +286,6 @@ void kiss_serialCallback(uint8_t sbyte) {
} else if (IN_FRAME && frame_len < AX25_MAX_PAYLOAD) {
// Have a look at the command byte first
if (frame_len == 0 && command == CMD_UNKNOWN) {
// OpenModem supports only one HDLC port, so we
// strip off the port nibble of the command byte
sbyte = sbyte & 0x0F;
command = sbyte;
if (command == CMD_DATA) current_packet_start = queue_cursor;
} else if (command == CMD_DATA) {
@ -311,6 +311,12 @@ void kiss_serialCallback(uint8_t sbyte) {
config_slottime = sbyte * 10UL;
} else if (command == CMD_P) {
config_p = sbyte;
} else if (command == CMD_SAVE_CONFIG) {
config_save();
} else if (command == CMD_REBOOT) {
if (sbyte == CMD_REBOOT_CONFIRM) {
config_soft_reboot();
}
} else if (command == CMD_LED_INTENSITY) {
if (sbyte == FESC) {
ESCAPE = true;
@ -320,9 +326,114 @@ void kiss_serialCallback(uint8_t sbyte) {
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
LED_setIntensity(sbyte);
LED_setIntensity(sbyte);
}
} else if (command == CMD_OUTPUT_GAIN) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_output_gain(sbyte);
}
} else if (command == CMD_INPUT_GAIN) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_input_gain(sbyte);
}
} else if (command == CMD_PASSALL) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_passall(sbyte);
}
} else if (command == CMD_LOG_PACKETS) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_log_packets(sbyte);
}
} else if (command == CMD_GPS_MODE) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_gps_mode(sbyte);
}
} else if (command == CMD_BT_MODE) {
if (sbyte == FESC) { ESCAPE = true; } else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
config_set_bt_mode(sbyte);
}
} else if (command == CMD_SERIAL_BAUDRATE) {
config_set_serial_baudrate(sbyte);
// TODO: Remove this
} else if (command == CMD_PRINT_CONFIG) {
config_print();
} else if (command == CMD_AUDIO_PEAK) {
if (sbyte == 0x01) {
kiss_output_afsk_peak();
}
} else if (command == CMD_ENABLE_DIAGNOSTICS) {
if (sbyte == 0x00) {
config_disable_diagnostics();
} else {
config_enable_diagnostics();
}
}
}
}
void kiss_output_afsk_peak(void) {
fputc(FEND, &serial->uart0);
fputc(CMD_AUDIO_PEAK, &serial->uart0);
uint8_t b = afsk_peak;
if (b == FEND) {
fputc(FESC, &serial->uart0);
fputc(TFEND, &serial->uart0);
} else if (b == FESC) {
fputc(FESC, &serial->uart0);
fputc(TFESC, &serial->uart0);
} else {
fputc(b, &serial->uart0);
}
fputc(FEND, &serial->uart0);
}
void kiss_output_config(uint8_t* data, size_t length) {
fputc(FEND, &serial->uart0);
fputc(CMD_PRINT_CONFIG, &serial->uart0);
for (unsigned i = 0; i < length; i++) {
uint8_t b = data[i];
if (b == FEND) {
fputc(FESC, &serial->uart0);
fputc(TFEND, &serial->uart0);
} else if (b == FESC) {
fputc(FESC, &serial->uart0);
fputc(TFESC, &serial->uart0);
} else {
fputc(b, &serial->uart0);
}
}
fputc(FEND, &serial->uart0);
}

20
protocol/KISS.h
View file

@ -19,10 +19,21 @@
#define CMD_TXTAIL 0x04
#define CMD_FULLDUPLEX 0x05
#define CMD_SETHARDWARE 0x06
#define CMD_FLUSHQUEUE 0x07
#define CMD_FLUSHQUEUE_DEBUG 0x08
#define CMD_LED_INTENSITY 0x09
#define CMD_SAVE_CONFIG 0x07
#define CMD_LED_INTENSITY 0x08
#define CMD_OUTPUT_GAIN 0x09
#define CMD_INPUT_GAIN 0x0A
#define CMD_PASSALL 0x0B
#define CMD_LOG_PACKETS 0x0C
#define CMD_GPS_MODE 0x0D
#define CMD_BT_MODE 0x0E
#define CMD_READY 0x0F
#define CMD_SERIAL_BAUDRATE 0x10
#define CMD_REBOOT 0x11
#define CMD_REBOOT_CONFIRM 0x9A
#define CMD_AUDIO_PEAK 0x12
#define CMD_ENABLE_DIAGNOSTICS 0x13
#define CMD_PRINT_CONFIG 0xF0
#define CMD_RETURN 0xFF
void kiss_init(AX25Ctx *ax25, Afsk *afsk, Serial *ser);
@ -32,4 +43,7 @@ void kiss_flushQueue(void);
void kiss_csma(void);
void kiss_poll(void);
void kiss_output_config(uint8_t* data, size_t length);
void kiss_output_afsk_peak(void);
#endif