diff --git a/README.md b/README.md index 6caadc9..fd366b8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The purpose of this project is to transfer data (pictures...) via a 2,7kHz SSB channel on the narrow band transponder as fast as possible. # this is work in progress -Version 0.1 is working on my linux PC and Odroid SBC. +Version 0.2 is working on my linux PC, Odroid SBC and Raspberry 4 (3B+) # Prerequisites * LINUX Desktop PC ... working diff --git a/grc/8psk_tx.grc b/grc/8psk_tx.grc deleted file mode 100644 index 02d63e8..0000000 --- a/grc/8psk_tx.grc +++ /dev/null @@ -1,391 +0,0 @@ -options: - parameters: - author: kurt - category: '[GRC Hier Blocks]' - cmake_opt: '' - comment: 'requires GNU Radio 3.8xxx - - does NOT work with 3.7x' - copyright: '' - description: requires GNU Radio 3.8xxx - gen_cmake: 'Off' - gen_linking: dynamic - generate_options: no_gui - hier_block_src_path: '.:' - id: tx_8psk - max_nouts: '0' - output_language: python - placement: (0,0) - qt_qss_theme: '' - realtime_scheduling: '' - run: 'True' - run_command: '{python} -u {filename}' - run_options: run - sizing_mode: fixed - thread_safe_setters: '' - title: 8PSK Modem DJ0ABR - window_size: '' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [8, 8] - rotation: 0 - state: enabled - -blocks: -- name: mixf - id: variable - parameters: - comment: 'mid frequency - - in the audio - - spectrum. Set to get - - lowest and highest - - frequency within the - - transceiver filter range.' - value: '1500' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [336, 12.0] - rotation: 0 - state: enabled -- name: nfilts - id: variable - parameters: - comment: '' - value: '32' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [504, 12.0] - rotation: 0 - state: enabled -- name: sps - id: variable - parameters: - comment: 'Samples/Symbol - - fixed value, - - do not change. - - Used to adjust - - bitrate vs. bandwidth' - value: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [944, 36.0] - rotation: 0 - state: enabled -- name: analog_sig_source_x_0_0_0 - id: analog_sig_source_x - parameters: - affinity: '' - alias: '' - amp: '1' - comment: 'the modulator output is in the baseband at 0 Hz. - - Mix it with the required audio mid frequency. - - cos and -sin are used to combine I and Q - - into the final signal.' - freq: mixf - maxoutbuf: '0' - minoutbuf: '0' - offset: '0' - phase: '0' - samp_rate: samp_rate - type: complex - waveform: analog.GR_COS_WAVE - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [64, 484.0] - rotation: 0 - state: enabled -- name: audio_sink_0_0 - id: audio_sink - parameters: - affinity: '' - alias: '' - comment: 'send audio to - - transceiver' - device_name: '' - num_inputs: '1' - ok_to_block: 'True' - samp_rate: samp_rate - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [840, 420.0] - rotation: 0 - state: enabled -- name: blocks_add_xx_0 - id: blocks_add_xx - parameters: - affinity: '' - alias: '' - comment: 'generate the analog - - output signal.' - maxoutbuf: '0' - minoutbuf: '0' - num_inputs: '2' - type: float - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [568, 344.0] - rotation: 0 - state: true -- name: blocks_complex_to_float_1 - id: blocks_complex_to_float - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [400, 344.0] - rotation: 0 - state: enabled -- name: blocks_multiply_const_vxx_0 - id: blocks_multiply_const_vxx - parameters: - affinity: '' - alias: '' - comment: 'reduce level for the - - audio output, improves - - linearity' - const: '0.05' - maxoutbuf: '0' - minoutbuf: '0' - type: float - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [680, 420.0] - rotation: 0 - state: true -- name: blocks_multiply_xx_0_0 - id: blocks_multiply_xx - parameters: - affinity: '' - alias: '' - comment: "mix I und Q \nto the mid \nfrequency\nspecified in\n\"mixf\"" - maxoutbuf: '0' - minoutbuf: '0' - num_inputs: '2' - type: complex - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [288, 344.0] - rotation: 0 - state: enabled -- name: blocks_udp_source_0 - id: blocks_udp_source - parameters: - affinity: '' - alias: '' - comment: "receive an UDP data stream\nwith the bitrate of (see \ncomment samp_rate)\n\ - The stream is buffered, \nso send some bytes ahead\nto prefill the buffer\n\ - and avoid underrun" - eof: 'False' - ipaddr: 127.0.0.1 - maxoutbuf: '0' - minoutbuf: '0' - port: '40134' - psize: '258' - type: byte - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [736, 164.0] - rotation: 180 - state: true -- name: digital_constellation_modulator_0 - id: digital_constellation_modulator - parameters: - affinity: '' - alias: '' - comment: 'This modulator expects "Packed Bytes" - - which are 8 bits within one byte. - - The UDP source block deliveres bytes, - - so it fits perfectly.' - constellation: digital.constellation_8psk_natural().base() - differential: 'True' - excess_bw: '0.25' - log: 'False' - maxoutbuf: '0' - minoutbuf: '0' - samples_per_symbol: resamprate - verbose: 'False' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [272, 172.0] - rotation: 180 - state: enabled -- name: qtgui_freq_sink_x_0 - id: qtgui_freq_sink_x - parameters: - affinity: '' - alias: '' - alpha1: '1.0' - alpha10: '1.0' - alpha2: '1.0' - alpha3: '1.0' - alpha4: '1.0' - alpha5: '1.0' - alpha6: '1.0' - alpha7: '1.0' - alpha8: '1.0' - alpha9: '1.0' - autoscale: 'False' - average: '0.1' - axislabels: 'True' - bw: samp_rate - color1: '"blue"' - color10: '"dark blue"' - color2: '"red"' - color3: '"green"' - color4: '"black"' - color5: '"cyan"' - color6: '"magenta"' - color7: '"yellow"' - color8: '"dark red"' - color9: '"dark green"' - comment: '' - ctrlpanel: 'False' - fc: '0' - fftsize: '1024' - freqhalf: 'False' - grid: 'True' - gui_hint: '' - label: Relative Gain - label1: '' - label10: '''''' - label2: '''''' - label3: '''''' - label4: '''''' - label5: '''''' - label6: '''''' - label7: '''''' - label8: '''''' - label9: '''''' - legend: 'True' - maxoutbuf: '0' - minoutbuf: '0' - name: '""' - nconnections: '1' - showports: 'False' - tr_chan: '0' - tr_level: '0.0' - tr_mode: qtgui.TRIG_MODE_FREE - tr_tag: '""' - type: float - units: dB - update_time: '0.10' - width1: '1' - width10: '1' - width2: '1' - width3: '1' - width4: '1' - width5: '1' - width6: '1' - width7: '1' - width8: '1' - width9: '1' - wintype: firdes.WIN_BLACKMAN_hARRIS - ymax: '10' - ymin: '-140' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [552, 552.0] - rotation: 0 - state: disabled -- name: resamprate - id: parameter - parameters: - alias: '' - comment: '' - hide: none - label: resamprate - short_id: r - type: intx - value: '24' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [808, 12.0] - rotation: 0 - state: true -- name: samp_rate - id: parameter - parameters: - alias: '' - comment: Audio Rate - hide: none - label: samp_rate - short_id: s - type: intx - value: '48000' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [696, 12.0] - rotation: 0 - state: true - -connections: -- [analog_sig_source_x_0_0_0, '0', blocks_multiply_xx_0_0, '1'] -- [blocks_add_xx_0, '0', blocks_multiply_const_vxx_0, '0'] -- [blocks_add_xx_0, '0', qtgui_freq_sink_x_0, '0'] -- [blocks_complex_to_float_1, '0', blocks_add_xx_0, '0'] -- [blocks_complex_to_float_1, '1', blocks_add_xx_0, '1'] -- [blocks_multiply_const_vxx_0, '0', audio_sink_0_0, '0'] -- [blocks_multiply_xx_0_0, '0', blocks_complex_to_float_1, '0'] -- [blocks_udp_source_0, '0', digital_constellation_modulator_0, '0'] -- [digital_constellation_modulator_0, '0', blocks_multiply_xx_0_0, '0'] - -metadata: - file_format: 1 diff --git a/grc/txuniversal_qpsk_nogui_ownmod.grc b/grc/txuniversal_qpsk_nogui_ownmod.grc deleted file mode 100644 index 0f24888..0000000 --- a/grc/txuniversal_qpsk_nogui_ownmod.grc +++ /dev/null @@ -1,383 +0,0 @@ -options: - parameters: - author: DJ0ABR - category: '[GRC Hier Blocks]' - cmake_opt: '' - comment: 'requires GNU Radio 3.8xxx - - does NOT work with 3.7x' - copyright: DJ0ABR - description: requires GNU Radio 3.8xxx - gen_cmake: 'On' - gen_linking: dynamic - generate_options: no_gui - hier_block_src_path: '.:' - id: qpsk_tx - max_nouts: '0' - output_language: python - placement: (0,0) - qt_qss_theme: '' - realtime_scheduling: '' - run: 'True' - run_command: '{python} -u {filename}' - run_options: run - sizing_mode: fixed - thread_safe_setters: '' - title: 'QPSK TX-Modem ' - window_size: '' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [8, 8] - rotation: 0 - state: enabled - -blocks: -- name: mixf - id: variable - parameters: - comment: 'mid frequency - - in the audio - - spectrum. Set to get - - lowest and highest - - frequency within the - - transceiver filter range.' - value: '1500' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [360, 12.0] - rotation: 0 - state: enabled -- name: qpsk__constellation - id: variable_constellation_rect - parameters: - comment: 'alternative: - - [0.707+0.707j, -0.707+0.707j, -0.707-0.707j, 0.707-0.707j] - - does not make a difference' - const_points: '[1+1j, -1+1j, -1-1j, 1-1j]' - imag_sect: '2' - precision: '8' - real_sect: '2' - rot_sym: '4' - soft_dec_lut: None - sym_map: '[0, 1, 2, 3]' - w_imag_sect: '1' - w_real_sect: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [8, 196.0] - rotation: 0 - state: enabled -- name: analog_sig_source_x_0_0_0 - id: analog_sig_source_x - parameters: - affinity: '' - alias: '' - amp: '1' - comment: 'the modulator output is in the baseband at 0 Hz. - - Mix it with the required audio mid frequency. - - cos and -sin are used to combine I and Q - - into the final signal.' - freq: mixf - maxoutbuf: '0' - minoutbuf: '0' - offset: '0' - phase: '0' - samp_rate: samp_rate - type: complex - waveform: analog.GR_COS_WAVE - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [96, 476.0] - rotation: 0 - state: enabled -- name: audio_sink_0_0 - id: audio_sink - parameters: - affinity: '' - alias: '' - comment: 'send audio to - - transceiver' - device_name: '' - num_inputs: '1' - ok_to_block: 'True' - samp_rate: samp_rate - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [928, 356.0] - rotation: 0 - state: enabled -- name: blocks_add_xx_0 - id: blocks_add_xx - parameters: - affinity: '' - alias: '' - comment: 'generate the analog - - output signal: USB - - (for LSB use substraction)' - maxoutbuf: '0' - minoutbuf: '0' - num_inputs: '2' - type: float - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [696, 376.0] - rotation: 0 - state: true -- name: blocks_complex_to_float_1 - id: blocks_complex_to_float - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [512, 376.0] - rotation: 0 - state: enabled -- name: blocks_multiply_const_vxx_0 - id: blocks_multiply_const_vxx - parameters: - affinity: '' - alias: '' - comment: 'reduce level for the - - audio output, improves - - linearity' - const: '0.05' - maxoutbuf: '0' - minoutbuf: '0' - type: float - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [784, 356.0] - rotation: 0 - state: true -- name: blocks_multiply_xx_0_0 - id: blocks_multiply_xx - parameters: - affinity: '' - alias: '' - comment: "mix I und Q \nto the mid \nfrequency\nspecified in\n\"mixf\"" - maxoutbuf: '0' - minoutbuf: '0' - num_inputs: '2' - type: complex - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [400, 376.0] - rotation: 0 - state: enabled -- name: blocks_udp_source_0 - id: blocks_udp_source - parameters: - affinity: '' - alias: '' - comment: "receive an UDP data stream\nwith the bitrate of (see \ncomment samp_rate)\n\ - The stream is buffered, \nso send some bytes ahead\nto prefill the buffer\n\ - and avoid underrun" - eof: 'False' - ipaddr: 127.0.0.1 - maxoutbuf: '0' - minoutbuf: '0' - port: '40134' - psize: '258' - type: byte - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [824, 148.0] - rotation: 180 - state: enabled -- name: digital_constellation_modulator_0 - id: digital_constellation_modulator - parameters: - affinity: '' - alias: '' - comment: 'unpack bytes to bits - - make symbols 2bits/sym - - make constellation' - constellation: qpsk__constellation - differential: 'False' - excess_bw: '0.35' - log: 'False' - maxoutbuf: '0' - minoutbuf: '0' - samples_per_symbol: resamprate - verbose: 'False' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [392, 180.0] - rotation: 180 - state: enabled -- name: qtgui_freq_sink_x_0 - id: qtgui_freq_sink_x - parameters: - affinity: '' - alias: '' - alpha1: '1.0' - alpha10: '1.0' - alpha2: '1.0' - alpha3: '1.0' - alpha4: '1.0' - alpha5: '1.0' - alpha6: '1.0' - alpha7: '1.0' - alpha8: '1.0' - alpha9: '1.0' - autoscale: 'False' - average: '0.1' - axislabels: 'True' - bw: samp_rate - color1: '"blue"' - color10: '"dark blue"' - color2: '"red"' - color3: '"green"' - color4: '"black"' - color5: '"cyan"' - color6: '"magenta"' - color7: '"yellow"' - color8: '"dark red"' - color9: '"dark green"' - comment: '' - ctrlpanel: 'False' - fc: '0' - fftsize: '1024' - freqhalf: 'False' - grid: 'True' - gui_hint: '' - label: Relative Gain - label1: '' - label10: '''''' - label2: '''''' - label3: '''''' - label4: '''''' - label5: '''''' - label6: '''''' - label7: '''''' - label8: '''''' - label9: '''''' - legend: 'True' - maxoutbuf: '0' - minoutbuf: '0' - name: '""' - nconnections: '1' - showports: 'False' - tr_chan: '0' - tr_level: '0.0' - tr_mode: qtgui.TRIG_MODE_FREE - tr_tag: '""' - type: float - units: dB - update_time: '0.10' - width1: '1' - width10: '1' - width2: '1' - width3: '1' - width4: '1' - width5: '1' - width6: '1' - width7: '1' - width8: '1' - width9: '1' - wintype: firdes.WIN_BLACKMAN_hARRIS - ymax: '10' - ymin: '-140' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [880, 576.0] - rotation: 0 - state: disabled -- name: resamprate - id: parameter - parameters: - alias: '' - comment: '' - hide: none - label: resamprate - short_id: r - type: intx - value: '20' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [776, 12.0] - rotation: 0 - state: true -- name: samp_rate - id: parameter - parameters: - alias: '' - comment: Audio Rate - hide: none - label: samp_rate - short_id: s - type: intx - value: '44100' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [208, 12.0] - rotation: 0 - state: true - -connections: -- [analog_sig_source_x_0_0_0, '0', blocks_multiply_xx_0_0, '1'] -- [blocks_add_xx_0, '0', blocks_multiply_const_vxx_0, '0'] -- [blocks_add_xx_0, '0', qtgui_freq_sink_x_0, '0'] -- [blocks_complex_to_float_1, '0', blocks_add_xx_0, '0'] -- [blocks_complex_to_float_1, '1', blocks_add_xx_0, '1'] -- [blocks_multiply_const_vxx_0, '0', audio_sink_0_0, '0'] -- [blocks_multiply_xx_0_0, '0', blocks_complex_to_float_1, '0'] -- [blocks_udp_source_0, '0', digital_constellation_modulator_0, '0'] -- [digital_constellation_modulator_0, '0', blocks_multiply_xx_0_0, '0'] - -metadata: - file_format: 1 diff --git a/modem/Makefile b/modem/Makefile index 7a484d0..fbb12b6 100644 --- a/modem/Makefile +++ b/modem/Makefile @@ -1,8 +1,11 @@ +# Makefile for qo100modem +# ======================= + CFLAGS=-O3 -Wall -LDLIBS= -L. -lpthread -lfftw3 -lm -lzip +LDLIBS= -L. -lpthread -lfftw3 -lm -lzip -lfftw3_threads -lsndfile -lasound -lbass -lliquid CC=c++ PROGNAME=qo100modem -OBJ=qo100modem.o main_helper.o udp.o frame_packer.o scrambler.o crc16.o fec.o fft.o constellation.o arraysend.o +OBJ=qo100modem.o main_helper.o udp.o frame_packer.o scrambler.o crc16.o fec.o fft.o constellation.o arraysend.o audio.o liquid_if.o all: qo100modem diff --git a/modem/arraysend.c b/modem/arraysend.c index feb96c3..1859e03 100644 --- a/modem/arraysend.c +++ b/modem/arraysend.c @@ -120,7 +120,12 @@ void doArraySend() { // send first frame printf("Start Array Send %d\n",getSending()); - toGR_Preamble(); + + // preamble + int numframespreamble = 3* ((caprate/txinterpolfactor) * bitsPerSymbol / 8) /258 + 1; + for(int i=0; i= AUDIO_CAPTURE_BUFLEN) cap_wridx = 0; + CAP_UNLOCK; +} + +int cap_read_fifo(float *data) +{ + CAP_LOCK; + + if (cap_rdidx == cap_wridx) + { + // Fifo empty, no data available + CAP_UNLOCK; + return 0; + } + + *data = cap_buffer[cap_rdidx]; + if(++cap_rdidx >= AUDIO_CAPTURE_BUFLEN) cap_rdidx = 0; + CAP_UNLOCK; + + return 1; +} +*/ +void pb_write_fifo(float sample) +{ + PB_LOCK; + + // check if there is free space in fifo + if(pb_fifo_freespace(1) == 0) + { + PB_UNLOCK; + printf("************* pb fifo full\n"); + return; + } + + pb_buffer[pb_wridx] = sample; + if(++pb_wridx >= AUDIO_PLAYBACK_BUFLEN) pb_wridx = 0; + PB_UNLOCK; + //printf("write: pbw:%d pbr:%d\n",pb_wridx,pb_rdidx); +} + +int pb_fifo_freespace(int nolock) +{ +int freebuf = 0; + + if(nolock == 0) PB_LOCK; + + /*freebuf = AUDIO_PLAYBACK_BUFLEN - ((pb_wridx+AUDIO_PLAYBACK_BUFLEN+1 - pb_rdidx)%AUDIO_PLAYBACK_BUFLEN); + freebuf %= AUDIO_PLAYBACK_BUFLEN;*/ + + int elemInFifo = (pb_wridx + AUDIO_PLAYBACK_BUFLEN - pb_rdidx) % AUDIO_PLAYBACK_BUFLEN; + freebuf = AUDIO_PLAYBACK_BUFLEN - elemInFifo; + + if(nolock == 0) PB_UNLOCK; + + //printf("fifolen:%d check: pbw:%d pbr:%d freebuf:%d\n",AUDIO_PLAYBACK_BUFLEN,pb_wridx,pb_rdidx,freebuf); + + return freebuf; +} + +// read elements floats from fifo or return 0 if not enough floats are available +int pb_read_fifo(float *data, int elements) +{ + //printf("pb read fifo: %d\n",elements); + PB_LOCK; + + int e = AUDIO_PLAYBACK_BUFLEN - pb_fifo_freespace(1); + //if (pb_rdidx == pb_wridx) + if(e < elements) + { + // Fifo empty, no data available + PB_UNLOCK; + //printf("pb fifo empty, need:%d have:%d size:%d\n",elements,e,AUDIO_PLAYBACK_BUFLEN); + return 0; + } + + for(int i=0; i= AUDIO_PLAYBACK_BUFLEN) pb_rdidx = 0; + } + //printf("read %d floats\n",elements); + + PB_UNLOCK; + return 1; +} diff --git a/modem/bass.h b/modem/bass.h new file mode 100644 index 0000000..e6f2416 --- /dev/null +++ b/modem/bass.h @@ -0,0 +1,1160 @@ +/* + BASS 2.4 C/C++ header file + Copyright (c) 1999-2019 Un4seen Developments Ltd. + + See the BASS.CHM file for more detailed documentation +*/ + +#ifndef BASS_H +#define BASS_H + +#ifdef _WIN32 +#include +typedef unsigned __int64 QWORD; +#else +#include +#define WINAPI +#define CALLBACK +typedef uint8_t BYTE; +typedef uint16_t WORD; +typedef uint32_t DWORD; +typedef uint64_t QWORD; +#ifdef __OBJC__ +#include +#else +typedef int BOOL; +#endif +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 +#endif +#define LOBYTE(a) (BYTE)(a) +#define HIBYTE(a) (BYTE)((a)>>8) +#define LOWORD(a) (WORD)(a) +#define HIWORD(a) (WORD)((a)>>16) +#define MAKEWORD(a,b) (WORD)(((a)&0xff)|((b)<<8)) +#define MAKELONG(a,b) (DWORD)(((a)&0xffff)|((b)<<16)) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define BASSVERSION 0x204 // API version +#define BASSVERSIONTEXT "2.4" + +#ifndef BASSDEF +#define BASSDEF(f) WINAPI f +#else +#define NOBASSOVERLOADS +#endif + +typedef DWORD HMUSIC; // MOD music handle +typedef DWORD HSAMPLE; // sample handle +typedef DWORD HCHANNEL; // playing sample's channel handle +typedef DWORD HSTREAM; // sample stream handle +typedef DWORD HRECORD; // recording handle +typedef DWORD HSYNC; // synchronizer handle +typedef DWORD HDSP; // DSP handle +typedef DWORD HFX; // DX8 effect handle +typedef DWORD HPLUGIN; // Plugin handle + +// Error codes returned by BASS_ErrorGetCode +#define BASS_OK 0 // all is OK +#define BASS_ERROR_MEM 1 // memory error +#define BASS_ERROR_FILEOPEN 2 // can't open the file +#define BASS_ERROR_DRIVER 3 // can't find a free/valid driver +#define BASS_ERROR_BUFLOST 4 // the sample buffer was lost +#define BASS_ERROR_HANDLE 5 // invalid handle +#define BASS_ERROR_FORMAT 6 // unsupported sample format +#define BASS_ERROR_POSITION 7 // invalid position +#define BASS_ERROR_INIT 8 // BASS_Init has not been successfully called +#define BASS_ERROR_START 9 // BASS_Start has not been successfully called +#define BASS_ERROR_SSL 10 // SSL/HTTPS support isn't available +#define BASS_ERROR_ALREADY 14 // already initialized/paused/whatever +#define BASS_ERROR_NOTAUDIO 17 // file does not contain audio +#define BASS_ERROR_NOCHAN 18 // can't get a free channel +#define BASS_ERROR_ILLTYPE 19 // an illegal type was specified +#define BASS_ERROR_ILLPARAM 20 // an illegal parameter was specified +#define BASS_ERROR_NO3D 21 // no 3D support +#define BASS_ERROR_NOEAX 22 // no EAX support +#define BASS_ERROR_DEVICE 23 // illegal device number +#define BASS_ERROR_NOPLAY 24 // not playing +#define BASS_ERROR_FREQ 25 // illegal sample rate +#define BASS_ERROR_NOTFILE 27 // the stream is not a file stream +#define BASS_ERROR_NOHW 29 // no hardware voices available +#define BASS_ERROR_EMPTY 31 // the MOD music has no sequence data +#define BASS_ERROR_NONET 32 // no internet connection could be opened +#define BASS_ERROR_CREATE 33 // couldn't create the file +#define BASS_ERROR_NOFX 34 // effects are not available +#define BASS_ERROR_NOTAVAIL 37 // requested data/action is not available +#define BASS_ERROR_DECODE 38 // the channel is/isn't a "decoding channel" +#define BASS_ERROR_DX 39 // a sufficient DirectX version is not installed +#define BASS_ERROR_TIMEOUT 40 // connection timedout +#define BASS_ERROR_FILEFORM 41 // unsupported file format +#define BASS_ERROR_SPEAKER 42 // unavailable speaker +#define BASS_ERROR_VERSION 43 // invalid BASS version (used by add-ons) +#define BASS_ERROR_CODEC 44 // codec is not available/supported +#define BASS_ERROR_ENDED 45 // the channel/file has ended +#define BASS_ERROR_BUSY 46 // the device is busy +#define BASS_ERROR_UNSTREAMABLE 47 // unstreamable file +#define BASS_ERROR_UNKNOWN -1 // some other mystery problem + +// BASS_SetConfig options +#define BASS_CONFIG_BUFFER 0 +#define BASS_CONFIG_UPDATEPERIOD 1 +#define BASS_CONFIG_GVOL_SAMPLE 4 +#define BASS_CONFIG_GVOL_STREAM 5 +#define BASS_CONFIG_GVOL_MUSIC 6 +#define BASS_CONFIG_CURVE_VOL 7 +#define BASS_CONFIG_CURVE_PAN 8 +#define BASS_CONFIG_FLOATDSP 9 +#define BASS_CONFIG_3DALGORITHM 10 +#define BASS_CONFIG_NET_TIMEOUT 11 +#define BASS_CONFIG_NET_BUFFER 12 +#define BASS_CONFIG_PAUSE_NOPLAY 13 +#define BASS_CONFIG_NET_PREBUF 15 +#define BASS_CONFIG_NET_PASSIVE 18 +#define BASS_CONFIG_REC_BUFFER 19 +#define BASS_CONFIG_NET_PLAYLIST 21 +#define BASS_CONFIG_MUSIC_VIRTUAL 22 +#define BASS_CONFIG_VERIFY 23 +#define BASS_CONFIG_UPDATETHREADS 24 +#define BASS_CONFIG_DEV_BUFFER 27 +#define BASS_CONFIG_REC_LOOPBACK 28 +#define BASS_CONFIG_VISTA_TRUEPOS 30 +#define BASS_CONFIG_IOS_SESSION 34 +#define BASS_CONFIG_IOS_MIXAUDIO 34 +#define BASS_CONFIG_DEV_DEFAULT 36 +#define BASS_CONFIG_NET_READTIMEOUT 37 +#define BASS_CONFIG_VISTA_SPEAKERS 38 +#define BASS_CONFIG_IOS_SPEAKER 39 +#define BASS_CONFIG_MF_DISABLE 40 +#define BASS_CONFIG_HANDLES 41 +#define BASS_CONFIG_UNICODE 42 +#define BASS_CONFIG_SRC 43 +#define BASS_CONFIG_SRC_SAMPLE 44 +#define BASS_CONFIG_ASYNCFILE_BUFFER 45 +#define BASS_CONFIG_OGG_PRESCAN 47 +#define BASS_CONFIG_MF_VIDEO 48 +#define BASS_CONFIG_AIRPLAY 49 +#define BASS_CONFIG_DEV_NONSTOP 50 +#define BASS_CONFIG_IOS_NOCATEGORY 51 +#define BASS_CONFIG_VERIFY_NET 52 +#define BASS_CONFIG_DEV_PERIOD 53 +#define BASS_CONFIG_FLOAT 54 +#define BASS_CONFIG_NET_SEEK 56 +#define BASS_CONFIG_AM_DISABLE 58 +#define BASS_CONFIG_NET_PLAYLIST_DEPTH 59 +#define BASS_CONFIG_NET_PREBUF_WAIT 60 +#define BASS_CONFIG_ANDROID_SESSIONID 62 +#define BASS_CONFIG_WASAPI_PERSIST 65 +#define BASS_CONFIG_REC_WASAPI 66 +#define BASS_CONFIG_ANDROID_AAUDIO 67 + +// BASS_SetConfigPtr options +#define BASS_CONFIG_NET_AGENT 16 +#define BASS_CONFIG_NET_PROXY 17 +#define BASS_CONFIG_IOS_NOTIFY 46 +#define BASS_CONFIG_LIBSSL 64 + +// BASS_CONFIG_IOS_SESSION flags +#define BASS_IOS_SESSION_MIX 1 +#define BASS_IOS_SESSION_DUCK 2 +#define BASS_IOS_SESSION_AMBIENT 4 +#define BASS_IOS_SESSION_SPEAKER 8 +#define BASS_IOS_SESSION_DISABLE 16 + +// BASS_Init flags +#define BASS_DEVICE_8BITS 1 // 8 bit +#define BASS_DEVICE_MONO 2 // mono +#define BASS_DEVICE_3D 4 // enable 3D functionality +#define BASS_DEVICE_16BITS 8 // limit output to 16 bit +#define BASS_DEVICE_LATENCY 0x100 // calculate device latency (BASS_INFO struct) +#define BASS_DEVICE_CPSPEAKERS 0x400 // detect speakers via Windows control panel +#define BASS_DEVICE_SPEAKERS 0x800 // force enabling of speaker assignment +#define BASS_DEVICE_NOSPEAKER 0x1000 // ignore speaker arrangement +#define BASS_DEVICE_DMIX 0x2000 // use ALSA "dmix" plugin +#define BASS_DEVICE_FREQ 0x4000 // set device sample rate +#define BASS_DEVICE_STEREO 0x8000 // limit output to stereo +#define BASS_DEVICE_HOG 0x10000 // hog/exclusive mode +#define BASS_DEVICE_AUDIOTRACK 0x20000 // use AudioTrack output +#define BASS_DEVICE_DSOUND 0x40000 // use DirectSound output + +// DirectSound interfaces (for use with BASS_GetDSoundObject) +#define BASS_OBJECT_DS 1 // IDirectSound +#define BASS_OBJECT_DS3DL 2 // IDirectSound3DListener + +// Device info structure +typedef struct { +#if defined(_WIN32_WCE) || (WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP) + const wchar_t *name; // description + const wchar_t *driver; // driver +#else + const char *name; // description + const char *driver; // driver +#endif + DWORD flags; +} BASS_DEVICEINFO; + +// BASS_DEVICEINFO flags +#define BASS_DEVICE_ENABLED 1 +#define BASS_DEVICE_DEFAULT 2 +#define BASS_DEVICE_INIT 4 +#define BASS_DEVICE_LOOPBACK 8 + +#define BASS_DEVICE_TYPE_MASK 0xff000000 +#define BASS_DEVICE_TYPE_NETWORK 0x01000000 +#define BASS_DEVICE_TYPE_SPEAKERS 0x02000000 +#define BASS_DEVICE_TYPE_LINE 0x03000000 +#define BASS_DEVICE_TYPE_HEADPHONES 0x04000000 +#define BASS_DEVICE_TYPE_MICROPHONE 0x05000000 +#define BASS_DEVICE_TYPE_HEADSET 0x06000000 +#define BASS_DEVICE_TYPE_HANDSET 0x07000000 +#define BASS_DEVICE_TYPE_DIGITAL 0x08000000 +#define BASS_DEVICE_TYPE_SPDIF 0x09000000 +#define BASS_DEVICE_TYPE_HDMI 0x0a000000 +#define BASS_DEVICE_TYPE_DISPLAYPORT 0x40000000 + +// BASS_GetDeviceInfo flags +#define BASS_DEVICES_AIRPLAY 0x1000000 + +typedef struct { + DWORD flags; // device capabilities (DSCAPS_xxx flags) + DWORD hwsize; // size of total device hardware memory + DWORD hwfree; // size of free device hardware memory + DWORD freesam; // number of free sample slots in the hardware + DWORD free3d; // number of free 3D sample slots in the hardware + DWORD minrate; // min sample rate supported by the hardware + DWORD maxrate; // max sample rate supported by the hardware + BOOL eax; // device supports EAX? (always FALSE if BASS_DEVICE_3D was not used) + DWORD minbuf; // recommended minimum buffer length in ms (requires BASS_DEVICE_LATENCY) + DWORD dsver; // DirectSound version + DWORD latency; // delay (in ms) before start of playback (requires BASS_DEVICE_LATENCY) + DWORD initflags; // BASS_Init "flags" parameter + DWORD speakers; // number of speakers available + DWORD freq; // current output rate +} BASS_INFO; + +// BASS_INFO flags (from DSOUND.H) +#define DSCAPS_CONTINUOUSRATE 0x00000010 // supports all sample rates between min/maxrate +#define DSCAPS_EMULDRIVER 0x00000020 // device does NOT have hardware DirectSound support +#define DSCAPS_CERTIFIED 0x00000040 // device driver has been certified by Microsoft +#define DSCAPS_SECONDARYMONO 0x00000100 // mono +#define DSCAPS_SECONDARYSTEREO 0x00000200 // stereo +#define DSCAPS_SECONDARY8BIT 0x00000400 // 8 bit +#define DSCAPS_SECONDARY16BIT 0x00000800 // 16 bit + +// Recording device info structure +typedef struct { + DWORD flags; // device capabilities (DSCCAPS_xxx flags) + DWORD formats; // supported standard formats (WAVE_FORMAT_xxx flags) + DWORD inputs; // number of inputs + BOOL singlein; // TRUE = only 1 input can be set at a time + DWORD freq; // current input rate +} BASS_RECORDINFO; + +// BASS_RECORDINFO flags (from DSOUND.H) +#define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER // device does NOT have hardware DirectSound recording support +#define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED // device driver has been certified by Microsoft + +// defines for formats field of BASS_RECORDINFO (from MMSYSTEM.H) +#ifndef WAVE_FORMAT_1M08 +#define WAVE_FORMAT_1M08 0x00000001 /* 11.025 kHz, Mono, 8-bit */ +#define WAVE_FORMAT_1S08 0x00000002 /* 11.025 kHz, Stereo, 8-bit */ +#define WAVE_FORMAT_1M16 0x00000004 /* 11.025 kHz, Mono, 16-bit */ +#define WAVE_FORMAT_1S16 0x00000008 /* 11.025 kHz, Stereo, 16-bit */ +#define WAVE_FORMAT_2M08 0x00000010 /* 22.05 kHz, Mono, 8-bit */ +#define WAVE_FORMAT_2S08 0x00000020 /* 22.05 kHz, Stereo, 8-bit */ +#define WAVE_FORMAT_2M16 0x00000040 /* 22.05 kHz, Mono, 16-bit */ +#define WAVE_FORMAT_2S16 0x00000080 /* 22.05 kHz, Stereo, 16-bit */ +#define WAVE_FORMAT_4M08 0x00000100 /* 44.1 kHz, Mono, 8-bit */ +#define WAVE_FORMAT_4S08 0x00000200 /* 44.1 kHz, Stereo, 8-bit */ +#define WAVE_FORMAT_4M16 0x00000400 /* 44.1 kHz, Mono, 16-bit */ +#define WAVE_FORMAT_4S16 0x00000800 /* 44.1 kHz, Stereo, 16-bit */ +#endif + +// Sample info structure +typedef struct { + DWORD freq; // default playback rate + float volume; // default volume (0-1) + float pan; // default pan (-1=left, 0=middle, 1=right) + DWORD flags; // BASS_SAMPLE_xxx flags + DWORD length; // length (in bytes) + DWORD max; // maximum simultaneous playbacks + DWORD origres; // original resolution + DWORD chans; // number of channels + DWORD mingap; // minimum gap (ms) between creating channels + DWORD mode3d; // BASS_3DMODE_xxx mode + float mindist; // minimum distance + float maxdist; // maximum distance + DWORD iangle; // angle of inside projection cone + DWORD oangle; // angle of outside projection cone + float outvol; // delta-volume outside the projection cone + DWORD vam; // voice allocation/management flags (BASS_VAM_xxx) + DWORD priority; // priority (0=lowest, 0xffffffff=highest) +} BASS_SAMPLE; + +#define BASS_SAMPLE_8BITS 1 // 8 bit +#define BASS_SAMPLE_FLOAT 256 // 32 bit floating-point +#define BASS_SAMPLE_MONO 2 // mono +#define BASS_SAMPLE_LOOP 4 // looped +#define BASS_SAMPLE_3D 8 // 3D functionality +#define BASS_SAMPLE_SOFTWARE 16 // not using hardware mixing +#define BASS_SAMPLE_MUTEMAX 32 // mute at max distance (3D only) +#define BASS_SAMPLE_VAM 64 // DX7 voice allocation & management +#define BASS_SAMPLE_FX 128 // old implementation of DX8 effects +#define BASS_SAMPLE_OVER_VOL 0x10000 // override lowest volume +#define BASS_SAMPLE_OVER_POS 0x20000 // override longest playing +#define BASS_SAMPLE_OVER_DIST 0x30000 // override furthest from listener (3D only) + +#define BASS_STREAM_PRESCAN 0x20000 // enable pin-point seeking/length (MP3/MP2/MP1) +#define BASS_STREAM_AUTOFREE 0x40000 // automatically free the stream when it stop/ends +#define BASS_STREAM_RESTRATE 0x80000 // restrict the download rate of internet file streams +#define BASS_STREAM_BLOCK 0x100000 // download/play internet file stream in small blocks +#define BASS_STREAM_DECODE 0x200000 // don't play the stream, only decode (BASS_ChannelGetData) +#define BASS_STREAM_STATUS 0x800000 // give server status info (HTTP/ICY tags) in DOWNLOADPROC + +#define BASS_MP3_IGNOREDELAY 0x200 // ignore LAME/Xing/VBRI/iTunes delay & padding info +#define BASS_MP3_SETPOS BASS_STREAM_PRESCAN + +#define BASS_MUSIC_FLOAT BASS_SAMPLE_FLOAT +#define BASS_MUSIC_MONO BASS_SAMPLE_MONO +#define BASS_MUSIC_LOOP BASS_SAMPLE_LOOP +#define BASS_MUSIC_3D BASS_SAMPLE_3D +#define BASS_MUSIC_FX BASS_SAMPLE_FX +#define BASS_MUSIC_AUTOFREE BASS_STREAM_AUTOFREE +#define BASS_MUSIC_DECODE BASS_STREAM_DECODE +#define BASS_MUSIC_PRESCAN BASS_STREAM_PRESCAN // calculate playback length +#define BASS_MUSIC_CALCLEN BASS_MUSIC_PRESCAN +#define BASS_MUSIC_RAMP 0x200 // normal ramping +#define BASS_MUSIC_RAMPS 0x400 // sensitive ramping +#define BASS_MUSIC_SURROUND 0x800 // surround sound +#define BASS_MUSIC_SURROUND2 0x1000 // surround sound (mode 2) +#define BASS_MUSIC_FT2PAN 0x2000 // apply FastTracker 2 panning to XM files +#define BASS_MUSIC_FT2MOD 0x2000 // play .MOD as FastTracker 2 does +#define BASS_MUSIC_PT1MOD 0x4000 // play .MOD as ProTracker 1 does +#define BASS_MUSIC_NONINTER 0x10000 // non-interpolated sample mixing +#define BASS_MUSIC_SINCINTER 0x800000 // sinc interpolated sample mixing +#define BASS_MUSIC_POSRESET 0x8000 // stop all notes when moving position +#define BASS_MUSIC_POSRESETEX 0x400000 // stop all notes and reset bmp/etc when moving position +#define BASS_MUSIC_STOPBACK 0x80000 // stop the music on a backwards jump effect +#define BASS_MUSIC_NOSAMPLE 0x100000 // don't load the samples + +// Speaker assignment flags +#define BASS_SPEAKER_FRONT 0x1000000 // front speakers +#define BASS_SPEAKER_REAR 0x2000000 // rear/side speakers +#define BASS_SPEAKER_CENLFE 0x3000000 // center & LFE speakers (5.1) +#define BASS_SPEAKER_REAR2 0x4000000 // rear center speakers (7.1) +#define BASS_SPEAKER_N(n) ((n)<<24) // n'th pair of speakers (max 15) +#define BASS_SPEAKER_LEFT 0x10000000 // modifier: left +#define BASS_SPEAKER_RIGHT 0x20000000 // modifier: right +#define BASS_SPEAKER_FRONTLEFT BASS_SPEAKER_FRONT|BASS_SPEAKER_LEFT +#define BASS_SPEAKER_FRONTRIGHT BASS_SPEAKER_FRONT|BASS_SPEAKER_RIGHT +#define BASS_SPEAKER_REARLEFT BASS_SPEAKER_REAR|BASS_SPEAKER_LEFT +#define BASS_SPEAKER_REARRIGHT BASS_SPEAKER_REAR|BASS_SPEAKER_RIGHT +#define BASS_SPEAKER_CENTER BASS_SPEAKER_CENLFE|BASS_SPEAKER_LEFT +#define BASS_SPEAKER_LFE BASS_SPEAKER_CENLFE|BASS_SPEAKER_RIGHT +#define BASS_SPEAKER_REAR2LEFT BASS_SPEAKER_REAR2|BASS_SPEAKER_LEFT +#define BASS_SPEAKER_REAR2RIGHT BASS_SPEAKER_REAR2|BASS_SPEAKER_RIGHT + +#define BASS_ASYNCFILE 0x40000000 +#define BASS_UNICODE 0x80000000 + +#define BASS_RECORD_PAUSE 0x8000 // start recording paused +#define BASS_RECORD_ECHOCANCEL 0x2000 +#define BASS_RECORD_AGC 0x4000 + +// DX7 voice allocation & management flags +#define BASS_VAM_HARDWARE 1 +#define BASS_VAM_SOFTWARE 2 +#define BASS_VAM_TERM_TIME 4 +#define BASS_VAM_TERM_DIST 8 +#define BASS_VAM_TERM_PRIO 16 + +// Channel info structure +typedef struct { + DWORD freq; // default playback rate + DWORD chans; // channels + DWORD flags; // BASS_SAMPLE/STREAM/MUSIC/SPEAKER flags + DWORD ctype; // type of channel + DWORD origres; // original resolution + HPLUGIN plugin; // plugin + HSAMPLE sample; // sample + const char *filename; // filename +} BASS_CHANNELINFO; + +#define BASS_ORIGRES_FLOAT 0x10000 + +// BASS_CHANNELINFO types +#define BASS_CTYPE_SAMPLE 1 +#define BASS_CTYPE_RECORD 2 +#define BASS_CTYPE_STREAM 0x10000 +#define BASS_CTYPE_STREAM_VORBIS 0x10002 +#define BASS_CTYPE_STREAM_OGG 0x10002 +#define BASS_CTYPE_STREAM_MP1 0x10003 +#define BASS_CTYPE_STREAM_MP2 0x10004 +#define BASS_CTYPE_STREAM_MP3 0x10005 +#define BASS_CTYPE_STREAM_AIFF 0x10006 +#define BASS_CTYPE_STREAM_CA 0x10007 +#define BASS_CTYPE_STREAM_MF 0x10008 +#define BASS_CTYPE_STREAM_AM 0x10009 +#define BASS_CTYPE_STREAM_DUMMY 0x18000 +#define BASS_CTYPE_STREAM_DEVICE 0x18001 +#define BASS_CTYPE_STREAM_WAV 0x40000 // WAVE flag, LOWORD=codec +#define BASS_CTYPE_STREAM_WAV_PCM 0x50001 +#define BASS_CTYPE_STREAM_WAV_FLOAT 0x50003 +#define BASS_CTYPE_MUSIC_MOD 0x20000 +#define BASS_CTYPE_MUSIC_MTM 0x20001 +#define BASS_CTYPE_MUSIC_S3M 0x20002 +#define BASS_CTYPE_MUSIC_XM 0x20003 +#define BASS_CTYPE_MUSIC_IT 0x20004 +#define BASS_CTYPE_MUSIC_MO3 0x00100 // MO3 flag + +typedef struct { + DWORD ctype; // channel type +#if defined(_WIN32_WCE) || (WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP) + const wchar_t *name; // format description + const wchar_t *exts; // file extension filter (*.ext1;*.ext2;etc...) +#else + const char *name; // format description + const char *exts; // file extension filter (*.ext1;*.ext2;etc...) +#endif +} BASS_PLUGINFORM; + +typedef struct { + DWORD version; // version (same form as BASS_GetVersion) + DWORD formatc; // number of formats + const BASS_PLUGINFORM *formats; // the array of formats +} BASS_PLUGININFO; + +// 3D vector (for 3D positions/velocities/orientations) +typedef struct BASS_3DVECTOR { +#ifdef __cplusplus + BASS_3DVECTOR() {}; + BASS_3DVECTOR(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {}; +#endif + float x; // +=right, -=left + float y; // +=up, -=down + float z; // +=front, -=behind +} BASS_3DVECTOR; + +// 3D channel modes +#define BASS_3DMODE_NORMAL 0 // normal 3D processing +#define BASS_3DMODE_RELATIVE 1 // position is relative to the listener +#define BASS_3DMODE_OFF 2 // no 3D processing + +// software 3D mixing algorithms (used with BASS_CONFIG_3DALGORITHM) +#define BASS_3DALG_DEFAULT 0 +#define BASS_3DALG_OFF 1 +#define BASS_3DALG_FULL 2 +#define BASS_3DALG_LIGHT 3 + +// EAX environments, use with BASS_SetEAXParameters +enum +{ + EAX_ENVIRONMENT_GENERIC, + EAX_ENVIRONMENT_PADDEDCELL, + EAX_ENVIRONMENT_ROOM, + EAX_ENVIRONMENT_BATHROOM, + EAX_ENVIRONMENT_LIVINGROOM, + EAX_ENVIRONMENT_STONEROOM, + EAX_ENVIRONMENT_AUDITORIUM, + EAX_ENVIRONMENT_CONCERTHALL, + EAX_ENVIRONMENT_CAVE, + EAX_ENVIRONMENT_ARENA, + EAX_ENVIRONMENT_HANGAR, + EAX_ENVIRONMENT_CARPETEDHALLWAY, + EAX_ENVIRONMENT_HALLWAY, + EAX_ENVIRONMENT_STONECORRIDOR, + EAX_ENVIRONMENT_ALLEY, + EAX_ENVIRONMENT_FOREST, + EAX_ENVIRONMENT_CITY, + EAX_ENVIRONMENT_MOUNTAINS, + EAX_ENVIRONMENT_QUARRY, + EAX_ENVIRONMENT_PLAIN, + EAX_ENVIRONMENT_PARKINGLOT, + EAX_ENVIRONMENT_SEWERPIPE, + EAX_ENVIRONMENT_UNDERWATER, + EAX_ENVIRONMENT_DRUGGED, + EAX_ENVIRONMENT_DIZZY, + EAX_ENVIRONMENT_PSYCHOTIC, + + EAX_ENVIRONMENT_COUNT // total number of environments +}; + +// EAX presets, usage: BASS_SetEAXParameters(EAX_PRESET_xxx) +#define EAX_PRESET_GENERIC EAX_ENVIRONMENT_GENERIC,0.5F,1.493F,0.5F +#define EAX_PRESET_PADDEDCELL EAX_ENVIRONMENT_PADDEDCELL,0.25F,0.1F,0.0F +#define EAX_PRESET_ROOM EAX_ENVIRONMENT_ROOM,0.417F,0.4F,0.666F +#define EAX_PRESET_BATHROOM EAX_ENVIRONMENT_BATHROOM,0.653F,1.499F,0.166F +#define EAX_PRESET_LIVINGROOM EAX_ENVIRONMENT_LIVINGROOM,0.208F,0.478F,0.0F +#define EAX_PRESET_STONEROOM EAX_ENVIRONMENT_STONEROOM,0.5F,2.309F,0.888F +#define EAX_PRESET_AUDITORIUM EAX_ENVIRONMENT_AUDITORIUM,0.403F,4.279F,0.5F +#define EAX_PRESET_CONCERTHALL EAX_ENVIRONMENT_CONCERTHALL,0.5F,3.961F,0.5F +#define EAX_PRESET_CAVE EAX_ENVIRONMENT_CAVE,0.5F,2.886F,1.304F +#define EAX_PRESET_ARENA EAX_ENVIRONMENT_ARENA,0.361F,7.284F,0.332F +#define EAX_PRESET_HANGAR EAX_ENVIRONMENT_HANGAR,0.5F,10.0F,0.3F +#define EAX_PRESET_CARPETEDHALLWAY EAX_ENVIRONMENT_CARPETEDHALLWAY,0.153F,0.259F,2.0F +#define EAX_PRESET_HALLWAY EAX_ENVIRONMENT_HALLWAY,0.361F,1.493F,0.0F +#define EAX_PRESET_STONECORRIDOR EAX_ENVIRONMENT_STONECORRIDOR,0.444F,2.697F,0.638F +#define EAX_PRESET_ALLEY EAX_ENVIRONMENT_ALLEY,0.25F,1.752F,0.776F +#define EAX_PRESET_FOREST EAX_ENVIRONMENT_FOREST,0.111F,3.145F,0.472F +#define EAX_PRESET_CITY EAX_ENVIRONMENT_CITY,0.111F,2.767F,0.224F +#define EAX_PRESET_MOUNTAINS EAX_ENVIRONMENT_MOUNTAINS,0.194F,7.841F,0.472F +#define EAX_PRESET_QUARRY EAX_ENVIRONMENT_QUARRY,1.0F,1.499F,0.5F +#define EAX_PRESET_PLAIN EAX_ENVIRONMENT_PLAIN,0.097F,2.767F,0.224F +#define EAX_PRESET_PARKINGLOT EAX_ENVIRONMENT_PARKINGLOT,0.208F,1.652F,1.5F +#define EAX_PRESET_SEWERPIPE EAX_ENVIRONMENT_SEWERPIPE,0.652F,2.886F,0.25F +#define EAX_PRESET_UNDERWATER EAX_ENVIRONMENT_UNDERWATER,1.0F,1.499F,0.0F +#define EAX_PRESET_DRUGGED EAX_ENVIRONMENT_DRUGGED,0.875F,8.392F,1.388F +#define EAX_PRESET_DIZZY EAX_ENVIRONMENT_DIZZY,0.139F,17.234F,0.666F +#define EAX_PRESET_PSYCHOTIC EAX_ENVIRONMENT_PSYCHOTIC,0.486F,7.563F,0.806F + +typedef DWORD (CALLBACK STREAMPROC)(HSTREAM handle, void *buffer, DWORD length, void *user); +/* User stream callback function. +handle : The stream that needs writing +buffer : Buffer to write the samples in +length : Number of bytes to write +user : The 'user' parameter value given when calling BASS_StreamCreate +RETURN : Number of bytes written. Set the BASS_STREAMPROC_END flag to end the stream. */ + +#define BASS_STREAMPROC_END 0x80000000 // end of user stream flag + +// special STREAMPROCs +#define STREAMPROC_DUMMY (STREAMPROC*)0 // "dummy" stream +#define STREAMPROC_PUSH (STREAMPROC*)-1 // push stream +#define STREAMPROC_DEVICE (STREAMPROC*)-2 // device mix stream +#define STREAMPROC_DEVICE_3D (STREAMPROC*)-3 // device 3D mix stream + +// BASS_StreamCreateFileUser file systems +#define STREAMFILE_NOBUFFER 0 +#define STREAMFILE_BUFFER 1 +#define STREAMFILE_BUFFERPUSH 2 + +// User file stream callback functions +typedef void (CALLBACK FILECLOSEPROC)(void *user); +typedef QWORD (CALLBACK FILELENPROC)(void *user); +typedef DWORD (CALLBACK FILEREADPROC)(void *buffer, DWORD length, void *user); +typedef BOOL (CALLBACK FILESEEKPROC)(QWORD offset, void *user); + +typedef struct { + FILECLOSEPROC *close; + FILELENPROC *length; + FILEREADPROC *read; + FILESEEKPROC *seek; +} BASS_FILEPROCS; + +// BASS_StreamPutFileData options +#define BASS_FILEDATA_END 0 // end & close the file + +// BASS_StreamGetFilePosition modes +#define BASS_FILEPOS_CURRENT 0 +#define BASS_FILEPOS_DECODE BASS_FILEPOS_CURRENT +#define BASS_FILEPOS_DOWNLOAD 1 +#define BASS_FILEPOS_END 2 +#define BASS_FILEPOS_START 3 +#define BASS_FILEPOS_CONNECTED 4 +#define BASS_FILEPOS_BUFFER 5 +#define BASS_FILEPOS_SOCKET 6 +#define BASS_FILEPOS_ASYNCBUF 7 +#define BASS_FILEPOS_SIZE 8 +#define BASS_FILEPOS_BUFFERING 9 + +typedef void (CALLBACK DOWNLOADPROC)(const void *buffer, DWORD length, void *user); +/* Internet stream download callback function. +buffer : Buffer containing the downloaded data... NULL=end of download +length : Number of bytes in the buffer +user : The 'user' parameter value given when calling BASS_StreamCreateURL */ + +// BASS_ChannelSetSync types +#define BASS_SYNC_POS 0 +#define BASS_SYNC_END 2 +#define BASS_SYNC_META 4 +#define BASS_SYNC_SLIDE 5 +#define BASS_SYNC_STALL 6 +#define BASS_SYNC_DOWNLOAD 7 +#define BASS_SYNC_FREE 8 +#define BASS_SYNC_SETPOS 11 +#define BASS_SYNC_MUSICPOS 10 +#define BASS_SYNC_MUSICINST 1 +#define BASS_SYNC_MUSICFX 3 +#define BASS_SYNC_OGG_CHANGE 12 +#define BASS_SYNC_DEV_FAIL 14 +#define BASS_SYNC_DEV_FORMAT 15 +#define BASS_SYNC_THREAD 0x20000000 // flag: call sync in other thread +#define BASS_SYNC_MIXTIME 0x40000000 // flag: sync at mixtime, else at playtime +#define BASS_SYNC_ONETIME 0x80000000 // flag: sync only once, else continuously + +typedef void (CALLBACK SYNCPROC)(HSYNC handle, DWORD channel, DWORD data, void *user); +/* Sync callback function. +handle : The sync that has occured +channel: Channel that the sync occured in +data : Additional data associated with the sync's occurance +user : The 'user' parameter given when calling BASS_ChannelSetSync */ + +typedef void (CALLBACK DSPPROC)(HDSP handle, DWORD channel, void *buffer, DWORD length, void *user); +/* DSP callback function. +handle : The DSP handle +channel: Channel that the DSP is being applied to +buffer : Buffer to apply the DSP to +length : Number of bytes in the buffer +user : The 'user' parameter given when calling BASS_ChannelSetDSP */ + +typedef BOOL (CALLBACK RECORDPROC)(HRECORD handle, const void *buffer, DWORD length, void *user); +/* Recording callback function. +handle : The recording handle +buffer : Buffer containing the recorded sample data +length : Number of bytes +user : The 'user' parameter value given when calling BASS_RecordStart +RETURN : TRUE = continue recording, FALSE = stop */ + +// BASS_ChannelIsActive return values +#define BASS_ACTIVE_STOPPED 0 +#define BASS_ACTIVE_PLAYING 1 +#define BASS_ACTIVE_STALLED 2 +#define BASS_ACTIVE_PAUSED 3 +#define BASS_ACTIVE_PAUSED_DEVICE 4 + +// Channel attributes +#define BASS_ATTRIB_FREQ 1 +#define BASS_ATTRIB_VOL 2 +#define BASS_ATTRIB_PAN 3 +#define BASS_ATTRIB_EAXMIX 4 +#define BASS_ATTRIB_NOBUFFER 5 +#define BASS_ATTRIB_VBR 6 +#define BASS_ATTRIB_CPU 7 +#define BASS_ATTRIB_SRC 8 +#define BASS_ATTRIB_NET_RESUME 9 +#define BASS_ATTRIB_SCANINFO 10 +#define BASS_ATTRIB_NORAMP 11 +#define BASS_ATTRIB_BITRATE 12 +#define BASS_ATTRIB_BUFFER 13 +#define BASS_ATTRIB_GRANULE 14 +#define BASS_ATTRIB_MUSIC_AMPLIFY 0x100 +#define BASS_ATTRIB_MUSIC_PANSEP 0x101 +#define BASS_ATTRIB_MUSIC_PSCALER 0x102 +#define BASS_ATTRIB_MUSIC_BPM 0x103 +#define BASS_ATTRIB_MUSIC_SPEED 0x104 +#define BASS_ATTRIB_MUSIC_VOL_GLOBAL 0x105 +#define BASS_ATTRIB_MUSIC_ACTIVE 0x106 +#define BASS_ATTRIB_MUSIC_VOL_CHAN 0x200 // + channel # +#define BASS_ATTRIB_MUSIC_VOL_INST 0x300 // + instrument # + +// BASS_ChannelSlideAttribute flags +#define BASS_SLIDE_LOG 0x1000000 + +// BASS_ChannelGetData flags +#define BASS_DATA_AVAILABLE 0 // query how much data is buffered +#define BASS_DATA_FIXED 0x20000000 // flag: return 8.24 fixed-point data +#define BASS_DATA_FLOAT 0x40000000 // flag: return floating-point sample data +#define BASS_DATA_FFT256 0x80000000 // 256 sample FFT +#define BASS_DATA_FFT512 0x80000001 // 512 FFT +#define BASS_DATA_FFT1024 0x80000002 // 1024 FFT +#define BASS_DATA_FFT2048 0x80000003 // 2048 FFT +#define BASS_DATA_FFT4096 0x80000004 // 4096 FFT +#define BASS_DATA_FFT8192 0x80000005 // 8192 FFT +#define BASS_DATA_FFT16384 0x80000006 // 16384 FFT +#define BASS_DATA_FFT32768 0x80000007 // 32768 FFT +#define BASS_DATA_FFT_INDIVIDUAL 0x10 // FFT flag: FFT for each channel, else all combined +#define BASS_DATA_FFT_NOWINDOW 0x20 // FFT flag: no Hanning window +#define BASS_DATA_FFT_REMOVEDC 0x40 // FFT flag: pre-remove DC bias +#define BASS_DATA_FFT_COMPLEX 0x80 // FFT flag: return complex data +#define BASS_DATA_FFT_NYQUIST 0x100 // FFT flag: return extra Nyquist value + +// BASS_ChannelGetLevelEx flags +#define BASS_LEVEL_MONO 1 +#define BASS_LEVEL_STEREO 2 +#define BASS_LEVEL_RMS 4 +#define BASS_LEVEL_VOLPAN 8 + +// BASS_ChannelGetTags types : what's returned +#define BASS_TAG_ID3 0 // ID3v1 tags : TAG_ID3 structure +#define BASS_TAG_ID3V2 1 // ID3v2 tags : variable length block +#define BASS_TAG_OGG 2 // OGG comments : series of null-terminated UTF-8 strings +#define BASS_TAG_HTTP 3 // HTTP headers : series of null-terminated ANSI strings +#define BASS_TAG_ICY 4 // ICY headers : series of null-terminated ANSI strings +#define BASS_TAG_META 5 // ICY metadata : ANSI string +#define BASS_TAG_APE 6 // APE tags : series of null-terminated UTF-8 strings +#define BASS_TAG_MP4 7 // MP4/iTunes metadata : series of null-terminated UTF-8 strings +#define BASS_TAG_WMA 8 // WMA tags : series of null-terminated UTF-8 strings +#define BASS_TAG_VENDOR 9 // OGG encoder : UTF-8 string +#define BASS_TAG_LYRICS3 10 // Lyric3v2 tag : ASCII string +#define BASS_TAG_CA_CODEC 11 // CoreAudio codec info : TAG_CA_CODEC structure +#define BASS_TAG_MF 13 // Media Foundation tags : series of null-terminated UTF-8 strings +#define BASS_TAG_WAVEFORMAT 14 // WAVE format : WAVEFORMATEEX structure +#define BASS_TAG_AM_MIME 15 // Android Media MIME type : ASCII string +#define BASS_TAG_AM_NAME 16 // Android Media codec name : ASCII string +#define BASS_TAG_RIFF_INFO 0x100 // RIFF "INFO" tags : series of null-terminated ANSI strings +#define BASS_TAG_RIFF_BEXT 0x101 // RIFF/BWF "bext" tags : TAG_BEXT structure +#define BASS_TAG_RIFF_CART 0x102 // RIFF/BWF "cart" tags : TAG_CART structure +#define BASS_TAG_RIFF_DISP 0x103 // RIFF "DISP" text tag : ANSI string +#define BASS_TAG_RIFF_CUE 0x104 // RIFF "cue " chunk : TAG_CUE structure +#define BASS_TAG_RIFF_SMPL 0x105 // RIFF "smpl" chunk : TAG_SMPL structure +#define BASS_TAG_APE_BINARY 0x1000 // + index #, binary APE tag : TAG_APE_BINARY structure +#define BASS_TAG_MUSIC_NAME 0x10000 // MOD music name : ANSI string +#define BASS_TAG_MUSIC_MESSAGE 0x10001 // MOD message : ANSI string +#define BASS_TAG_MUSIC_ORDERS 0x10002 // MOD order list : BYTE array of pattern numbers +#define BASS_TAG_MUSIC_AUTH 0x10003 // MOD author : UTF-8 string +#define BASS_TAG_MUSIC_INST 0x10100 // + instrument #, MOD instrument name : ANSI string +#define BASS_TAG_MUSIC_SAMPLE 0x10300 // + sample #, MOD sample name : ANSI string + +// ID3v1 tag structure +typedef struct { + char id[3]; + char title[30]; + char artist[30]; + char album[30]; + char year[4]; + char comment[30]; + BYTE genre; +} TAG_ID3; + +// Binary APE tag structure +typedef struct { + const char *key; + const void *data; + DWORD length; +} TAG_APE_BINARY; + +// BWF "bext" tag structure +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4200) +#endif +#pragma pack(push,1) +typedef struct { + char Description[256]; // description + char Originator[32]; // name of the originator + char OriginatorReference[32]; // reference of the originator + char OriginationDate[10]; // date of creation (yyyy-mm-dd) + char OriginationTime[8]; // time of creation (hh-mm-ss) + QWORD TimeReference; // first sample count since midnight (little-endian) + WORD Version; // BWF version (little-endian) + BYTE UMID[64]; // SMPTE UMID + BYTE Reserved[190]; +#if defined(__GNUC__) && __GNUC__<3 + char CodingHistory[0]; // history +#elif 1 // change to 0 if compiler fails the following line + char CodingHistory[]; // history +#else + char CodingHistory[1]; // history +#endif +} TAG_BEXT; +#pragma pack(pop) + +// BWF "cart" tag structures +typedef struct +{ + DWORD dwUsage; // FOURCC timer usage ID + DWORD dwValue; // timer value in samples from head +} TAG_CART_TIMER; + +typedef struct +{ + char Version[4]; // version of the data structure + char Title[64]; // title of cart audio sequence + char Artist[64]; // artist or creator name + char CutID[64]; // cut number identification + char ClientID[64]; // client identification + char Category[64]; // category ID, PSA, NEWS, etc + char Classification[64]; // classification or auxiliary key + char OutCue[64]; // out cue text + char StartDate[10]; // yyyy-mm-dd + char StartTime[8]; // hh:mm:ss + char EndDate[10]; // yyyy-mm-dd + char EndTime[8]; // hh:mm:ss + char ProducerAppID[64]; // name of vendor or application + char ProducerAppVersion[64]; // version of producer application + char UserDef[64]; // user defined text + DWORD dwLevelReference; // sample value for 0 dB reference + TAG_CART_TIMER PostTimer[8]; // 8 time markers after head + char Reserved[276]; + char URL[1024]; // uniform resource locator +#if defined(__GNUC__) && __GNUC__<3 + char TagText[0]; // free form text for scripts or tags +#elif 1 // change to 0 if compiler fails the following line + char TagText[]; // free form text for scripts or tags +#else + char TagText[1]; // free form text for scripts or tags +#endif +} TAG_CART; + +// RIFF "cue " tag structures +typedef struct +{ + DWORD dwName; + DWORD dwPosition; + DWORD fccChunk; + DWORD dwChunkStart; + DWORD dwBlockStart; + DWORD dwSampleOffset; +} TAG_CUE_POINT; + +typedef struct +{ + DWORD dwCuePoints; +#if defined(__GNUC__) && __GNUC__<3 + TAG_CUE_POINT CuePoints[0]; +#elif 1 // change to 0 if compiler fails the following line + TAG_CUE_POINT CuePoints[]; +#else + TAG_CUE_POINT CuePoints[1]; +#endif +} TAG_CUE; + +// RIFF "smpl" tag structures +typedef struct +{ + DWORD dwIdentifier; + DWORD dwType; + DWORD dwStart; + DWORD dwEnd; + DWORD dwFraction; + DWORD dwPlayCount; +} TAG_SMPL_LOOP; + +typedef struct +{ + DWORD dwManufacturer; + DWORD dwProduct; + DWORD dwSamplePeriod; + DWORD dwMIDIUnityNote; + DWORD dwMIDIPitchFraction; + DWORD dwSMPTEFormat; + DWORD dwSMPTEOffset; + DWORD cSampleLoops; + DWORD cbSamplerData; +#if defined(__GNUC__) && __GNUC__<3 + TAG_SMPL_LOOP SampleLoops[0]; +#elif 1 // change to 0 if compiler fails the following line + TAG_SMPL_LOOP SampleLoops[]; +#else + TAG_SMPL_LOOP SampleLoops[1]; +#endif +} TAG_SMPL; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + +// CoreAudio codec info structure +typedef struct { + DWORD ftype; // file format + DWORD atype; // audio format + const char *name; // description +} TAG_CA_CODEC; + +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ +#pragma pack(push,1) +typedef struct tWAVEFORMATEX +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX, *PWAVEFORMATEX, *LPWAVEFORMATEX; +typedef const WAVEFORMATEX *LPCWAVEFORMATEX; +#pragma pack(pop) +#endif + +// BASS_ChannelGetLength/GetPosition/SetPosition modes +#define BASS_POS_BYTE 0 // byte position +#define BASS_POS_MUSIC_ORDER 1 // order.row position, MAKELONG(order,row) +#define BASS_POS_OGG 3 // OGG bitstream number +#define BASS_POS_RESET 0x2000000 // flag: reset user file buffers +#define BASS_POS_RELATIVE 0x4000000 // flag: seek relative to the current position +#define BASS_POS_INEXACT 0x8000000 // flag: allow seeking to inexact position +#define BASS_POS_DECODE 0x10000000 // flag: get the decoding (not playing) position +#define BASS_POS_DECODETO 0x20000000 // flag: decode to the position instead of seeking +#define BASS_POS_SCAN 0x40000000 // flag: scan to the position + +// BASS_ChannelSetDevice/GetDevice option +#define BASS_NODEVICE 0x20000 + +// BASS_RecordSetInput flags +#define BASS_INPUT_OFF 0x10000 +#define BASS_INPUT_ON 0x20000 + +#define BASS_INPUT_TYPE_MASK 0xff000000 +#define BASS_INPUT_TYPE_UNDEF 0x00000000 +#define BASS_INPUT_TYPE_DIGITAL 0x01000000 +#define BASS_INPUT_TYPE_LINE 0x02000000 +#define BASS_INPUT_TYPE_MIC 0x03000000 +#define BASS_INPUT_TYPE_SYNTH 0x04000000 +#define BASS_INPUT_TYPE_CD 0x05000000 +#define BASS_INPUT_TYPE_PHONE 0x06000000 +#define BASS_INPUT_TYPE_SPEAKER 0x07000000 +#define BASS_INPUT_TYPE_WAVE 0x08000000 +#define BASS_INPUT_TYPE_AUX 0x09000000 +#define BASS_INPUT_TYPE_ANALOG 0x0a000000 + +// BASS_ChannelSetFX effect types +#define BASS_FX_DX8_CHORUS 0 +#define BASS_FX_DX8_COMPRESSOR 1 +#define BASS_FX_DX8_DISTORTION 2 +#define BASS_FX_DX8_ECHO 3 +#define BASS_FX_DX8_FLANGER 4 +#define BASS_FX_DX8_GARGLE 5 +#define BASS_FX_DX8_I3DL2REVERB 6 +#define BASS_FX_DX8_PARAMEQ 7 +#define BASS_FX_DX8_REVERB 8 +#define BASS_FX_VOLUME 9 + +typedef struct { + float fWetDryMix; + float fDepth; + float fFeedback; + float fFrequency; + DWORD lWaveform; // 0=triangle, 1=sine + float fDelay; + DWORD lPhase; // BASS_DX8_PHASE_xxx +} BASS_DX8_CHORUS; + +typedef struct { + float fGain; + float fAttack; + float fRelease; + float fThreshold; + float fRatio; + float fPredelay; +} BASS_DX8_COMPRESSOR; + +typedef struct { + float fGain; + float fEdge; + float fPostEQCenterFrequency; + float fPostEQBandwidth; + float fPreLowpassCutoff; +} BASS_DX8_DISTORTION; + +typedef struct { + float fWetDryMix; + float fFeedback; + float fLeftDelay; + float fRightDelay; + BOOL lPanDelay; +} BASS_DX8_ECHO; + +typedef struct { + float fWetDryMix; + float fDepth; + float fFeedback; + float fFrequency; + DWORD lWaveform; // 0=triangle, 1=sine + float fDelay; + DWORD lPhase; // BASS_DX8_PHASE_xxx +} BASS_DX8_FLANGER; + +typedef struct { + DWORD dwRateHz; // Rate of modulation in hz + DWORD dwWaveShape; // 0=triangle, 1=square +} BASS_DX8_GARGLE; + +typedef struct { + int lRoom; // [-10000, 0] default: -1000 mB + int lRoomHF; // [-10000, 0] default: 0 mB + float flRoomRolloffFactor; // [0.0, 10.0] default: 0.0 + float flDecayTime; // [0.1, 20.0] default: 1.49s + float flDecayHFRatio; // [0.1, 2.0] default: 0.83 + int lReflections; // [-10000, 1000] default: -2602 mB + float flReflectionsDelay; // [0.0, 0.3] default: 0.007 s + int lReverb; // [-10000, 2000] default: 200 mB + float flReverbDelay; // [0.0, 0.1] default: 0.011 s + float flDiffusion; // [0.0, 100.0] default: 100.0 % + float flDensity; // [0.0, 100.0] default: 100.0 % + float flHFReference; // [20.0, 20000.0] default: 5000.0 Hz +} BASS_DX8_I3DL2REVERB; + +typedef struct { + float fCenter; + float fBandwidth; + float fGain; +} BASS_DX8_PARAMEQ; + +typedef struct { + float fInGain; // [-96.0,0.0] default: 0.0 dB + float fReverbMix; // [-96.0,0.0] default: 0.0 db + float fReverbTime; // [0.001,3000.0] default: 1000.0 ms + float fHighFreqRTRatio; // [0.001,0.999] default: 0.001 +} BASS_DX8_REVERB; + +#define BASS_DX8_PHASE_NEG_180 0 +#define BASS_DX8_PHASE_NEG_90 1 +#define BASS_DX8_PHASE_ZERO 2 +#define BASS_DX8_PHASE_90 3 +#define BASS_DX8_PHASE_180 4 + +typedef struct { + float fTarget; + float fCurrent; + float fTime; + DWORD lCurve; +} BASS_FX_VOLUME_PARAM; + +typedef void (CALLBACK IOSNOTIFYPROC)(DWORD status); +/* iOS notification callback function. +status : The notification (BASS_IOSNOTIFY_xxx) */ + +#define BASS_IOSNOTIFY_INTERRUPT 1 // interruption started +#define BASS_IOSNOTIFY_INTERRUPT_END 2 // interruption ended + +BOOL BASSDEF(BASS_SetConfig)(DWORD option, DWORD value); +DWORD BASSDEF(BASS_GetConfig)(DWORD option); +BOOL BASSDEF(BASS_SetConfigPtr)(DWORD option, const void *value); +void *BASSDEF(BASS_GetConfigPtr)(DWORD option); +DWORD BASSDEF(BASS_GetVersion)(); +int BASSDEF(BASS_ErrorGetCode)(); +BOOL BASSDEF(BASS_GetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info); +#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP) +BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, HWND win, const GUID *dsguid); +#else +BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, void *win, void *dsguid); +#endif +BOOL BASSDEF(BASS_SetDevice)(DWORD device); +DWORD BASSDEF(BASS_GetDevice)(); +BOOL BASSDEF(BASS_Free)(); +#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP) +void *BASSDEF(BASS_GetDSoundObject)(DWORD object); +#endif +BOOL BASSDEF(BASS_GetInfo)(BASS_INFO *info); +BOOL BASSDEF(BASS_Update)(DWORD length); +float BASSDEF(BASS_GetCPU)(); +BOOL BASSDEF(BASS_Start)(); +BOOL BASSDEF(BASS_Stop)(); +BOOL BASSDEF(BASS_Pause)(); +BOOL BASSDEF(BASS_IsStarted)(); +BOOL BASSDEF(BASS_SetVolume)(float volume); +float BASSDEF(BASS_GetVolume)(); + +HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags); +BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle); +const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HPLUGIN handle); + +BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf); +BOOL BASSDEF(BASS_Get3DFactors)(float *distf, float *rollf, float *doppf); +BOOL BASSDEF(BASS_Set3DPosition)(const BASS_3DVECTOR *pos, const BASS_3DVECTOR *vel, const BASS_3DVECTOR *front, const BASS_3DVECTOR *top); +BOOL BASSDEF(BASS_Get3DPosition)(BASS_3DVECTOR *pos, BASS_3DVECTOR *vel, BASS_3DVECTOR *front, BASS_3DVECTOR *top); +void BASSDEF(BASS_Apply3D)(); +#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP) +BOOL BASSDEF(BASS_SetEAXParameters)(int env, float vol, float decay, float damp); +BOOL BASSDEF(BASS_GetEAXParameters)(DWORD *env, float *vol, float *decay, float *damp); +#endif + +HMUSIC BASSDEF(BASS_MusicLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD flags, DWORD freq); +BOOL BASSDEF(BASS_MusicFree)(HMUSIC handle); + +HSAMPLE BASSDEF(BASS_SampleLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD max, DWORD flags); +HSAMPLE BASSDEF(BASS_SampleCreate)(DWORD length, DWORD freq, DWORD chans, DWORD max, DWORD flags); +BOOL BASSDEF(BASS_SampleFree)(HSAMPLE handle); +BOOL BASSDEF(BASS_SampleSetData)(HSAMPLE handle, const void *buffer); +BOOL BASSDEF(BASS_SampleGetData)(HSAMPLE handle, void *buffer); +BOOL BASSDEF(BASS_SampleGetInfo)(HSAMPLE handle, BASS_SAMPLE *info); +BOOL BASSDEF(BASS_SampleSetInfo)(HSAMPLE handle, const BASS_SAMPLE *info); +HCHANNEL BASSDEF(BASS_SampleGetChannel)(HSAMPLE handle, BOOL onlynew); +DWORD BASSDEF(BASS_SampleGetChannels)(HSAMPLE handle, HCHANNEL *channels); +BOOL BASSDEF(BASS_SampleStop)(HSAMPLE handle); + +HSTREAM BASSDEF(BASS_StreamCreate)(DWORD freq, DWORD chans, DWORD flags, STREAMPROC *proc, void *user); +HSTREAM BASSDEF(BASS_StreamCreateFile)(BOOL mem, const void *file, QWORD offset, QWORD length, DWORD flags); +HSTREAM BASSDEF(BASS_StreamCreateURL)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user); +HSTREAM BASSDEF(BASS_StreamCreateFileUser)(DWORD system, DWORD flags, const BASS_FILEPROCS *proc, void *user); +BOOL BASSDEF(BASS_StreamFree)(HSTREAM handle); +QWORD BASSDEF(BASS_StreamGetFilePosition)(HSTREAM handle, DWORD mode); +DWORD BASSDEF(BASS_StreamPutData)(HSTREAM handle, const void *buffer, DWORD length); +DWORD BASSDEF(BASS_StreamPutFileData)(HSTREAM handle, const void *buffer, DWORD length); + +BOOL BASSDEF(BASS_RecordGetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info); +BOOL BASSDEF(BASS_RecordInit)(int device); +BOOL BASSDEF(BASS_RecordSetDevice)(DWORD device); +DWORD BASSDEF(BASS_RecordGetDevice)(); +BOOL BASSDEF(BASS_RecordFree)(); +BOOL BASSDEF(BASS_RecordGetInfo)(BASS_RECORDINFO *info); +const char *BASSDEF(BASS_RecordGetInputName)(int input); +BOOL BASSDEF(BASS_RecordSetInput)(int input, DWORD flags, float volume); +DWORD BASSDEF(BASS_RecordGetInput)(int input, float *volume); +HRECORD BASSDEF(BASS_RecordStart)(DWORD freq, DWORD chans, DWORD flags, RECORDPROC *proc, void *user); + +double BASSDEF(BASS_ChannelBytes2Seconds)(DWORD handle, QWORD pos); +QWORD BASSDEF(BASS_ChannelSeconds2Bytes)(DWORD handle, double pos); +DWORD BASSDEF(BASS_ChannelGetDevice)(DWORD handle); +BOOL BASSDEF(BASS_ChannelSetDevice)(DWORD handle, DWORD device); +DWORD BASSDEF(BASS_ChannelIsActive)(DWORD handle); +BOOL BASSDEF(BASS_ChannelGetInfo)(DWORD handle, BASS_CHANNELINFO *info); +const char *BASSDEF(BASS_ChannelGetTags)(DWORD handle, DWORD tags); +DWORD BASSDEF(BASS_ChannelFlags)(DWORD handle, DWORD flags, DWORD mask); +BOOL BASSDEF(BASS_ChannelUpdate)(DWORD handle, DWORD length); +BOOL BASSDEF(BASS_ChannelLock)(DWORD handle, BOOL lock); +BOOL BASSDEF(BASS_ChannelPlay)(DWORD handle, BOOL restart); +BOOL BASSDEF(BASS_ChannelStop)(DWORD handle); +BOOL BASSDEF(BASS_ChannelPause)(DWORD handle); +BOOL BASSDEF(BASS_ChannelSetAttribute)(DWORD handle, DWORD attrib, float value); +BOOL BASSDEF(BASS_ChannelGetAttribute)(DWORD handle, DWORD attrib, float *value); +BOOL BASSDEF(BASS_ChannelSlideAttribute)(DWORD handle, DWORD attrib, float value, DWORD time); +BOOL BASSDEF(BASS_ChannelIsSliding)(DWORD handle, DWORD attrib); +BOOL BASSDEF(BASS_ChannelSetAttributeEx)(DWORD handle, DWORD attrib, void *value, DWORD size); +DWORD BASSDEF(BASS_ChannelGetAttributeEx)(DWORD handle, DWORD attrib, void *value, DWORD size); +BOOL BASSDEF(BASS_ChannelSet3DAttributes)(DWORD handle, int mode, float min, float max, int iangle, int oangle, float outvol); +BOOL BASSDEF(BASS_ChannelGet3DAttributes)(DWORD handle, DWORD *mode, float *min, float *max, DWORD *iangle, DWORD *oangle, float *outvol); +BOOL BASSDEF(BASS_ChannelSet3DPosition)(DWORD handle, const BASS_3DVECTOR *pos, const BASS_3DVECTOR *orient, const BASS_3DVECTOR *vel); +BOOL BASSDEF(BASS_ChannelGet3DPosition)(DWORD handle, BASS_3DVECTOR *pos, BASS_3DVECTOR *orient, BASS_3DVECTOR *vel); +QWORD BASSDEF(BASS_ChannelGetLength)(DWORD handle, DWORD mode); +BOOL BASSDEF(BASS_ChannelSetPosition)(DWORD handle, QWORD pos, DWORD mode); +QWORD BASSDEF(BASS_ChannelGetPosition)(DWORD handle, DWORD mode); +DWORD BASSDEF(BASS_ChannelGetLevel)(DWORD handle); +BOOL BASSDEF(BASS_ChannelGetLevelEx)(DWORD handle, float *levels, float length, DWORD flags); +DWORD BASSDEF(BASS_ChannelGetData)(DWORD handle, void *buffer, DWORD length); +HSYNC BASSDEF(BASS_ChannelSetSync)(DWORD handle, DWORD type, QWORD param, SYNCPROC *proc, void *user); +BOOL BASSDEF(BASS_ChannelRemoveSync)(DWORD handle, HSYNC sync); +HDSP BASSDEF(BASS_ChannelSetDSP)(DWORD handle, DSPPROC *proc, void *user, int priority); +BOOL BASSDEF(BASS_ChannelRemoveDSP)(DWORD handle, HDSP dsp); +BOOL BASSDEF(BASS_ChannelSetLink)(DWORD handle, DWORD chan); +BOOL BASSDEF(BASS_ChannelRemoveLink)(DWORD handle, DWORD chan); +HFX BASSDEF(BASS_ChannelSetFX)(DWORD handle, DWORD type, int priority); +BOOL BASSDEF(BASS_ChannelRemoveFX)(DWORD handle, HFX fx); + +BOOL BASSDEF(BASS_FXSetParameters)(HFX handle, const void *params); +BOOL BASSDEF(BASS_FXGetParameters)(HFX handle, void *params); +BOOL BASSDEF(BASS_FXReset)(HFX handle); +BOOL BASSDEF(BASS_FXSetPriority)(HFX handle, int priority); + +#ifdef __cplusplus +} + +#if defined(_WIN32) && !defined(NOBASSOVERLOADS) +static inline HPLUGIN BASS_PluginLoad(const WCHAR *file, DWORD flags) +{ + return BASS_PluginLoad((const char*)file, flags|BASS_UNICODE); +} + +static inline HMUSIC BASS_MusicLoad(BOOL mem, const WCHAR *file, QWORD offset, DWORD length, DWORD flags, DWORD freq) +{ + return BASS_MusicLoad(mem, (const void*)file, offset, length, flags|BASS_UNICODE, freq); +} + +static inline HSAMPLE BASS_SampleLoad(BOOL mem, const WCHAR *file, QWORD offset, DWORD length, DWORD max, DWORD flags) +{ + return BASS_SampleLoad(mem, (const void*)file, offset, length, max, flags|BASS_UNICODE); +} + +static inline HSTREAM BASS_StreamCreateFile(BOOL mem, const WCHAR *file, QWORD offset, QWORD length, DWORD flags) +{ + return BASS_StreamCreateFile(mem, (const void*)file, offset, length, flags|BASS_UNICODE); +} + +static inline HSTREAM BASS_StreamCreateURL(const WCHAR *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user) +{ + return BASS_StreamCreateURL((const char*)url, offset, flags|BASS_UNICODE, proc, user); +} + +static inline BOOL BASS_SetConfigPtr(DWORD option, const WCHAR *value) +{ + return BASS_SetConfigPtr(option|BASS_UNICODE, (const void*)value); +} +#endif +#endif + +#endif diff --git a/modem/fec_fast.c b/modem/fec_fast.c deleted file mode 100644 index d1fb57b..0000000 --- a/modem/fec_fast.c +++ /dev/null @@ -1,67 +0,0 @@ -/* -* High Speed modem to transfer data in a 2,7kHz SSB channel -* ========================================================= -* Author: DJ0ABR -* -* (c) DJ0ABR -* www.dj0abr.de -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -*/ - -#include "qo100modem.h" -#include "liquid.h" - -fec fecobjTX; -fec fecobjRX; -fec_scheme fs = LIQUID_FEC_SECDED3932; // error-correcting scheme -uint8_t encoded_message[UdpBlocklen]; -uint8_t decoded_message[PayloadLen+framenumlen+CRClen]; - -uint8_t *cfec_Reconstruct(uint8_t *darr) -{ - memset(decoded_message,0,(PayloadLen+framenumlen+CRClen)); - fec_decode(fecobjRX, (PayloadLen+framenumlen+CRClen), darr, decoded_message); - - return decoded_message; -} - -uint8_t *GetFEC(uint8_t *txblock, int len) -{ - if(len != (PayloadLen+framenumlen+CRClen)) - { - printf("wrong FEC encode length, len:%d Payloadlen:%d\n",len,PayloadLen); - exit(0); - } - - fec_encode(fecobjTX, len, txblock, encoded_message); - - return encoded_message; -} - -void initFEC() -{ - int n_enc = fec_get_enc_msg_length(fs,(PayloadLen+framenumlen+CRClen)); - if(n_enc != UdpBlocklen) - { - printf("wrong FEC init length\n"); - exit(0); - } - - fecobjTX = fec_create(fs,NULL); - fecobjRX = fec_create(fs,NULL); -} - diff --git a/modem/frame_packer.c b/modem/frame_packer.c index 542fa89..3562c13 100644 --- a/modem/frame_packer.c +++ b/modem/frame_packer.c @@ -138,7 +138,7 @@ uint8_t *Pack(uint8_t *payload, int type, int status, int *plen) } }*/ -#define MAXHEADERRS 0 +#define MAXHEADERRS 3 /* * Header erros will not cause any data errors because the CRC will filter out @@ -298,7 +298,7 @@ uint8_t *getPayload(uint8_t *rxb) int framenumrx = (frame.status & 0xc0)>>6; // frame counter MSB framenumrx <<= 8; framenumrx += frame.counter_LSB; // frame counter LSB - //printf("Frame no.: %d\n",framenumrx); + if (lastframenum != framenumrx) rx_status |= 4; lastframenum = framenumrx; if (++lastframenum >= 1024) lastframenum = 0; // 1024 = 2^10 (10 bit frame number) @@ -317,6 +317,8 @@ uint8_t *getPayload(uint8_t *rxb) payload[8] = 0; payload[9] = 0; + //printf("Frame no.: %d, type:%d, minfo:%d\n",framenumrx,payload[0],payload[3]); + memcpy(payload+10,frame.payload,PAYLOADLEN); return payload; diff --git a/modem/liquid-dsp-install b/modem/liquid-dsp-install new file mode 100755 index 0000000..765daa1 --- /dev/null +++ b/modem/liquid-dsp-install @@ -0,0 +1,9 @@ +sudo apt install git autoconf libsndfile-dev libasound-dev +git clone git://github.com/jgaeddert/liquid-dsp.git +cd liquid-dsp +./bootstrap.sh +./configure +make -j 8 +sudo make install +sudo ldconfig + diff --git a/modem/liquid_if.c b/modem/liquid_if.c new file mode 100644 index 0000000..82571be --- /dev/null +++ b/modem/liquid_if.c @@ -0,0 +1,171 @@ +/* +* High Speed modem to transfer data in a 2,7kHz SSB channel +* ========================================================= +* Author: DJ0ABR +* +* (c) DJ0ABR +* www.dj0abr.de +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* +* liquid_dsp_interface.c ... functions using liquid-dsp +* +* liquid-dsp must be previously installed by running ./liquid-dsp-install (under linux) +* +*/ + +#include "qo100modem.h" + +void modulator(uint8_t sym_in); +void close_dsp(); + +// modem objects +modulation_scheme ms = LIQUID_MODEM_QPSK; +modem mod = NULL; + +// NCOs for mixing baseband <-> 1500 Hz +#define FREQUENCY 1500 +int type = LIQUID_NCO; // nco type +nco_crcf upnco = NULL; + +// TX-Interpolator Filter Parameters +// 44100 input rate for 2205 Sym/s = 20 +// change for other rates +firinterp_crcf TX_interpolator = NULL; +unsigned int k_SampPerSymb = 20; // 44100 / (4410/2) +unsigned int m_filterDelay_Symbols = 15; // not too short for good filter +float beta_excessBW = 0.3f; // filter excess bandwidth factor +float tau_FracSymbOffset = -0.2f; // fractional symbol offset + +int init_dsp() +{ + close_dsp(); + printf("create DSP\n"); + + k_SampPerSymb = txinterpolfactor; + if(bitsPerSymbol == 2) + ms = LIQUID_MODEM_QPSK; + else + ms = LIQUID_MODEM_DPSK8; + + // create modulator + mod = modem_create(ms); + + // create NCO for upmixing to 1500 Hz + double RADIANS_PER_SAMPLE = ((2.0*M_PI*(double)FREQUENCY)/(float)caprate); + + upnco = nco_crcf_create(LIQUID_NCO); + nco_crcf_set_phase(upnco, 0.0f); + nco_crcf_set_frequency(upnco, RADIANS_PER_SAMPLE); + + // TX: Interpolator Filter + // compute delay + while (tau_FracSymbOffset < 0) tau_FracSymbOffset += 1.0f; // ensure positive tau + float g = k_SampPerSymb*tau_FracSymbOffset; // number of samples offset + int ds=floorf(g); // additional symbol delay + float dt = (g - (float)ds); // fractional sample offset + // force dt to be in [0.5,0.5] + if (dt > 0.5f) + { + dt -= 1.0f; + ds++; + } + + // calculate filter coeffs + unsigned int h_len_NumFilterCoeefs = 2 * k_SampPerSymb * m_filterDelay_Symbols + 1; + float h[h_len_NumFilterCoeefs]; + liquid_firdes_prototype( LIQUID_FIRFILT_RRC, + k_SampPerSymb, + m_filterDelay_Symbols, + beta_excessBW, + dt, + h); + // create the filter + TX_interpolator = firinterp_crcf_create(k_SampPerSymb,h,h_len_NumFilterCoeefs); + + printf("DSP created\n"); + return 1; +} + +void close_dsp() +{ + if(mod != NULL) modem_destroy(mod); + if(upnco != NULL) nco_crcf_destroy(upnco); + if(TX_interpolator != NULL) firinterp_crcf_destroy(TX_interpolator); + mod = NULL; + upnco = NULL; + TX_interpolator = NULL; +} + +// d ... symbols to send +// len ... number of symbols in d +void sendToModulator(uint8_t *d, int len) +{ + + //printf("sendToModulator %d bytes\n",len); + + int symanz = len * 8 / bitsPerSymbol; + uint8_t syms[symanz]; + if(bitsPerSymbol == 2) + convertBytesToSyms_QPSK(d, syms, len); + else + convertBytesToSyms_8PSK(d, syms, len); + + for(int i=0; i>1); + + modulator(syms[i]); + } +} + +// call for every symbol +// modulates, filters and upmixes symbols and send it to soundcard +void modulator(uint8_t sym_in) +{ + liquid_float_complex sample; + modem_modulate(mod, sym_in, &sample); + + //printf("TX ================= sample: %f + i%f\n", sample.real, sample.imag); + + // interpolate by k_SampPerSymb + liquid_float_complex y[k_SampPerSymb]; + firinterp_crcf_execute(TX_interpolator, sample, y); + + for(unsigned int i=0; i= 0 && speedmode <=5) @@ -183,30 +185,24 @@ char srx[512]; constellationSize = (1<= 0 && speedmode <=5) - { - sprintf(stx,"python3 qpsk_tx.py -r %d -s %d &",sr[speedmode].tx,sr[speedmode].audio); sprintf(srx,"python3 qpsk_rx.py -r %d -s %d &",sr[speedmode].rx,sr[speedmode].audio); - } else if(speedmode >= 6 && speedmode <=7) - { - sprintf(stx,"python3 tx_8psk.py -r %d -s %d &",sr[speedmode].tx,sr[speedmode].audio); sprintf(srx,"python3 rx_8psk.py -r %d -s %d &",sr[speedmode].rx,sr[speedmode].audio); - } else { printf("wrong modem number\n"); exit(0); } - - // the TX modem needs the local IP address as a parameter -i ip - if(run_console_program(stx) == -1) - { - printf("cannot start TX modem\n"); - exit(0); - } + + // int TX audio and modulator + init_dsp(); + init_audio(); // the RX modem needs the app's IP address as a parameter -i ip if(run_console_program(srx) == -1) @@ -354,13 +350,22 @@ void appdata_rxdata(uint8_t *pdata, int len, struct sockaddr_in* rxsock) int r = system("sudo shutdown now"); exit(r); } - + if(getSending() == 1) return; // already sending (Array sending) if(minfo == 0) { - toGR_Preamble(); // first transmission of a data block, send preamble - toGR_sendData(pdata+2, type, minfo); + // this is the first frame of a larger file + // send it multiple times, like a preamble, to give the + // receiver some time for synchronisation + // duration: 3 seconds + // caprate: samples/s. This are symbols: caprate/txinterpolfactor + // and bits: symbols * bitsPerSymbol + // and bytes/second: bits/8 = (caprate/txinterpolfactor) * bitsPerSymbol / 8 + // one frame has 258 bytes, so we need for 5s: 5* ((caprate/txinterpolfactor) * bitsPerSymbol / 8) /258 + 1 frames + int numframespreamble = 3* ((caprate/txinterpolfactor) * bitsPerSymbol / 8) /258 + 1; + for(int i=0; i #define jpg_tempfilename "rxdata.jpg" @@ -45,7 +47,6 @@ int cfec_Reconstruct(uint8_t *darr, uint8_t *destination); uint8_t *Pack(uint8_t *payload, int type, int status, int *plen); void GetFEC(uint8_t *txblock, int len, uint8_t *destArray); void initFEC(); -void toGR_Preamble(); void toGR_sendData(uint8_t *data, int type, int status); uint16_t *make_waterfall(uint8_t *pdata, int len, int *retlen); void init_fft(); @@ -62,12 +63,17 @@ void convertBytesToSyms_8PSK(uint8_t *bytes, uint8_t *syms, int bytenum); void rotate8PSKsyms(uint8_t *src, uint8_t *dst, int len); uint8_t * rotateBack8PSK(uint8_t *buf, int len, int rotations); void setSending(uint8_t onoff); -void toGR_Preamble(); int getSending(); void doArraySend(); int arraySend(uint8_t *data, int length, uint8_t type, char *filename); void shiftleft(uint8_t *data, int shiftnum, int len); void showbytestring16(char *title, uint16_t *data, int anz); +int isTXRunning(char *prgname); +int pb_fifo_freespace(int nolock); +int init_audio(); +void sendToModulator(uint8_t *d, int len); +void pb_write_fifo(float sample); +int init_dsp(); extern int keeprunning; @@ -76,7 +82,8 @@ extern int speed; extern int speedmode; extern int bitsPerSymbol; extern int constellationSize; - +extern int caprate; +extern int txinterpolfactor; /* * Constellation as produced by the GR Constellation Decoder: diff --git a/modem/qpsk_rx.py b/modem/qpsk_rx.py index 8dab9df..d53783e 100755 --- a/modem/qpsk_rx.py +++ b/modem/qpsk_rx.py @@ -42,8 +42,8 @@ class qpsk_rx(gr.top_block): self.qpsk__constellation = qpsk__constellation = digital.constellation_rect([0.707+0.707j, -0.707+0.707j, -0.707-0.707j, 0.707-0.707j], [0, 1, 2, 3], 4, 2, 2, 1, 1).base() self.qpsk__constellation.gen_soft_dec_lut(8) - self.outputsps = outputsps = 7 - self.nfilts = nfilts = 32 + self.outputsps = outputsps = 8 + self.nfilts = nfilts = 15 self.mixf = mixf = 1500 ################################################## diff --git a/modem/qpsk_tx.py b/modem/qpsk_tx.py deleted file mode 100755 index 2530051..0000000 --- a/modem/qpsk_tx.py +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# -# SPDX-License-Identifier: GPL-3.0 -# -# GNU Radio Python Flow Graph -# Title: QPSK TX-Modem -# Author: DJ0ABR -# Copyright: DJ0ABR -# Description: requires GNU Radio 3.8xxx -# GNU Radio version: 3.8.2.0 - -from gnuradio import analog -from gnuradio import audio -from gnuradio import blocks -from gnuradio import digital -from gnuradio import gr -from gnuradio.filter import firdes -import sys -import signal -from argparse import ArgumentParser -from gnuradio.eng_arg import eng_float, intx -from gnuradio import eng_notation - - -class qpsk_tx(gr.top_block): - - def __init__(self, resamprate=20, samp_rate=44100): - gr.top_block.__init__(self, "QPSK TX-Modem ") - - ################################################## - # Parameters - ################################################## - self.resamprate = resamprate - self.samp_rate = samp_rate - - ################################################## - # Variables - ################################################## - self.qpsk__constellation = qpsk__constellation = digital.constellation_rect([1+1j, -1+1j, -1-1j, 1-1j], [0, 1, 2, 3], - 4, 2, 2, 1, 1).base() - self.mixf = mixf = 1500 - - ################################################## - # Blocks - ################################################## - self.digital_constellation_modulator_0 = digital.generic_mod( - constellation=qpsk__constellation, - differential=False, - samples_per_symbol=resamprate, - pre_diff_code=True, - excess_bw=0.35, - verbose=False, - log=False) - self.blocks_udp_source_0 = blocks.udp_source(gr.sizeof_char*1, '127.0.0.1', 40134, 258, False) - self.blocks_multiply_xx_0_0 = blocks.multiply_vcc(1) - self.blocks_multiply_const_vxx_0 = blocks.multiply_const_ff(0.05) - self.blocks_complex_to_float_1 = blocks.complex_to_float(1) - self.blocks_add_xx_0 = blocks.add_vff(1) - self.audio_sink_0_0 = audio.sink(samp_rate, '', True) - self.analog_sig_source_x_0_0_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, mixf, 1, 0, 0) - - - - ################################################## - # Connections - ################################################## - self.connect((self.analog_sig_source_x_0_0_0, 0), (self.blocks_multiply_xx_0_0, 1)) - self.connect((self.blocks_add_xx_0, 0), (self.blocks_multiply_const_vxx_0, 0)) - self.connect((self.blocks_complex_to_float_1, 0), (self.blocks_add_xx_0, 0)) - self.connect((self.blocks_complex_to_float_1, 1), (self.blocks_add_xx_0, 1)) - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.audio_sink_0_0, 0)) - self.connect((self.blocks_multiply_xx_0_0, 0), (self.blocks_complex_to_float_1, 0)) - self.connect((self.blocks_udp_source_0, 0), (self.digital_constellation_modulator_0, 0)) - self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_multiply_xx_0_0, 0)) - - - def get_resamprate(self): - return self.resamprate - - def set_resamprate(self, resamprate): - self.resamprate = resamprate - - def get_samp_rate(self): - return self.samp_rate - - def set_samp_rate(self, samp_rate): - self.samp_rate = samp_rate - self.analog_sig_source_x_0_0_0.set_sampling_freq(self.samp_rate) - - def get_qpsk__constellation(self): - return self.qpsk__constellation - - def set_qpsk__constellation(self, qpsk__constellation): - self.qpsk__constellation = qpsk__constellation - - def get_mixf(self): - return self.mixf - - def set_mixf(self, mixf): - self.mixf = mixf - self.analog_sig_source_x_0_0_0.set_frequency(self.mixf) - - - - -def argument_parser(): - description = 'requires GNU Radio 3.8xxx' - parser = ArgumentParser(description=description) - parser.add_argument( - "-r", "--resamprate", dest="resamprate", type=intx, default=20, - help="Set resamprate [default=%(default)r]") - parser.add_argument( - "-s", "--samp-rate", dest="samp_rate", type=intx, default=44100, - help="Set samp_rate [default=%(default)r]") - return parser - - -def main(top_block_cls=qpsk_tx, options=None): - if options is None: - options = argument_parser().parse_args() - tb = top_block_cls(resamprate=options.resamprate, samp_rate=options.samp_rate) - - def sig_handler(sig=None, frame=None): - tb.stop() - tb.wait() - - sys.exit(0) - - signal.signal(signal.SIGINT, sig_handler) - signal.signal(signal.SIGTERM, sig_handler) - - tb.start() - - tb.wait() - - -if __name__ == '__main__': - main() diff --git a/modem/tx_8psk.py b/modem/tx_8psk.py deleted file mode 100755 index f2b4eef..0000000 --- a/modem/tx_8psk.py +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# -# SPDX-License-Identifier: GPL-3.0 -# -# GNU Radio Python Flow Graph -# Title: 8PSK Modem DJ0ABR -# Author: kurt -# Description: requires GNU Radio 3.8xxx -# GNU Radio version: 3.8.2.0 - -from gnuradio import analog -from gnuradio import audio -from gnuradio import blocks -from gnuradio import digital -from gnuradio import gr -from gnuradio.filter import firdes -import sys -import signal -from argparse import ArgumentParser -from gnuradio.eng_arg import eng_float, intx -from gnuradio import eng_notation - - -class tx_8psk(gr.top_block): - - def __init__(self, resamprate=24, samp_rate=48000): - gr.top_block.__init__(self, "8PSK Modem DJ0ABR") - - ################################################## - # Parameters - ################################################## - self.resamprate = resamprate - self.samp_rate = samp_rate - - ################################################## - # Variables - ################################################## - self.sps = sps = 1 - self.nfilts = nfilts = 32 - self.mixf = mixf = 1500 - - ################################################## - # Blocks - ################################################## - self.digital_constellation_modulator_0 = digital.generic_mod( - constellation=digital.constellation_8psk_natural().base(), - differential=True, - samples_per_symbol=resamprate, - pre_diff_code=True, - excess_bw=0.25, - verbose=False, - log=False) - self.blocks_udp_source_0 = blocks.udp_source(gr.sizeof_char*1, '127.0.0.1', 40134, 258, False) - self.blocks_multiply_xx_0_0 = blocks.multiply_vcc(1) - self.blocks_multiply_const_vxx_0 = blocks.multiply_const_ff(0.05) - self.blocks_complex_to_float_1 = blocks.complex_to_float(1) - self.blocks_add_xx_0 = blocks.add_vff(1) - self.audio_sink_0_0 = audio.sink(samp_rate, '', True) - self.analog_sig_source_x_0_0_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, mixf, 1, 0, 0) - - - - ################################################## - # Connections - ################################################## - self.connect((self.analog_sig_source_x_0_0_0, 0), (self.blocks_multiply_xx_0_0, 1)) - self.connect((self.blocks_add_xx_0, 0), (self.blocks_multiply_const_vxx_0, 0)) - self.connect((self.blocks_complex_to_float_1, 0), (self.blocks_add_xx_0, 0)) - self.connect((self.blocks_complex_to_float_1, 1), (self.blocks_add_xx_0, 1)) - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.audio_sink_0_0, 0)) - self.connect((self.blocks_multiply_xx_0_0, 0), (self.blocks_complex_to_float_1, 0)) - self.connect((self.blocks_udp_source_0, 0), (self.digital_constellation_modulator_0, 0)) - self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_multiply_xx_0_0, 0)) - - - def get_resamprate(self): - return self.resamprate - - def set_resamprate(self, resamprate): - self.resamprate = resamprate - - def get_samp_rate(self): - return self.samp_rate - - def set_samp_rate(self, samp_rate): - self.samp_rate = samp_rate - self.analog_sig_source_x_0_0_0.set_sampling_freq(self.samp_rate) - - def get_sps(self): - return self.sps - - def set_sps(self, sps): - self.sps = sps - - def get_nfilts(self): - return self.nfilts - - def set_nfilts(self, nfilts): - self.nfilts = nfilts - - def get_mixf(self): - return self.mixf - - def set_mixf(self, mixf): - self.mixf = mixf - self.analog_sig_source_x_0_0_0.set_frequency(self.mixf) - - - - -def argument_parser(): - description = 'requires GNU Radio 3.8xxx' - parser = ArgumentParser(description=description) - parser.add_argument( - "-r", "--resamprate", dest="resamprate", type=intx, default=24, - help="Set resamprate [default=%(default)r]") - parser.add_argument( - "-s", "--samp-rate", dest="samp_rate", type=intx, default=48000, - help="Set samp_rate [default=%(default)r]") - return parser - - -def main(top_block_cls=tx_8psk, options=None): - if options is None: - options = argument_parser().parse_args() - tb = top_block_cls(resamprate=options.resamprate, samp_rate=options.samp_rate) - - def sig_handler(sig=None, frame=None): - tb.stop() - tb.wait() - - sys.exit(0) - - signal.signal(signal.SIGINT, sig_handler) - signal.signal(signal.SIGTERM, sig_handler) - - tb.start() - - tb.wait() - - -if __name__ == '__main__': - main() diff --git a/oscardata/oscardata/bin/Debug/image.bin b/oscardata/oscardata/bin/Debug/image.bin deleted file mode 100755 index fa451b8..0000000 Binary files a/oscardata/oscardata/bin/Debug/image.bin and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/oscardata.exe b/oscardata/oscardata/bin/Debug/oscardata.exe deleted file mode 100755 index acfdc8a..0000000 Binary files a/oscardata/oscardata/bin/Debug/oscardata.exe and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/oscardata.exe.config b/oscardata/oscardata/bin/Debug/oscardata.exe.config deleted file mode 100755 index e743be0..0000000 --- a/oscardata/oscardata/bin/Debug/oscardata.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/oscardata/oscardata/bin/Debug/oscardata.pdb b/oscardata/oscardata/bin/Debug/oscardata.pdb deleted file mode 100755 index f151d47..0000000 Binary files a/oscardata/oscardata/bin/Debug/oscardata.pdb and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/rxdata.jpg b/oscardata/oscardata/bin/Debug/rxdata.jpg deleted file mode 100755 index 3a7ca6e..0000000 Binary files a/oscardata/oscardata/bin/Debug/rxdata.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/rxtemp.zip b/oscardata/oscardata/bin/Debug/rxtemp.zip deleted file mode 100755 index a2da016..0000000 Binary files a/oscardata/oscardata/bin/Debug/rxtemp.zip and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp.jpg b/oscardata/oscardata/bin/Debug/temp.jpg deleted file mode 100755 index d9f11c9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp.zip b/oscardata/oscardata/bin/Debug/temp.zip deleted file mode 100755 index 23c93ae..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp.zip and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp10.jpg b/oscardata/oscardata/bin/Debug/temp10.jpg deleted file mode 100755 index a073b07..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp10.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp11.jpg b/oscardata/oscardata/bin/Debug/temp11.jpg deleted file mode 100755 index e6cab15..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp11.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp12.jpg b/oscardata/oscardata/bin/Debug/temp12.jpg deleted file mode 100755 index a05f6cb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp12.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp127.jpg b/oscardata/oscardata/bin/Debug/temp127.jpg deleted file mode 100755 index 5e7fc85..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp127.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp128.jpg b/oscardata/oscardata/bin/Debug/temp128.jpg deleted file mode 100755 index d1b37dc..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp128.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp129.jpg b/oscardata/oscardata/bin/Debug/temp129.jpg deleted file mode 100755 index cc5e4e1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp129.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp13.jpg b/oscardata/oscardata/bin/Debug/temp13.jpg deleted file mode 100755 index 5cf09f3..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp13.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp130.jpg b/oscardata/oscardata/bin/Debug/temp130.jpg deleted file mode 100755 index b788052..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp130.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp131.jpg b/oscardata/oscardata/bin/Debug/temp131.jpg deleted file mode 100755 index aebdf73..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp131.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp132.jpg b/oscardata/oscardata/bin/Debug/temp132.jpg deleted file mode 100755 index e0545f0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp132.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp133.jpg b/oscardata/oscardata/bin/Debug/temp133.jpg deleted file mode 100755 index 2e73c10..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp133.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp134.jpg b/oscardata/oscardata/bin/Debug/temp134.jpg deleted file mode 100755 index b182a77..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp134.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp135.jpg b/oscardata/oscardata/bin/Debug/temp135.jpg deleted file mode 100755 index 00f0241..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp135.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp136.jpg b/oscardata/oscardata/bin/Debug/temp136.jpg deleted file mode 100755 index 2861d4b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp136.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp137.jpg b/oscardata/oscardata/bin/Debug/temp137.jpg deleted file mode 100755 index da02da4..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp137.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp138.jpg b/oscardata/oscardata/bin/Debug/temp138.jpg deleted file mode 100755 index f9bbf84..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp138.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp139.jpg b/oscardata/oscardata/bin/Debug/temp139.jpg deleted file mode 100755 index d646935..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp139.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp14.jpg b/oscardata/oscardata/bin/Debug/temp14.jpg deleted file mode 100755 index 6521598..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp14.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp140.jpg b/oscardata/oscardata/bin/Debug/temp140.jpg deleted file mode 100755 index 87515ce..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp140.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp141.jpg b/oscardata/oscardata/bin/Debug/temp141.jpg deleted file mode 100755 index e1ac8f9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp141.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp142.jpg b/oscardata/oscardata/bin/Debug/temp142.jpg deleted file mode 100755 index 90b4b8d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp142.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp143.jpg b/oscardata/oscardata/bin/Debug/temp143.jpg deleted file mode 100755 index fe15329..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp143.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp144.jpg b/oscardata/oscardata/bin/Debug/temp144.jpg deleted file mode 100755 index 7b6c300..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp144.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp145.jpg b/oscardata/oscardata/bin/Debug/temp145.jpg deleted file mode 100755 index 438d586..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp145.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp146.jpg b/oscardata/oscardata/bin/Debug/temp146.jpg deleted file mode 100755 index bc2f8a7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp146.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp147.jpg b/oscardata/oscardata/bin/Debug/temp147.jpg deleted file mode 100755 index 0d9ab91..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp147.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp148.jpg b/oscardata/oscardata/bin/Debug/temp148.jpg deleted file mode 100755 index 6933c7f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp148.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp149.jpg b/oscardata/oscardata/bin/Debug/temp149.jpg deleted file mode 100755 index 1327748..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp149.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp15.jpg b/oscardata/oscardata/bin/Debug/temp15.jpg deleted file mode 100755 index 38043c5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp15.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp150.jpg b/oscardata/oscardata/bin/Debug/temp150.jpg deleted file mode 100755 index 2ebedbd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp150.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp151.jpg b/oscardata/oscardata/bin/Debug/temp151.jpg deleted file mode 100755 index f2448ff..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp151.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp152.jpg b/oscardata/oscardata/bin/Debug/temp152.jpg deleted file mode 100755 index a5ede9e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp152.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp153.jpg b/oscardata/oscardata/bin/Debug/temp153.jpg deleted file mode 100755 index eb750f8..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp153.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp154.jpg b/oscardata/oscardata/bin/Debug/temp154.jpg deleted file mode 100755 index cb11fc6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp154.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp155.jpg b/oscardata/oscardata/bin/Debug/temp155.jpg deleted file mode 100755 index b3c7d27..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp155.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp156.jpg b/oscardata/oscardata/bin/Debug/temp156.jpg deleted file mode 100755 index 2ee7da1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp156.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp157.jpg b/oscardata/oscardata/bin/Debug/temp157.jpg deleted file mode 100755 index 253129d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp157.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp158.jpg b/oscardata/oscardata/bin/Debug/temp158.jpg deleted file mode 100755 index 4d61fc9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp158.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp159.jpg b/oscardata/oscardata/bin/Debug/temp159.jpg deleted file mode 100755 index ee0e411..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp159.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp16.jpg b/oscardata/oscardata/bin/Debug/temp16.jpg deleted file mode 100755 index 5ecea04..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp16.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp160.jpg b/oscardata/oscardata/bin/Debug/temp160.jpg deleted file mode 100755 index f5a3d65..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp160.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp161.jpg b/oscardata/oscardata/bin/Debug/temp161.jpg deleted file mode 100755 index 7c6f6f1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp161.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp162.jpg b/oscardata/oscardata/bin/Debug/temp162.jpg deleted file mode 100755 index b2b8889..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp162.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp163.jpg b/oscardata/oscardata/bin/Debug/temp163.jpg deleted file mode 100755 index c620ed5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp163.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp164.jpg b/oscardata/oscardata/bin/Debug/temp164.jpg deleted file mode 100755 index 74751bf..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp164.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp165.jpg b/oscardata/oscardata/bin/Debug/temp165.jpg deleted file mode 100755 index 1c1e711..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp165.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp166.jpg b/oscardata/oscardata/bin/Debug/temp166.jpg deleted file mode 100755 index 5cd66ce..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp166.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp167.jpg b/oscardata/oscardata/bin/Debug/temp167.jpg deleted file mode 100755 index 33a9ad2..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp167.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp168.jpg b/oscardata/oscardata/bin/Debug/temp168.jpg deleted file mode 100755 index f4a9a29..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp168.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp169.jpg b/oscardata/oscardata/bin/Debug/temp169.jpg deleted file mode 100755 index 00a0f6a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp169.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp17.jpg b/oscardata/oscardata/bin/Debug/temp17.jpg deleted file mode 100755 index 64adb91..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp17.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp170.jpg b/oscardata/oscardata/bin/Debug/temp170.jpg deleted file mode 100755 index cd8e5c9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp170.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp171.jpg b/oscardata/oscardata/bin/Debug/temp171.jpg deleted file mode 100755 index d02bbfb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp171.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp172.jpg b/oscardata/oscardata/bin/Debug/temp172.jpg deleted file mode 100755 index e0aae34..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp172.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp173.jpg b/oscardata/oscardata/bin/Debug/temp173.jpg deleted file mode 100755 index 9ee3a08..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp173.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp174.jpg b/oscardata/oscardata/bin/Debug/temp174.jpg deleted file mode 100755 index c1b9691..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp174.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp175.jpg b/oscardata/oscardata/bin/Debug/temp175.jpg deleted file mode 100755 index 46fac98..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp175.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp176.jpg b/oscardata/oscardata/bin/Debug/temp176.jpg deleted file mode 100755 index fbf66e7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp176.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp177.jpg b/oscardata/oscardata/bin/Debug/temp177.jpg deleted file mode 100755 index 179e4c9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp177.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp178.jpg b/oscardata/oscardata/bin/Debug/temp178.jpg deleted file mode 100755 index b3e031a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp178.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp179.jpg b/oscardata/oscardata/bin/Debug/temp179.jpg deleted file mode 100755 index cfb12bf..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp179.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp18.jpg b/oscardata/oscardata/bin/Debug/temp18.jpg deleted file mode 100755 index 6581f24..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp18.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp180.jpg b/oscardata/oscardata/bin/Debug/temp180.jpg deleted file mode 100755 index aab35fa..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp180.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp181.jpg b/oscardata/oscardata/bin/Debug/temp181.jpg deleted file mode 100755 index e196b60..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp181.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp182.jpg b/oscardata/oscardata/bin/Debug/temp182.jpg deleted file mode 100755 index 1f8c412..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp182.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp183.jpg b/oscardata/oscardata/bin/Debug/temp183.jpg deleted file mode 100755 index fddc826..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp183.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp184.jpg b/oscardata/oscardata/bin/Debug/temp184.jpg deleted file mode 100755 index 97a3dcd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp184.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp185.jpg b/oscardata/oscardata/bin/Debug/temp185.jpg deleted file mode 100755 index b07af37..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp185.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp186.jpg b/oscardata/oscardata/bin/Debug/temp186.jpg deleted file mode 100755 index a36028f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp186.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp187.jpg b/oscardata/oscardata/bin/Debug/temp187.jpg deleted file mode 100755 index cd13c2d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp187.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp188.jpg b/oscardata/oscardata/bin/Debug/temp188.jpg deleted file mode 100755 index 7f8c6dd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp188.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp189.jpg b/oscardata/oscardata/bin/Debug/temp189.jpg deleted file mode 100755 index 5b37c5e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp189.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp19.jpg b/oscardata/oscardata/bin/Debug/temp19.jpg deleted file mode 100755 index 065fa08..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp19.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp190.jpg b/oscardata/oscardata/bin/Debug/temp190.jpg deleted file mode 100755 index 25fcecc..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp190.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp191.jpg b/oscardata/oscardata/bin/Debug/temp191.jpg deleted file mode 100755 index 51589ac..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp191.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp192.jpg b/oscardata/oscardata/bin/Debug/temp192.jpg deleted file mode 100755 index a9766c1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp192.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp193.jpg b/oscardata/oscardata/bin/Debug/temp193.jpg deleted file mode 100755 index 82e40cb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp193.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp194.jpg b/oscardata/oscardata/bin/Debug/temp194.jpg deleted file mode 100755 index 1561de0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp194.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp195.jpg b/oscardata/oscardata/bin/Debug/temp195.jpg deleted file mode 100755 index 51168c7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp195.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp196.jpg b/oscardata/oscardata/bin/Debug/temp196.jpg deleted file mode 100755 index 69e691a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp196.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp197.jpg b/oscardata/oscardata/bin/Debug/temp197.jpg deleted file mode 100755 index f57f6e1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp197.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp198.jpg b/oscardata/oscardata/bin/Debug/temp198.jpg deleted file mode 100755 index 9879386..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp198.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp199.jpg b/oscardata/oscardata/bin/Debug/temp199.jpg deleted file mode 100755 index caad10e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp199.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp20.jpg b/oscardata/oscardata/bin/Debug/temp20.jpg deleted file mode 100755 index d832ee7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp20.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp200.jpg b/oscardata/oscardata/bin/Debug/temp200.jpg deleted file mode 100755 index d9e12af..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp200.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp201.jpg b/oscardata/oscardata/bin/Debug/temp201.jpg deleted file mode 100755 index dba5f08..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp201.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp202.jpg b/oscardata/oscardata/bin/Debug/temp202.jpg deleted file mode 100755 index eb916a9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp202.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp203.jpg b/oscardata/oscardata/bin/Debug/temp203.jpg deleted file mode 100755 index 5d1a1ed..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp203.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp204.jpg b/oscardata/oscardata/bin/Debug/temp204.jpg deleted file mode 100755 index afc4e1c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp204.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp205.jpg b/oscardata/oscardata/bin/Debug/temp205.jpg deleted file mode 100755 index b1d4e9a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp205.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp206.jpg b/oscardata/oscardata/bin/Debug/temp206.jpg deleted file mode 100755 index 17ba48b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp206.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp207.jpg b/oscardata/oscardata/bin/Debug/temp207.jpg deleted file mode 100755 index ce9c94f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp207.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp208.jpg b/oscardata/oscardata/bin/Debug/temp208.jpg deleted file mode 100755 index 4f38eef..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp208.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp209.jpg b/oscardata/oscardata/bin/Debug/temp209.jpg deleted file mode 100755 index 9d86bf5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp209.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp210.jpg b/oscardata/oscardata/bin/Debug/temp210.jpg deleted file mode 100755 index e79bc3b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp210.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp211.jpg b/oscardata/oscardata/bin/Debug/temp211.jpg deleted file mode 100755 index ba91e72..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp211.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp212.jpg b/oscardata/oscardata/bin/Debug/temp212.jpg deleted file mode 100755 index 5073053..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp212.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp213.jpg b/oscardata/oscardata/bin/Debug/temp213.jpg deleted file mode 100755 index 5f4c300..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp213.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp214.jpg b/oscardata/oscardata/bin/Debug/temp214.jpg deleted file mode 100755 index eee4106..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp214.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp215.jpg b/oscardata/oscardata/bin/Debug/temp215.jpg deleted file mode 100755 index 880a3e9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp215.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp216.jpg b/oscardata/oscardata/bin/Debug/temp216.jpg deleted file mode 100755 index 041f883..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp216.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp217.jpg b/oscardata/oscardata/bin/Debug/temp217.jpg deleted file mode 100755 index d8e3a4d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp217.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp218.jpg b/oscardata/oscardata/bin/Debug/temp218.jpg deleted file mode 100755 index a4bb318..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp218.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp219.jpg b/oscardata/oscardata/bin/Debug/temp219.jpg deleted file mode 100755 index ff5ac48..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp219.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp220.jpg b/oscardata/oscardata/bin/Debug/temp220.jpg deleted file mode 100755 index 7210b56..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp220.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp221.jpg b/oscardata/oscardata/bin/Debug/temp221.jpg deleted file mode 100755 index f3462a0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp221.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp222.jpg b/oscardata/oscardata/bin/Debug/temp222.jpg deleted file mode 100755 index 943bdc8..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp222.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp223.jpg b/oscardata/oscardata/bin/Debug/temp223.jpg deleted file mode 100755 index 0920add..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp223.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp224.jpg b/oscardata/oscardata/bin/Debug/temp224.jpg deleted file mode 100755 index ae26389..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp224.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp225.jpg b/oscardata/oscardata/bin/Debug/temp225.jpg deleted file mode 100755 index 7a7e9ab..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp225.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp226.jpg b/oscardata/oscardata/bin/Debug/temp226.jpg deleted file mode 100755 index cd834ec..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp226.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp227.jpg b/oscardata/oscardata/bin/Debug/temp227.jpg deleted file mode 100755 index ff6e1b4..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp227.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp228.jpg b/oscardata/oscardata/bin/Debug/temp228.jpg deleted file mode 100755 index 01d2623..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp228.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp229.jpg b/oscardata/oscardata/bin/Debug/temp229.jpg deleted file mode 100755 index 29ddfe8..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp229.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp230.jpg b/oscardata/oscardata/bin/Debug/temp230.jpg deleted file mode 100755 index d3105d6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp230.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp231.jpg b/oscardata/oscardata/bin/Debug/temp231.jpg deleted file mode 100755 index d950e57..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp231.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp232.jpg b/oscardata/oscardata/bin/Debug/temp232.jpg deleted file mode 100755 index 01daa95..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp232.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp233.jpg b/oscardata/oscardata/bin/Debug/temp233.jpg deleted file mode 100755 index fd016d6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp233.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp234.jpg b/oscardata/oscardata/bin/Debug/temp234.jpg deleted file mode 100755 index ca567bf..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp234.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp235.jpg b/oscardata/oscardata/bin/Debug/temp235.jpg deleted file mode 100755 index 7eea044..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp235.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp236.jpg b/oscardata/oscardata/bin/Debug/temp236.jpg deleted file mode 100755 index 941b9cd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp236.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp237.jpg b/oscardata/oscardata/bin/Debug/temp237.jpg deleted file mode 100755 index e3e7a09..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp237.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp238.jpg b/oscardata/oscardata/bin/Debug/temp238.jpg deleted file mode 100755 index 80c79ec..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp238.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp239.jpg b/oscardata/oscardata/bin/Debug/temp239.jpg deleted file mode 100755 index b342633..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp239.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp240.jpg b/oscardata/oscardata/bin/Debug/temp240.jpg deleted file mode 100755 index a25fdfb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp240.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp241.jpg b/oscardata/oscardata/bin/Debug/temp241.jpg deleted file mode 100755 index a479d8a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp241.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp242.jpg b/oscardata/oscardata/bin/Debug/temp242.jpg deleted file mode 100755 index 1e0a434..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp242.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp243.jpg b/oscardata/oscardata/bin/Debug/temp243.jpg deleted file mode 100755 index 4a0b8df..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp243.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp244.jpg b/oscardata/oscardata/bin/Debug/temp244.jpg deleted file mode 100755 index 7c3abca..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp244.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp245.jpg b/oscardata/oscardata/bin/Debug/temp245.jpg deleted file mode 100755 index 8b1467f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp245.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp246.jpg b/oscardata/oscardata/bin/Debug/temp246.jpg deleted file mode 100755 index fc02efb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp246.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp247.jpg b/oscardata/oscardata/bin/Debug/temp247.jpg deleted file mode 100755 index a118dde..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp247.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp248.jpg b/oscardata/oscardata/bin/Debug/temp248.jpg deleted file mode 100755 index 6a73072..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp248.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp249.jpg b/oscardata/oscardata/bin/Debug/temp249.jpg deleted file mode 100755 index 1659590..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp249.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp250.jpg b/oscardata/oscardata/bin/Debug/temp250.jpg deleted file mode 100755 index f44f287..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp250.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp251.jpg b/oscardata/oscardata/bin/Debug/temp251.jpg deleted file mode 100755 index ffc1680..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp251.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp252.jpg b/oscardata/oscardata/bin/Debug/temp252.jpg deleted file mode 100755 index 0b22509..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp252.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp253.jpg b/oscardata/oscardata/bin/Debug/temp253.jpg deleted file mode 100755 index 563d1ee..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp253.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp254.jpg b/oscardata/oscardata/bin/Debug/temp254.jpg deleted file mode 100755 index ebc7253..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp254.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp255.jpg b/oscardata/oscardata/bin/Debug/temp255.jpg deleted file mode 100755 index 4318ee5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp255.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp256.jpg b/oscardata/oscardata/bin/Debug/temp256.jpg deleted file mode 100755 index aa44fd7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp256.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp257.jpg b/oscardata/oscardata/bin/Debug/temp257.jpg deleted file mode 100755 index 8c634ab..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp257.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp258.jpg b/oscardata/oscardata/bin/Debug/temp258.jpg deleted file mode 100755 index 0960685..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp258.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp259.jpg b/oscardata/oscardata/bin/Debug/temp259.jpg deleted file mode 100755 index cdaf423..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp259.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp260.jpg b/oscardata/oscardata/bin/Debug/temp260.jpg deleted file mode 100755 index 5db9b89..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp260.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp261.jpg b/oscardata/oscardata/bin/Debug/temp261.jpg deleted file mode 100755 index 130647f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp261.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp262.jpg b/oscardata/oscardata/bin/Debug/temp262.jpg deleted file mode 100755 index f2c2cd0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp262.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp263.jpg b/oscardata/oscardata/bin/Debug/temp263.jpg deleted file mode 100755 index f3503de..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp263.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp264.jpg b/oscardata/oscardata/bin/Debug/temp264.jpg deleted file mode 100755 index 865247a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp264.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp265.jpg b/oscardata/oscardata/bin/Debug/temp265.jpg deleted file mode 100755 index fd430ed..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp265.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp266.jpg b/oscardata/oscardata/bin/Debug/temp266.jpg deleted file mode 100755 index a5ed5b1..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp266.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp267.jpg b/oscardata/oscardata/bin/Debug/temp267.jpg deleted file mode 100755 index 1cc17dd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp267.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp268.jpg b/oscardata/oscardata/bin/Debug/temp268.jpg deleted file mode 100755 index ca0bc30..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp268.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp269.jpg b/oscardata/oscardata/bin/Debug/temp269.jpg deleted file mode 100755 index 3be46e3..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp269.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp27.jpg b/oscardata/oscardata/bin/Debug/temp27.jpg deleted file mode 100755 index b6a014e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp27.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp270.jpg b/oscardata/oscardata/bin/Debug/temp270.jpg deleted file mode 100755 index 434fe2b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp270.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp271.jpg b/oscardata/oscardata/bin/Debug/temp271.jpg deleted file mode 100755 index 814413d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp271.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp272.jpg b/oscardata/oscardata/bin/Debug/temp272.jpg deleted file mode 100755 index 86bcd9a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp272.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp273.jpg b/oscardata/oscardata/bin/Debug/temp273.jpg deleted file mode 100755 index 4865e5c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp273.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp274.jpg b/oscardata/oscardata/bin/Debug/temp274.jpg deleted file mode 100755 index 43fec5f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp274.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp275.jpg b/oscardata/oscardata/bin/Debug/temp275.jpg deleted file mode 100755 index f9ac983..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp275.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp276.jpg b/oscardata/oscardata/bin/Debug/temp276.jpg deleted file mode 100755 index 31b54e9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp276.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp277.jpg b/oscardata/oscardata/bin/Debug/temp277.jpg deleted file mode 100755 index 50feb6b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp277.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp278.jpg b/oscardata/oscardata/bin/Debug/temp278.jpg deleted file mode 100755 index 5ae9cf4..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp278.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp279.jpg b/oscardata/oscardata/bin/Debug/temp279.jpg deleted file mode 100755 index e539c23..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp279.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp28.jpg b/oscardata/oscardata/bin/Debug/temp28.jpg deleted file mode 100755 index 829b10d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp28.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp280.jpg b/oscardata/oscardata/bin/Debug/temp280.jpg deleted file mode 100755 index 713c9e7..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp280.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp281.jpg b/oscardata/oscardata/bin/Debug/temp281.jpg deleted file mode 100755 index 02558ea..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp281.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp282.jpg b/oscardata/oscardata/bin/Debug/temp282.jpg deleted file mode 100755 index a4738b6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp282.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp283.jpg b/oscardata/oscardata/bin/Debug/temp283.jpg deleted file mode 100755 index 823eb48..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp283.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp284.jpg b/oscardata/oscardata/bin/Debug/temp284.jpg deleted file mode 100755 index e21d858..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp284.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp285.jpg b/oscardata/oscardata/bin/Debug/temp285.jpg deleted file mode 100755 index 77d4c6f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp285.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp286.jpg b/oscardata/oscardata/bin/Debug/temp286.jpg deleted file mode 100755 index d8f0184..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp286.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp287.jpg b/oscardata/oscardata/bin/Debug/temp287.jpg deleted file mode 100755 index c3120c5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp287.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp288.jpg b/oscardata/oscardata/bin/Debug/temp288.jpg deleted file mode 100755 index 9ab76ae..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp288.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp289.jpg b/oscardata/oscardata/bin/Debug/temp289.jpg deleted file mode 100755 index 2a3fc46..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp289.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp29.jpg b/oscardata/oscardata/bin/Debug/temp29.jpg deleted file mode 100755 index c0bb110..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp29.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp290.jpg b/oscardata/oscardata/bin/Debug/temp290.jpg deleted file mode 100755 index 3a84399..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp290.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp291.jpg b/oscardata/oscardata/bin/Debug/temp291.jpg deleted file mode 100755 index cd28fe9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp291.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp292.jpg b/oscardata/oscardata/bin/Debug/temp292.jpg deleted file mode 100755 index 322219b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp292.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp293.jpg b/oscardata/oscardata/bin/Debug/temp293.jpg deleted file mode 100755 index 48213af..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp293.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp294.jpg b/oscardata/oscardata/bin/Debug/temp294.jpg deleted file mode 100755 index 8a2954b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp294.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp295.jpg b/oscardata/oscardata/bin/Debug/temp295.jpg deleted file mode 100755 index dd9208f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp295.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp296.jpg b/oscardata/oscardata/bin/Debug/temp296.jpg deleted file mode 100755 index 22005fa..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp296.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp297.jpg b/oscardata/oscardata/bin/Debug/temp297.jpg deleted file mode 100755 index 4d670b0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp297.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp298.jpg b/oscardata/oscardata/bin/Debug/temp298.jpg deleted file mode 100755 index f05aee0..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp298.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp299.jpg b/oscardata/oscardata/bin/Debug/temp299.jpg deleted file mode 100755 index c9782df..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp299.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp3.jpg b/oscardata/oscardata/bin/Debug/temp3.jpg deleted file mode 100755 index a94df53..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp3.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp30.jpg b/oscardata/oscardata/bin/Debug/temp30.jpg deleted file mode 100755 index faad667..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp30.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp300.jpg b/oscardata/oscardata/bin/Debug/temp300.jpg deleted file mode 100755 index a6dbe59..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp300.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp301.jpg b/oscardata/oscardata/bin/Debug/temp301.jpg deleted file mode 100755 index ff4941d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp301.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp302.jpg b/oscardata/oscardata/bin/Debug/temp302.jpg deleted file mode 100755 index b9ac4ad..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp302.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp303.jpg b/oscardata/oscardata/bin/Debug/temp303.jpg deleted file mode 100755 index 9eb51f5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp303.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp304.jpg b/oscardata/oscardata/bin/Debug/temp304.jpg deleted file mode 100755 index f1536cb..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp304.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp305.jpg b/oscardata/oscardata/bin/Debug/temp305.jpg deleted file mode 100755 index 91b692e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp305.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp306.jpg b/oscardata/oscardata/bin/Debug/temp306.jpg deleted file mode 100755 index 7b4ea97..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp306.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp307.jpg b/oscardata/oscardata/bin/Debug/temp307.jpg deleted file mode 100755 index a1d5720..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp307.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp308.jpg b/oscardata/oscardata/bin/Debug/temp308.jpg deleted file mode 100755 index 0e1198c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp308.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp309.jpg b/oscardata/oscardata/bin/Debug/temp309.jpg deleted file mode 100755 index f3642fd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp309.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp31.jpg b/oscardata/oscardata/bin/Debug/temp31.jpg deleted file mode 100755 index ad461bf..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp31.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp310.jpg b/oscardata/oscardata/bin/Debug/temp310.jpg deleted file mode 100755 index 2d99317..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp310.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp311.jpg b/oscardata/oscardata/bin/Debug/temp311.jpg deleted file mode 100755 index 33ef407..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp311.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp312.jpg b/oscardata/oscardata/bin/Debug/temp312.jpg deleted file mode 100755 index 83e9e5c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp312.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp313.jpg b/oscardata/oscardata/bin/Debug/temp313.jpg deleted file mode 100755 index 713d66a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp313.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp314.jpg b/oscardata/oscardata/bin/Debug/temp314.jpg deleted file mode 100755 index 31a31a6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp314.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp315.jpg b/oscardata/oscardata/bin/Debug/temp315.jpg deleted file mode 100755 index f641317..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp315.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp316.jpg b/oscardata/oscardata/bin/Debug/temp316.jpg deleted file mode 100755 index f980de2..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp316.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp317.jpg b/oscardata/oscardata/bin/Debug/temp317.jpg deleted file mode 100755 index b133360..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp317.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp318.jpg b/oscardata/oscardata/bin/Debug/temp318.jpg deleted file mode 100755 index 7ca2c09..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp318.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp319.jpg b/oscardata/oscardata/bin/Debug/temp319.jpg deleted file mode 100755 index 76c75e5..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp319.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp32.jpg b/oscardata/oscardata/bin/Debug/temp32.jpg deleted file mode 100755 index 36bd4a2..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp32.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp320.jpg b/oscardata/oscardata/bin/Debug/temp320.jpg deleted file mode 100755 index f239b8c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp320.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp321.jpg b/oscardata/oscardata/bin/Debug/temp321.jpg deleted file mode 100755 index d32093f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp321.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp322.jpg b/oscardata/oscardata/bin/Debug/temp322.jpg deleted file mode 100755 index 1e255c6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp322.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp323.jpg b/oscardata/oscardata/bin/Debug/temp323.jpg deleted file mode 100755 index 8551a01..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp323.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp324.jpg b/oscardata/oscardata/bin/Debug/temp324.jpg deleted file mode 100755 index 3a558f6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp324.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp325.jpg b/oscardata/oscardata/bin/Debug/temp325.jpg deleted file mode 100755 index 4f6d124..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp325.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp326.jpg b/oscardata/oscardata/bin/Debug/temp326.jpg deleted file mode 100755 index ac3bc09..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp326.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp327.jpg b/oscardata/oscardata/bin/Debug/temp327.jpg deleted file mode 100755 index b0e039d..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp327.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp328.jpg b/oscardata/oscardata/bin/Debug/temp328.jpg deleted file mode 100755 index a62eb86..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp328.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp329.jpg b/oscardata/oscardata/bin/Debug/temp329.jpg deleted file mode 100755 index 73578f6..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp329.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp33.jpg b/oscardata/oscardata/bin/Debug/temp33.jpg deleted file mode 100755 index 158a29b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp33.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp34.jpg b/oscardata/oscardata/bin/Debug/temp34.jpg deleted file mode 100755 index c8b2c29..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp34.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp35.jpg b/oscardata/oscardata/bin/Debug/temp35.jpg deleted file mode 100755 index 3e15f14..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp35.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp36.jpg b/oscardata/oscardata/bin/Debug/temp36.jpg deleted file mode 100755 index 95a9286..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp36.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp37.jpg b/oscardata/oscardata/bin/Debug/temp37.jpg deleted file mode 100755 index e29cf4e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp37.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp38.jpg b/oscardata/oscardata/bin/Debug/temp38.jpg deleted file mode 100755 index c346f03..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp38.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp39.jpg b/oscardata/oscardata/bin/Debug/temp39.jpg deleted file mode 100755 index 01aef87..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp39.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp4.jpg b/oscardata/oscardata/bin/Debug/temp4.jpg deleted file mode 100755 index 4c8c7af..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp4.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp43.jpg b/oscardata/oscardata/bin/Debug/temp43.jpg deleted file mode 100755 index 44a7990..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp43.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp48.jpg b/oscardata/oscardata/bin/Debug/temp48.jpg deleted file mode 100755 index 163da3c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp48.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp49.jpg b/oscardata/oscardata/bin/Debug/temp49.jpg deleted file mode 100755 index f268984..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp49.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp5.jpg b/oscardata/oscardata/bin/Debug/temp5.jpg deleted file mode 100755 index 3db79af..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp5.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp50.jpg b/oscardata/oscardata/bin/Debug/temp50.jpg deleted file mode 100755 index 0e446de..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp50.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp51.jpg b/oscardata/oscardata/bin/Debug/temp51.jpg deleted file mode 100755 index 8b9a25e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp51.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp52.jpg b/oscardata/oscardata/bin/Debug/temp52.jpg deleted file mode 100755 index 58f5087..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp52.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp53.jpg b/oscardata/oscardata/bin/Debug/temp53.jpg deleted file mode 100755 index fa80178..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp53.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp54.jpg b/oscardata/oscardata/bin/Debug/temp54.jpg deleted file mode 100755 index 092499a..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp54.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp56.jpg b/oscardata/oscardata/bin/Debug/temp56.jpg deleted file mode 100755 index 81ea57b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp56.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp6.jpg b/oscardata/oscardata/bin/Debug/temp6.jpg deleted file mode 100755 index b50f383..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp6.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp62.jpg b/oscardata/oscardata/bin/Debug/temp62.jpg deleted file mode 100755 index 53dc8fd..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp62.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp63.jpg b/oscardata/oscardata/bin/Debug/temp63.jpg deleted file mode 100755 index 2f91b46..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp63.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp64.jpg b/oscardata/oscardata/bin/Debug/temp64.jpg deleted file mode 100755 index 300ebd9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp64.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp7.jpg b/oscardata/oscardata/bin/Debug/temp7.jpg deleted file mode 100755 index 0e63e4c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp7.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp8.jpg b/oscardata/oscardata/bin/Debug/temp8.jpg deleted file mode 100755 index 6e3f7c4..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp8.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp85.jpg b/oscardata/oscardata/bin/Debug/temp85.jpg deleted file mode 100755 index 57f60f9..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp85.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp86.jpg b/oscardata/oscardata/bin/Debug/temp86.jpg deleted file mode 100755 index 673b305..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp86.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp87.jpg b/oscardata/oscardata/bin/Debug/temp87.jpg deleted file mode 100755 index 5f360be..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp87.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp88.jpg b/oscardata/oscardata/bin/Debug/temp88.jpg deleted file mode 100755 index 725f20b..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp88.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp89.jpg b/oscardata/oscardata/bin/Debug/temp89.jpg deleted file mode 100755 index 2d12841..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp89.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp9.jpg b/oscardata/oscardata/bin/Debug/temp9.jpg deleted file mode 100755 index 8b8948f..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp9.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp90.jpg b/oscardata/oscardata/bin/Debug/temp90.jpg deleted file mode 100755 index 02327c2..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp90.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp91.jpg b/oscardata/oscardata/bin/Debug/temp91.jpg deleted file mode 100755 index df8c96c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp91.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp92.jpg b/oscardata/oscardata/bin/Debug/temp92.jpg deleted file mode 100755 index fea887c..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp92.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp93.jpg b/oscardata/oscardata/bin/Debug/temp93.jpg deleted file mode 100755 index a2d7602..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp93.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/temp94.jpg b/oscardata/oscardata/bin/Debug/temp94.jpg deleted file mode 100755 index 0b8971e..0000000 Binary files a/oscardata/oscardata/bin/Debug/temp94.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX10261.jpg b/oscardata/oscardata/bin/Debug/tempTX10261.jpg deleted file mode 100755 index a853568..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX10261.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX10275.jpg b/oscardata/oscardata/bin/Debug/tempTX10275.jpg deleted file mode 100755 index 4f52bfb..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX10275.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX10974.jpg b/oscardata/oscardata/bin/Debug/tempTX10974.jpg deleted file mode 100755 index c9cefa8..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX10974.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX11606.jpg b/oscardata/oscardata/bin/Debug/tempTX11606.jpg deleted file mode 100755 index b82d805..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX11606.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX11871.jpg b/oscardata/oscardata/bin/Debug/tempTX11871.jpg deleted file mode 100755 index 1aaa6e2..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX11871.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX12258.jpg b/oscardata/oscardata/bin/Debug/tempTX12258.jpg deleted file mode 100755 index 5535f3c..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX12258.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX13349.jpg b/oscardata/oscardata/bin/Debug/tempTX13349.jpg deleted file mode 100755 index 2b59b51..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX13349.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX14075.jpg b/oscardata/oscardata/bin/Debug/tempTX14075.jpg deleted file mode 100755 index f26a2fb..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX14075.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX15059.jpg b/oscardata/oscardata/bin/Debug/tempTX15059.jpg deleted file mode 100755 index 1fa887e..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX15059.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX15327.jpg b/oscardata/oscardata/bin/Debug/tempTX15327.jpg deleted file mode 100755 index 6ff8b63..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX15327.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX15844.jpg b/oscardata/oscardata/bin/Debug/tempTX15844.jpg deleted file mode 100755 index 3c0dcbf..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX15844.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX16354.jpg b/oscardata/oscardata/bin/Debug/tempTX16354.jpg deleted file mode 100755 index b873b04..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX16354.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX16823.jpg b/oscardata/oscardata/bin/Debug/tempTX16823.jpg deleted file mode 100755 index bb5743c..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX16823.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX17827.jpg b/oscardata/oscardata/bin/Debug/tempTX17827.jpg deleted file mode 100755 index ebb93d8..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX17827.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX18806.jpg b/oscardata/oscardata/bin/Debug/tempTX18806.jpg deleted file mode 100755 index 099453d..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX18806.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX19324.jpg b/oscardata/oscardata/bin/Debug/tempTX19324.jpg deleted file mode 100755 index 5957196..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX19324.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX20402.jpg b/oscardata/oscardata/bin/Debug/tempTX20402.jpg deleted file mode 100755 index dc6b440..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX20402.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX22098.jpg b/oscardata/oscardata/bin/Debug/tempTX22098.jpg deleted file mode 100755 index ee5a6f3..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX22098.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX22283.jpg b/oscardata/oscardata/bin/Debug/tempTX22283.jpg deleted file mode 100755 index 7afcd13..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX22283.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX23069.jpg b/oscardata/oscardata/bin/Debug/tempTX23069.jpg deleted file mode 100755 index 9c3625f..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX23069.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX23450.jpg b/oscardata/oscardata/bin/Debug/tempTX23450.jpg deleted file mode 100755 index 8623697..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX23450.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX23488.jpg b/oscardata/oscardata/bin/Debug/tempTX23488.jpg deleted file mode 100755 index 83180fc..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX23488.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX24436.jpg b/oscardata/oscardata/bin/Debug/tempTX24436.jpg deleted file mode 100755 index a8cd562..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX24436.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX25391.jpg b/oscardata/oscardata/bin/Debug/tempTX25391.jpg deleted file mode 100755 index a8e9315..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX25391.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX25492.jpg b/oscardata/oscardata/bin/Debug/tempTX25492.jpg deleted file mode 100755 index b27543b..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX25492.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX25779.jpg b/oscardata/oscardata/bin/Debug/tempTX25779.jpg deleted file mode 100755 index bf04b1a..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX25779.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX26608.jpg b/oscardata/oscardata/bin/Debug/tempTX26608.jpg deleted file mode 100755 index 5fb28ba..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX26608.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX27079.jpg b/oscardata/oscardata/bin/Debug/tempTX27079.jpg deleted file mode 100755 index 3cba822..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX27079.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX27150.jpg b/oscardata/oscardata/bin/Debug/tempTX27150.jpg deleted file mode 100755 index 7ba0468..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX27150.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX28197.jpg b/oscardata/oscardata/bin/Debug/tempTX28197.jpg deleted file mode 100755 index 37d9fd1..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX28197.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX28243.jpg b/oscardata/oscardata/bin/Debug/tempTX28243.jpg deleted file mode 100755 index 03d9e3a..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX28243.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX30588.jpg b/oscardata/oscardata/bin/Debug/tempTX30588.jpg deleted file mode 100755 index 629d95a..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX30588.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX31031.jpg b/oscardata/oscardata/bin/Debug/tempTX31031.jpg deleted file mode 100755 index cba9667..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX31031.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX31082.jpg b/oscardata/oscardata/bin/Debug/tempTX31082.jpg deleted file mode 100755 index 72a8278..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX31082.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX3225.jpg b/oscardata/oscardata/bin/Debug/tempTX3225.jpg deleted file mode 100755 index 3d46346..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX3225.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX32547.jpg b/oscardata/oscardata/bin/Debug/tempTX32547.jpg deleted file mode 100755 index 91aa73e..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX32547.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX33526.jpg b/oscardata/oscardata/bin/Debug/tempTX33526.jpg deleted file mode 100755 index 688cc46..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX33526.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX33670.jpg b/oscardata/oscardata/bin/Debug/tempTX33670.jpg deleted file mode 100755 index 8b2e5cc..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX33670.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX34413.jpg b/oscardata/oscardata/bin/Debug/tempTX34413.jpg deleted file mode 100755 index 68afd2d..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX34413.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX34852.jpg b/oscardata/oscardata/bin/Debug/tempTX34852.jpg deleted file mode 100755 index 32a74fa..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX34852.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX35222.jpg b/oscardata/oscardata/bin/Debug/tempTX35222.jpg deleted file mode 100755 index 346501a..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX35222.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX35806.jpg b/oscardata/oscardata/bin/Debug/tempTX35806.jpg deleted file mode 100755 index 3d9fbb8..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX35806.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX36280.jpg b/oscardata/oscardata/bin/Debug/tempTX36280.jpg deleted file mode 100755 index ee5a6f3..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX36280.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX36485.jpg b/oscardata/oscardata/bin/Debug/tempTX36485.jpg deleted file mode 100755 index c7a1b8b..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX36485.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX36517.jpg b/oscardata/oscardata/bin/Debug/tempTX36517.jpg deleted file mode 100755 index 3d9fbb8..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX36517.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX36836.jpg b/oscardata/oscardata/bin/Debug/tempTX36836.jpg deleted file mode 100755 index ae44c0f..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX36836.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX36850.jpg b/oscardata/oscardata/bin/Debug/tempTX36850.jpg deleted file mode 100755 index 5b35a31..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX36850.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX37011.jpg b/oscardata/oscardata/bin/Debug/tempTX37011.jpg deleted file mode 100755 index b82d805..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX37011.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX38118.jpg b/oscardata/oscardata/bin/Debug/tempTX38118.jpg deleted file mode 100755 index cbccb3c..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX38118.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX38440.jpg b/oscardata/oscardata/bin/Debug/tempTX38440.jpg deleted file mode 100755 index ee5a6f3..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX38440.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX39635.jpg b/oscardata/oscardata/bin/Debug/tempTX39635.jpg deleted file mode 100755 index 5444320..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX39635.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX39706.jpg b/oscardata/oscardata/bin/Debug/tempTX39706.jpg deleted file mode 100755 index 2ec4286..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX39706.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX40116.jpg b/oscardata/oscardata/bin/Debug/tempTX40116.jpg deleted file mode 100755 index a440af9..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX40116.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX44050.jpg b/oscardata/oscardata/bin/Debug/tempTX44050.jpg deleted file mode 100755 index cd07594..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX44050.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX46061.jpg b/oscardata/oscardata/bin/Debug/tempTX46061.jpg deleted file mode 100755 index 85d25bf..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX46061.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX4672.jpg b/oscardata/oscardata/bin/Debug/tempTX4672.jpg deleted file mode 100755 index e40344a..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX4672.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX47165.jpg b/oscardata/oscardata/bin/Debug/tempTX47165.jpg deleted file mode 100755 index 20957b1..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX47165.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX48249.jpg b/oscardata/oscardata/bin/Debug/tempTX48249.jpg deleted file mode 100755 index 72a8278..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX48249.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX48459.jpg b/oscardata/oscardata/bin/Debug/tempTX48459.jpg deleted file mode 100755 index 5d31c4f..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX48459.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX48484.jpg b/oscardata/oscardata/bin/Debug/tempTX48484.jpg deleted file mode 100755 index 33071af..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX48484.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX49358.jpg b/oscardata/oscardata/bin/Debug/tempTX49358.jpg deleted file mode 100755 index 56c4cc4..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX49358.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX49364.jpg b/oscardata/oscardata/bin/Debug/tempTX49364.jpg deleted file mode 100755 index a1ec562..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX49364.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX49440.jpg b/oscardata/oscardata/bin/Debug/tempTX49440.jpg deleted file mode 100755 index caec140..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX49440.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX50291.jpg b/oscardata/oscardata/bin/Debug/tempTX50291.jpg deleted file mode 100755 index 36ef7d3..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX50291.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX50292.jpg b/oscardata/oscardata/bin/Debug/tempTX50292.jpg deleted file mode 100755 index c9dea9e..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX50292.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX50352.jpg b/oscardata/oscardata/bin/Debug/tempTX50352.jpg deleted file mode 100755 index 83b4450..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX50352.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX51464.jpg b/oscardata/oscardata/bin/Debug/tempTX51464.jpg deleted file mode 100755 index 734aa25..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX51464.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX51976.jpg b/oscardata/oscardata/bin/Debug/tempTX51976.jpg deleted file mode 100755 index 230e4ab..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX51976.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX5478.jpg b/oscardata/oscardata/bin/Debug/tempTX5478.jpg deleted file mode 100755 index 20e201d..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX5478.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX55396.jpg b/oscardata/oscardata/bin/Debug/tempTX55396.jpg deleted file mode 100755 index 50e57e8..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX55396.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX55706.jpg b/oscardata/oscardata/bin/Debug/tempTX55706.jpg deleted file mode 100755 index edea434..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX55706.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX56901.jpg b/oscardata/oscardata/bin/Debug/tempTX56901.jpg deleted file mode 100755 index f92f282..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX56901.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX56962.jpg b/oscardata/oscardata/bin/Debug/tempTX56962.jpg deleted file mode 100755 index 2ec4286..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX56962.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX58707.jpg b/oscardata/oscardata/bin/Debug/tempTX58707.jpg deleted file mode 100755 index b4d0ecd..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX58707.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX60245.jpg b/oscardata/oscardata/bin/Debug/tempTX60245.jpg deleted file mode 100755 index 7e0d697..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX60245.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX63376.jpg b/oscardata/oscardata/bin/Debug/tempTX63376.jpg deleted file mode 100755 index 4acfb93..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX63376.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX64035.jpg b/oscardata/oscardata/bin/Debug/tempTX64035.jpg deleted file mode 100755 index d263b12..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX64035.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX64471.jpg b/oscardata/oscardata/bin/Debug/tempTX64471.jpg deleted file mode 100755 index 83180fc..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX64471.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX64553.jpg b/oscardata/oscardata/bin/Debug/tempTX64553.jpg deleted file mode 100755 index d98b239..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX64553.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX6513.jpg b/oscardata/oscardata/bin/Debug/tempTX6513.jpg deleted file mode 100755 index a1011de..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX6513.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX781.jpg b/oscardata/oscardata/bin/Debug/tempTX781.jpg deleted file mode 100755 index 596cbc2..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX781.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tempTX931.jpg b/oscardata/oscardata/bin/Debug/tempTX931.jpg deleted file mode 100755 index 9e06537..0000000 Binary files a/oscardata/oscardata/bin/Debug/tempTX931.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/tmp.html b/oscardata/oscardata/bin/Debug/tmp.html deleted file mode 100755 index 65b204f..0000000 --- a/oscardata/oscardata/bin/Debug/tmp.html +++ /dev/null @@ -1,11 +0,0 @@ -

