wake word upload returns

kitsune/audio_codec_pps_driver.h

@@ -149,36 +149,10 @@ static const reg_value REG_Section_program[] = {
     {  3,0x00},
 //			# reg[0][1][4 ] = 0x00                       ; reg(0)(1)(0x04 => 4 )     RDAC FIR
     {  4,0x00},
-#if 0
-//			# reg[0][1][31] = 0x80                       ; reg(0)(1)(0x1F =>31 )     HP in ground Centered mode; HPL gain 0 dB
-    { 31,0x80},
-//			# reg[0][1][32] = 0x00                       ; reg(0)(1)(0x20 =>32 )     HPR independent gain 0 dB
-    { 32,0x00},
-//			# reg[0][1][33] = 0x28                       ; reg(0)(1)(0x21 =>33 )     Charge pump runs on Osc./4
-    { 33,0x28},
-//			# reg[0][1][34] = 0x33 ;0x3e                       ; reg(0)(1)(0x22 =>34 )     Set CP mode
-    { 34,0x33},
-//			# reg[0][1][35] = 0x10                       ; reg(0)(1)(0x23 =>35 )     Power up CP with HP
-    { 35,0x10},
-//			# reg[0][1][52] = 0x40                       ; reg(0)(1)(0x34 => 52)     ADC IN1_L is selected for left P
-    { 52,0x40},
-//			# reg[0][1][54] = 0x40                       ; reg(0)(1)(0x36 => 54)     ADC CM1 is selected for left M
-    { 54,0x40},
-//			# reg[0][1][55] = 0x40                       ; reg(0)(1)(0x37 => 55)     ADC IN1_R is selected for right P
-    { 55,0x40},
-//			# reg[0][1][57] = 0x40                       ; reg(0)(1)(0x39 => 57)     ADC CM1 is selected for right M
-    { 57,0x40},
-
-#endif
 //			# reg[0][1][121] = 0x33                      ; reg(0)(1)(0x79 => 121)    Quick charge time for Mic inputs
     {121,0x33},
 //			# reg[0][1][122] = 0x01                      ; reg(0)(1)(0x7A => 122)    Vref charge time - 40 ms.
     {122,0x01},
-#if (KITSUNE_CODE==1)
-#if 0
-	{ 51, (4<<0)},
-#endif
-#endif
 };
 
 static const reg_value REG_Section_program2[] = {
@@ -227,13 +201,6 @@ static const reg_value REG_Section_program2[] = {
     { 63,0xC2},
 //			# reg[0][0][64] = 0x00                       ; reg(0)(0)(0x40 => 64)     DAC Left and Right DAC unmuted with indep.  vol. ctrl
     { 64,0x00},
-#if (KITSUNE_CODE==1)
-#if 0
-	// digital volume control
-	{ 65, 0x30},
-	{ 66, 0x30},
-#endif
-#endif
 //			# reg[0][0][81] = 0xd6                      ; reg(0)(0)(0x51 => d6)     ADC Powerup ADC left and right channels in Digital mode(soft-stepping disable)
     { 81,0xD6},
 //			# reg[0][0][82] = 0x00                       ; reg(0)(0)(0x51 => 81)     ADC Powerup ADC left and right channels (soft-stepping disable); reg(0)(0)(0x52 => 82)     ADC Unmute ADC left and right channels,L,R fine gain=0dB
@@ -246,8 +213,6 @@ static const reg_value REG_Section_program2[] = {
     { 45,0x06},
 //			# reg[0][1][46] = 0x0C ; 		-6db
     { 46,0x0C},
-//			# reg[0][1][47] = 0x0C ;
-    { 47,0x0C},
 #if (MUTE_SPK==1)
 	//			# reg[0][1][48] = 0x21 ;   12db
 	{ 48,0x00},
@@ -358,38 +323,6 @@ static const reg_value REG_Section_program2[] = {
 
 //			# reg[0][0][82] = 0
     { 82,0x00},
-#if 0 // AGC
-//			# reg[0][0][86] = 32
-    { 86,0x20},
-//			# reg[0][0][87] = 254
-    { 87,0xFE},
-//			# reg[0][0][88] = 0
-    { 88,0x00},
-//			# reg[0][0][89] = 104
-    { 89,0x68},
-//			# reg[0][0][90] = 168
-    { 90,0xA8},
-//			# reg[0][0][91] = 6
-    { 91,0x06},
-//			# reg[0][0][92] = 0
-    { 92,0x00},
-//			# reg[0][0][84] = 0
-    { 84,0x00},
-//			# reg[0][0][94] = 32
-    { 94,0x20},
-//			# reg[0][0][95] = 254
-    { 95,0xFE},
-//			# reg[0][0][96] = 0
-    { 96,0x00},
-//			# reg[0][0][97] = 104
-    { 97,0x68},
-//			# reg[0][0][98] = 168
-    { 98,0xA8},
-//			# reg[0][0][99] = 6
-    { 99,0x06},
-//			# reg[0][0][100] = 0
-    {100,0x00},
-#endif
 };
 
 const static reg_value miniDSP_A_reg_values[] = {

kitsune/audio_types.h

@@ -13,17 +13,9 @@
 #define MIN_CLASSIFICATION_ENERGY (100)
 
 
-#define AUDIO_FFT_SIZE_2N (8)
-#define AUDIO_FFT_SIZE (1 << AUDIO_FFT_SIZE_2N)
-#define EXPECTED_AUDIO_SAMPLE_RATE_HZ (AUDIO_SAMPLE_RATE)
-
-#define SAMPLE_RATE_IN_HZ (EXPECTED_AUDIO_SAMPLE_RATE_HZ / AUDIO_FFT_SIZE)
+#define SAMPLE_RATE_IN_HZ (66)
 #define SAMPLE_PERIOD_IN_MILLISECONDS  (1000 / SAMPLE_RATE_IN_HZ)
 
-#define NUM_AUDIO_FEATURES (16)
-
-#define OCTOGRAM_SIZE (AUDIO_FFT_SIZE_2N - 1)
-
 /*
  // use simplelink.h instead
 #define TRUE (1)
@@ -37,39 +29,13 @@
 extern "C" {
 #endif
 
-typedef struct {
-    uint16_t psd_min_energy;
-
-} AudioFeaturesOptions_t;
-
-typedef struct {
-    uint16_t min_energy_classification;
-} AudioClassifierOptions_t;
-
-typedef enum {
-    segmentCoherent
-} ESegmentType_t;
-
-typedef struct {
-    int64_t t1;
-    int64_t t2;
-    int32_t duration;
-    ESegmentType_t type;
-
-} Segment_t;
 
 typedef struct {
-	int64_t samplecount;
+    int64_t samplecount;
     int16_t logenergy;
-    int8_t feats4bit[NUM_AUDIO_FEATURES];
 } AudioFeatures_t;
 
 
-/* FOR SAVING AUDIO / UPLOADING AUDIO
- *
- * Yes, some of these flags are mutually exclusive.  Others aren ot.
- */
-
 #define AUDIO_TRANSFER_FLAG_AUTO_CLOSE_OUTPUT     (1 << 0) /* automatically close output stream when done */
 
 
@@ -89,21 +55,18 @@ typedef struct {
 	uint32_t unix_time;
 } DeviceCurrentInfo_t;
 
-typedef struct {
-	int32_t logenergy[OCTOGRAM_SIZE];
-} OctogramResult_t;
 
 typedef struct {
 	int32_t num_disturbances;
 	int32_t num_samples;
 	int32_t peak_energy;
 	int32_t peak_background_energy;
+	int32_t disturbance_time_count;
 	uint8_t isValid;
-} AudioOncePerMinuteData_t;
+} AudioEnergyStats_t;
 
-typedef void (*SegmentAndFeatureCallback_t)(const int16_t * feats, const Segment_t * pSegment);
 typedef void (*AudioFeatureCallback_t)(const AudioFeatures_t * pfeats);
-typedef void (*AudioOncePerMinuteDataCallback_t) (const AudioOncePerMinuteData_t * pdata);
+typedef void (*AudioEnergyStatsCallback_t) (const AudioEnergyStats_t * pdata);
 typedef void (*NotificationCallback_t)(void * context);
 typedef void (*RecordAudioCallback_t)(const AudioCaptureDesc_t * request);