Ernst, DL1EV : Platinenservice:

-

dl1ev@gmx.de

-

 

-

Bitte sendet dem Ernst eine e-mail mit eurem -Platinenwunsch, er wird euch dann alle erforderlichen Informationen zukommen -lassen.

-

Please send an e-mai -l to dl1ev containing -the PCB you need. He will send you all required information.

-

 

diff --git a/oscardata/oscardata/bin/Release/image.bin b/oscardata/oscardata/bin/Release/image.bin deleted file mode 100755 index b830248..0000000 Binary files a/oscardata/oscardata/bin/Release/image.bin and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/oscardata.exe.config b/oscardata/oscardata/bin/Release/oscardata.exe.config deleted file mode 100755 index e743be0..0000000 --- a/oscardata/oscardata/bin/Release/oscardata.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/oscardata/oscardata/bin/Release/oscardata.pdb b/oscardata/oscardata/bin/Release/oscardata.pdb deleted file mode 100755 index 379292a..0000000 Binary files a/oscardata/oscardata/bin/Release/oscardata.pdb and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/rxdata.jpg b/oscardata/oscardata/bin/Release/rxdata.jpg deleted file mode 100755 index b59d050..0000000 Binary files a/oscardata/oscardata/bin/Release/rxdata.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/temp100.jpg b/oscardata/oscardata/bin/Release/temp100.jpg deleted file mode 100755 index b59d050..0000000 Binary files a/oscardata/oscardata/bin/Release/temp100.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/temp182.jpg b/oscardata/oscardata/bin/Release/temp182.jpg deleted file mode 100755 index c74d588..0000000 Binary files a/oscardata/oscardata/bin/Release/temp182.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/temp532.jpg b/oscardata/oscardata/bin/Release/temp532.jpg deleted file mode 100644 index 59fd7df..0000000 Binary files a/oscardata/oscardata/bin/Release/temp532.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX11032.jpg b/oscardata/oscardata/bin/Release/tempTX11032.jpg deleted file mode 100644 index f784c90..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX11032.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX13323.jpg b/oscardata/oscardata/bin/Release/tempTX13323.jpg deleted file mode 100755 index 3abfc1b..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX13323.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX14056.jpg b/oscardata/oscardata/bin/Release/tempTX14056.jpg deleted file mode 100644 index 7ef72b8..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX14056.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX1443.jpg b/oscardata/oscardata/bin/Release/tempTX1443.jpg deleted file mode 100644 index ab8cd88..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX1443.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX17133.jpg b/oscardata/oscardata/bin/Release/tempTX17133.jpg deleted file mode 100644 index a9baa9f..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX17133.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX17258.jpg b/oscardata/oscardata/bin/Release/tempTX17258.jpg deleted file mode 100644 index c466529..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX17258.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX21183.jpg b/oscardata/oscardata/bin/Release/tempTX21183.jpg deleted file mode 100644 index 4ddfced..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX21183.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX21964.jpg b/oscardata/oscardata/bin/Release/tempTX21964.jpg deleted file mode 100644 index f495a0e..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX21964.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX2239.jpg b/oscardata/oscardata/bin/Release/tempTX2239.jpg deleted file mode 100644 index b591ee9..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX2239.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX24380.jpg b/oscardata/oscardata/bin/Release/tempTX24380.jpg deleted file mode 100644 index a794e10..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX24380.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX25406.jpg b/oscardata/oscardata/bin/Release/tempTX25406.jpg deleted file mode 100644 index 4d57a11..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX25406.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX2657.jpg b/oscardata/oscardata/bin/Release/tempTX2657.jpg deleted file mode 100644 index d21a49f..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX2657.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX26606.jpg b/oscardata/oscardata/bin/Release/tempTX26606.jpg deleted file mode 100644 index c002c89..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX26606.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX27585.jpg b/oscardata/oscardata/bin/Release/tempTX27585.jpg deleted file mode 100644 index 6447ca1..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX27585.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX30789.jpg b/oscardata/oscardata/bin/Release/tempTX30789.jpg deleted file mode 100644 index bd10713..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX30789.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX31938.jpg b/oscardata/oscardata/bin/Release/tempTX31938.jpg deleted file mode 100755 index ee5a6f3..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX31938.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX32938.jpg b/oscardata/oscardata/bin/Release/tempTX32938.jpg deleted file mode 100644 index bd10713..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX32938.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX33365.jpg b/oscardata/oscardata/bin/Release/tempTX33365.jpg deleted file mode 100644 index ab59bcc..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX33365.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX39607.jpg b/oscardata/oscardata/bin/Release/tempTX39607.jpg deleted file mode 100644 index c002c89..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX39607.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX4017.jpg b/oscardata/oscardata/bin/Release/tempTX4017.jpg deleted file mode 100644 index 73736f5..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX4017.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX43707.jpg b/oscardata/oscardata/bin/Release/tempTX43707.jpg deleted file mode 100644 index 1c43a03..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX43707.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX48749.jpg b/oscardata/oscardata/bin/Release/tempTX48749.jpg deleted file mode 100644 index f8cbf40..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX48749.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX4991.jpg b/oscardata/oscardata/bin/Release/tempTX4991.jpg deleted file mode 100644 index e6f5086..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX4991.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX52559.jpg b/oscardata/oscardata/bin/Release/tempTX52559.jpg deleted file mode 100644 index bd10713..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX52559.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX53265.jpg b/oscardata/oscardata/bin/Release/tempTX53265.jpg deleted file mode 100644 index 69796e2..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX53265.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX54192.jpg b/oscardata/oscardata/bin/Release/tempTX54192.jpg deleted file mode 100644 index 411155b..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX54192.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX55479.jpg b/oscardata/oscardata/bin/Release/tempTX55479.jpg deleted file mode 100644 index 4f94604..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX55479.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX55856.jpg b/oscardata/oscardata/bin/Release/tempTX55856.jpg deleted file mode 100644 index 69cf651..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX55856.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX56233.jpg b/oscardata/oscardata/bin/Release/tempTX56233.jpg deleted file mode 100644 index f784c90..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX56233.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX56426.jpg b/oscardata/oscardata/bin/Release/tempTX56426.jpg deleted file mode 100644 index 9819806..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX56426.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX57228.jpg b/oscardata/oscardata/bin/Release/tempTX57228.jpg deleted file mode 100644 index 4f94604..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX57228.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX58983.jpg b/oscardata/oscardata/bin/Release/tempTX58983.jpg deleted file mode 100644 index ed5b326..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX58983.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX59337.jpg b/oscardata/oscardata/bin/Release/tempTX59337.jpg deleted file mode 100644 index 9927f28..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX59337.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX59408.jpg b/oscardata/oscardata/bin/Release/tempTX59408.jpg deleted file mode 100644 index 6306a10..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX59408.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX61001.jpg b/oscardata/oscardata/bin/Release/tempTX61001.jpg deleted file mode 100644 index 6447ca1..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX61001.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX61544.jpg b/oscardata/oscardata/bin/Release/tempTX61544.jpg deleted file mode 100644 index f84287d..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX61544.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX7241.jpg b/oscardata/oscardata/bin/Release/tempTX7241.jpg deleted file mode 100644 index 46e20b7..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX7241.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tempTX7747.jpg b/oscardata/oscardata/bin/Release/tempTX7747.jpg deleted file mode 100644 index 9927f28..0000000 Binary files a/oscardata/oscardata/bin/Release/tempTX7747.jpg and /dev/null differ diff --git a/oscardata/oscardata/bin/Release/tmp.html b/oscardata/oscardata/bin/Release/tmp.html deleted file mode 100644 index a7fcdb0..0000000 --- a/oscardata/oscardata/bin/Release/tmp.html +++ /dev/null @@ -1,20 +0,0 @@ -PK????[=1?I?w??????-??>??e????jX?%o???f??B???h???L?lw???#/p??bY?q?)5y???? ??????}R?N'??????N????9?????In&TSg???T2Vye_?????[S???=?????????????e???|Z????????mnN?????c?j??k`3??????&???!?2???9?&??????lC????/????? k???i?{???????????k{57yn?L??l???????v????F?????????WWsm?eeS]?L???iF?0U????"?????T&+?Lk?????p??\??????mqe2?????!???????:?????????????vW?`???$???6??3??5?L??|B?????#?iI? ??:?M????? ?7?_O?18???K8?Q'??????????2????UR?0???+?Uyef???u??G]h?t7??uN??f8u????9?I??xmK????Qg -?? `?b???[m4deL???r&??~)?mH?? -?6??xc?fT_i%?/???8????I???*?s???3????o?????ax?? -6?B?\???fAD?\ w?s?S?Ja?1g????, Nrr,L????ypi?R?0?)?&???? VW8?Ug???;?????? _????W?0?&??7?????w?U????? ???}??n???Ez?Ai??s???OG?, K?%h??y?:?/?x '??J!??!?:??*rI)G??(:???????dT????ON_?P?SP?i??nz??J?> ??;???P?2 8?[bh?J ?6^?D?)??p,8???\??9?A?b/????B????? u?nsw??????o????p?&*???\??@T ???q#?'e"?Q???????f?7?Y'? -???????2?a?:???{t?????m?^??.fy?????? -?6w.????????z???t?+?RHV?$?HrjJ??}+? -?GY1)??Rv -?[??A? ?#?7???8?A?:Q?I????7??G?efV???J?rk???y???S???]????!???!-' ?????)?U`????jo6lV?_D??B???=h????!??o??yP??K???????????d??"8?????5$S?k???E{O?????B?v? ?CK?~n?Sq???f???H?I???v??]?????? ???Y??b&f??K?ol?V??*????5?\?L??p? -5??c????*7wu^??Th?B?d???W????f?n?gf?t??k??X?oe/'~?|?p? -6[:?@?PeWe,???~??*p???{{S????T{?`,?4??j? ??.?dL9 ??????? ?#?I?8]???u?????y?b??d?*?U?RK?L?? -{??B?9O??????u?x?????t??#??e?? ??????????_??}??=??4?J?Q??{???9?#??? ???.??????|({Z?Y?l?~?? ?????R?????b???sc??|????ezbu????????????,&??c?a???e?J?4?Y?L???&8]??$??????f?]HY?? ?????L8N -R??pR??????g1????*??f????????#3X??a?c???EGHn?]??;?I???X?p??+^9 ???+1??????????}d?? 3?*??(????????}_K??{q?? ?????[L?q$ ?S?q?????3ZR=x?2hN?5???Z??k?9?7???].?&L???????kG?{??:???;??-?oNEt???E??'?T~9??uMD^???????#??:7??x?n?W???@?2C???l??$;??{??h?QG??Dv??t-????)?u9???S????0?????P??3iz?l? -??u?u??Ii? ??z8??c???-????:?hh/???/??P.?????\{o6??Qs??????~~???uop??~')?:?2?:?? -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs deleted file mode 100755 index 182bcf0..0000000 --- a/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100755 index abeccf2..0000000 Binary files a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100755 index 07444ae..0000000 Binary files a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100755 index f07492d..0000000 Binary files a/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.Form1.resources b/oscardata/oscardata/obj/Debug/oscardata.Form1.resources deleted file mode 100755 index a1d32c7..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.Form1.resources and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources b/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources deleted file mode 100755 index a3fc1b2..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache b/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache deleted file mode 100755 index b84666a..0000000 --- a/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -8b1ddd70a4415b8d1df4efbc0e8e471bfcd6bae2 diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt b/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt deleted file mode 100755 index ddc3c79..0000000 --- a/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,10 +0,0 @@ -E:\funk\gnuradio\oscardata\oscardata\bin\Debug\oscardata.exe.config -E:\funk\gnuradio\oscardata\oscardata\bin\Debug\oscardata.exe -E:\funk\gnuradio\oscardata\oscardata\bin\Debug\oscardata.pdb -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.Form1.resources -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.Properties.Resources.resources -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.csproj.GenerateResource.Cache -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.csproj.CoreCompileInputs.cache -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.exe -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.pdb -E:\funk\gnuradio\oscardata\oscardata\obj\Debug\oscardata.csprojAssemblyReference.cache diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache b/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache deleted file mode 100755 index a9cf318..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache b/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache deleted file mode 100755 index 7177511..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.exe b/oscardata/oscardata/obj/Debug/oscardata.exe deleted file mode 100755 index 6e65fa5..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.exe and /dev/null differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.pdb b/oscardata/oscardata/obj/Debug/oscardata.pdb deleted file mode 100755 index 8beccbd..0000000 Binary files a/oscardata/oscardata/obj/Debug/oscardata.pdb and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs deleted file mode 100755 index 9e65edd..0000000 --- a/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")] diff --git a/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs deleted file mode 100755 index 182bcf0..0000000 --- a/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache deleted file mode 100755 index df5578d..0000000 Binary files a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100755 index e50d701..0000000 Binary files a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100755 index 32214a4..0000000 Binary files a/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.Form1.resources b/oscardata/oscardata/obj/Release/oscardata.Form1.resources deleted file mode 100755 index a1d32c7..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.Form1.resources and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources b/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources deleted file mode 100755 index a3fc1b2..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache b/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache deleted file mode 100755 index 6f32516..0000000 --- a/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -650c3889c3141636f761440e7398ad87b17746a1 diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt b/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt deleted file mode 100755 index 78a44cd..0000000 --- a/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,10 +0,0 @@ -E:\funk\gnuradio\oscardata\oscardata\bin\Release\oscardata.exe.config -E:\funk\gnuradio\oscardata\oscardata\bin\Release\oscardata.exe -E:\funk\gnuradio\oscardata\oscardata\bin\Release\oscardata.pdb -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.Form1.resources -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.Properties.Resources.resources -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.csproj.GenerateResource.Cache -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.csproj.CoreCompileInputs.cache -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.exe -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.pdb -E:\funk\gnuradio\oscardata\oscardata\obj\Release\oscardata.csprojAssemblyReference.cache diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache b/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache deleted file mode 100755 index d895f1c..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache b/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache deleted file mode 100755 index b169610..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.exe b/oscardata/oscardata/obj/Release/oscardata.exe deleted file mode 100755 index 885c268..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.exe and /dev/null differ diff --git a/oscardata/oscardata/obj/Release/oscardata.pdb b/oscardata/oscardata/obj/Release/oscardata.pdb deleted file mode 100755 index 379292a..0000000 Binary files a/oscardata/oscardata/obj/Release/oscardata.pdb and /dev/null differ