Declarations on one line

ideoforms · ideoforms · commit c16ad45c70ba · 2019-08-09T13:14:12.000+01:00
diff --git a/examples/ESP32Receive/ESP32Receive.ino b/examples/ESP32Receive/ESP32Receive.ino
@@ -58,8 +58,7 @@ void setupAudioInput(int sample_rate);
 
 // Function declarations -------------------------------------------------------
 
-void
-setup()
+void setup()
 {
   pinMode(LED_PIN, OUTPUT);
   digitalWrite(LED_PIN, LOW);
@@ -70,8 +69,7 @@ setup()
   xTaskCreate(initTask, "initTask", 16384, NULL, 1, NULL);
 }
 
-void
-loop()
+void loop()
 {
   esp_err_t audioError;
   chirp_connect_error_code_t chirpError;
@@ -85,8 +83,7 @@ loop()
 
 // RTOS Tasks ------------------------------------------------------------------
 
-void
-initTask(void *parameter)
+void initTask(void *parameter)
 {
   setupChirp();
 
@@ -99,8 +96,7 @@ initTask(void *parameter)
   vTaskDelete(NULL);
 }
 
-void
-processInputTask(void *parameter)
+void processInputTask(void *parameter)
 {
   esp_err_t audioError;
   chirp_connect_error_code_t chirpError;
@@ -128,22 +124,19 @@ processInputTask(void *parameter)
 
 // Chirp -----------------------------------------------------------------------
 
-void
-onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)
+void onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)
 {
   currentState = current;
   Serial.printf("State changed from %d to %d\n", previous, current);
 }
 
-void
-onReceivingCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
+void onReceivingCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
 {
   Serial.println("Receiving data...");
   digitalWrite(LED_PIN, HIGH);
 }
 
-void
-onReceivedCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
+void onReceivedCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
 {
   if (payload)
   {
@@ -159,8 +152,7 @@ onReceivedCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel
   }
 }
 
-void
-setupChirp()
+void setupChirp()
 {
   chirp = new_chirp_connect(CHIRP_APP_KEY, CHIRP_APP_SECRET);
   if (chirp == NULL)
@@ -189,8 +181,7 @@ setupChirp()
   Serial.println("Chirp Connect initialised.");
 }
 
-void
-chirpErrorHandler(chirp_connect_error_code_t code)
+void chirpErrorHandler(chirp_connect_error_code_t code)
 {
   if (code != CHIRP_CONNECT_OK)
   {
@@ -202,8 +193,7 @@ chirpErrorHandler(chirp_connect_error_code_t code)
 
 // I2S Audio -------------------------------------------------------------------
 
-void
-setupAudioInput(int sample_rate)
+void setupAudioInput(int sample_rate)
 {
   /*
      Set up I2S audio for SPH0645 microphone
diff --git a/examples/ESP32Send/ESP32Send.ino b/examples/ESP32Send/ESP32Send.ino
@@ -51,8 +51,7 @@ void setupAudioOutput(int sample_rate);
 
 // Function declarations -------------------------------------------------------
 
-void
-setup()
+void setup()
 {
   pinMode(LED_PIN, OUTPUT);
   digitalWrite(LED_PIN, LOW);
@@ -65,8 +64,7 @@ setup()
   xTaskCreate(initTask, "initTask", 16384, NULL, 1, NULL);
 }
 
-void
-loop()
+void loop()
 {
   esp_err_t audioError;
   chirp_connect_error_code_t chirpError;
@@ -88,16 +86,14 @@ loop()
   }
 }
 
-void
-IRAM_ATTR handleInterrupt()
+void IRAM_ATTR handleInterrupt()
 {
   buttonPressed = true;
 }
 
 // Tasks -----------------------------------------------------------------------
 
-void
-initTask(void *parameter)
+void initTask(void *parameter)
 {
   setupChirp();
 
@@ -109,8 +105,7 @@ initTask(void *parameter)
   vTaskDelete(NULL);
 }
 
-void
-processOutputTask(void *parameter)
+void processOutputTask(void *parameter)
 {
   esp_err_t audioError;
   chirp_connect_error_code_t chirpError;
@@ -135,8 +130,7 @@ processOutputTask(void *parameter)
 
 // Chirp -----------------------------------------------------------------------
 
-void
-onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)
+void onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)
 {
   currentState = current;
   Serial.printf("State changed from %d to %d\n", previous, current);
@@ -149,17 +143,15 @@ onSendingCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
   digitalWrite(LED_PIN, HIGH);
 }
 
-void
-onSentCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
+void onSentCallback(void *chirp, uint8_t *payload, size_t length, uint8_t channel)
 {
   char *data = chirp_connect_as_string((chirp_connect_t *)chirp, payload, length);
   Serial.printf("Send data: %s\n", data);
   digitalWrite(LED_PIN, LOW);
   chirp_connect_free(data);
 }
 
-void
-setupChirp()
+void setupChirp()
 {
   chirp = new_chirp_connect(CHIRP_APP_KEY, CHIRP_APP_SECRET);
   if (chirp == NULL)
@@ -191,8 +183,7 @@ setupChirp()
   Serial.println("Chirp SDK initialised.");
 }
 
-void
-chirpErrorHandler(chirp_connect_error_code_t code)
+void chirpErrorHandler(chirp_connect_error_code_t code)
 {
   if (code != CHIRP_CONNECT_OK)
   {
@@ -204,8 +195,7 @@ chirpErrorHandler(chirp_connect_error_code_t code)
 
 // I2S Audio -------------------------------------------------------------------
 
-void
-setupAudioOutput(int sample_rate)
+void setupAudioOutput(int sample_rate)
 {
   /*
      Set up I2S audio for UDA1334 DAC output
diff --git a/examples/Nano33SenseSend/Nano33SenseSend.ino b/examples/Nano33SenseSend/Nano33SenseSend.ino
@@ -152,8 +152,7 @@ void sendChirp()
 
 // I2S Audio -------------------------------------------------------------------
 
-void
-i2s_init()
+void i2s_init()
 {
   // Enable clocks
   NRF_I2S->CONFIG.TXEN = I2S_CONFIG_TXEN_TXEN_Enabled << I2S_CONFIG_TXEN_TXEN_Pos;
@@ -187,8 +186,7 @@ i2s_init()
   NRF_I2S->PSEL.SDOUT = I2S_DATA_PIN << I2S_PSEL_SDOUT_PIN_Pos;
 }
 
-void
-i2s_start()
+void i2s_start()
 {
   NRF_I2S->ENABLE = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ void setupAudioInput(int sample_rate);`
`58`	`58`
`59`	`59`	`// Function declarations -------------------------------------------------------`
`60`	`60`
`61`		`-void`
`62`		`-setup()`
	`61`	`+void setup()`
`63`	`62`	`{`
`64`	`63`	`pinMode(LED_PIN, OUTPUT);`
`65`	`64`	`digitalWrite(LED_PIN, LOW);`
`@@ -70,8 +69,7 @@ setup()`
`70`	`69`	`xTaskCreate(initTask, "initTask", 16384, NULL, 1, NULL);`
`71`	`70`	`}`
`72`	`71`
`73`		`-void`
`74`		`-loop()`
	`72`	`+void loop()`
`75`	`73`	`{`
`76`	`74`	`esp_err_t audioError;`
`77`	`75`	`chirp_connect_error_code_t chirpError;`
`@@ -85,8 +83,7 @@ loop()`
`85`	`83`
`86`	`84`	`// RTOS Tasks ------------------------------------------------------------------`
`87`	`85`
`88`		`-void`
`89`		`-initTask(void *parameter)`
	`86`	`+void initTask(void *parameter)`
`90`	`87`	`{`
`91`	`88`	`setupChirp();`
`92`	`89`
`@@ -99,8 +96,7 @@ initTask(void *parameter)`
`99`	`96`	`vTaskDelete(NULL);`
`100`	`97`	`}`
`101`	`98`
`102`		`-void`
`103`		`-processInputTask(void *parameter)`
	`99`	`+void processInputTask(void *parameter)`
`104`	`100`	`{`
`105`	`101`	`esp_err_t audioError;`
`106`	`102`	`chirp_connect_error_code_t chirpError;`
`@@ -128,22 +124,19 @@ processInputTask(void *parameter)`
`128`	`124`
`129`	`125`	`// Chirp -----------------------------------------------------------------------`
`130`	`126`
`131`		`-void`
`132`		`-onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)`
	`127`	`+void onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)`
`133`	`128`	`{`
`134`	`129`	`currentState = current;`
`135`	`130`	`Serial.printf("State changed from %d to %d\n", previous, current);`
`136`	`131`	`}`
`137`	`132`
`138`		`-void`
`139`		`-onReceivingCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
	`133`	`+void onReceivingCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
`140`	`134`	`{`
`141`	`135`	`Serial.println("Receiving data...");`
`142`	`136`	`digitalWrite(LED_PIN, HIGH);`
`143`	`137`	`}`
`144`	`138`
`145`		`-void`
`146`		`-onReceivedCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
	`139`	`+void onReceivedCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
`147`	`140`	`{`
`148`	`141`	`if (payload)`
`149`	`142`	`{`
`@@ -159,8 +152,7 @@ onReceivedCallback(void chirp, uint8_t payload, size_t length, uint8_t channel`
`159`	`152`	`}`
`160`	`153`	`}`
`161`	`154`
`162`		`-void`
`163`		`-setupChirp()`
	`155`	`+void setupChirp()`
`164`	`156`	`{`
`165`	`157`	`chirp = new_chirp_connect(CHIRP_APP_KEY, CHIRP_APP_SECRET);`
`166`	`158`	`if (chirp == NULL)`
`@@ -189,8 +181,7 @@ setupChirp()`
`189`	`181`	`Serial.println("Chirp Connect initialised.");`
`190`	`182`	`}`
`191`	`183`
`192`		`-void`
`193`		`-chirpErrorHandler(chirp_connect_error_code_t code)`
	`184`	`+void chirpErrorHandler(chirp_connect_error_code_t code)`
`194`	`185`	`{`
`195`	`186`	`if (code != CHIRP_CONNECT_OK)`
`196`	`187`	`{`
`@@ -202,8 +193,7 @@ chirpErrorHandler(chirp_connect_error_code_t code)`
`202`	`193`
`203`	`194`	`// I2S Audio -------------------------------------------------------------------`
`204`	`195`
`205`		`-void`
`206`		`-setupAudioInput(int sample_rate)`
	`196`	`+void setupAudioInput(int sample_rate)`
`207`	`197`	`{`
`208`	`198`	`/*`
`209`	`199`	`Set up I2S audio for SPH0645 microphone`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ void setupAudioOutput(int sample_rate);`
`51`	`51`
`52`	`52`	`// Function declarations -------------------------------------------------------`
`53`	`53`
`54`		`-void`
`55`		`-setup()`
	`54`	`+void setup()`
`56`	`55`	`{`
`57`	`56`	`pinMode(LED_PIN, OUTPUT);`
`58`	`57`	`digitalWrite(LED_PIN, LOW);`
`@@ -65,8 +64,7 @@ setup()`
`65`	`64`	`xTaskCreate(initTask, "initTask", 16384, NULL, 1, NULL);`
`66`	`65`	`}`
`67`	`66`
`68`		`-void`
`69`		`-loop()`
	`67`	`+void loop()`
`70`	`68`	`{`
`71`	`69`	`esp_err_t audioError;`
`72`	`70`	`chirp_connect_error_code_t chirpError;`
`@@ -88,16 +86,14 @@ loop()`
`88`	`86`	`}`
`89`	`87`	`}`
`90`	`88`
`91`		`-void`
`92`		`-IRAM_ATTR handleInterrupt()`
	`89`	`+void IRAM_ATTR handleInterrupt()`
`93`	`90`	`{`
`94`	`91`	`buttonPressed = true;`
`95`	`92`	`}`
`96`	`93`
`97`	`94`	`// Tasks -----------------------------------------------------------------------`
`98`	`95`
`99`		`-void`
`100`		`-initTask(void *parameter)`
	`96`	`+void initTask(void *parameter)`
`101`	`97`	`{`
`102`	`98`	`setupChirp();`
`103`	`99`
`@@ -109,8 +105,7 @@ initTask(void *parameter)`
`109`	`105`	`vTaskDelete(NULL);`
`110`	`106`	`}`
`111`	`107`
`112`		`-void`
`113`		`-processOutputTask(void *parameter)`
	`108`	`+void processOutputTask(void *parameter)`
`114`	`109`	`{`
`115`	`110`	`esp_err_t audioError;`
`116`	`111`	`chirp_connect_error_code_t chirpError;`
`@@ -135,8 +130,7 @@ processOutputTask(void *parameter)`
`135`	`130`
`136`	`131`	`// Chirp -----------------------------------------------------------------------`
`137`	`132`
`138`		`-void`
`139`		`-onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)`
	`133`	`+void onStateChangedCallback(void *chirp, chirp_connect_state_t previous, chirp_connect_state_t current)`
`140`	`134`	`{`
`141`	`135`	`currentState = current;`
`142`	`136`	`Serial.printf("State changed from %d to %d\n", previous, current);`
`@@ -149,17 +143,15 @@ onSendingCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
`149`	`143`	`digitalWrite(LED_PIN, HIGH);`
`150`	`144`	`}`
`151`	`145`
`152`		`-void`
`153`		`-onSentCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
	`146`	`+void onSentCallback(void chirp, uint8_t payload, size_t length, uint8_t channel)`
`154`	`147`	`{`
`155`	`148`	`char data = chirp_connect_as_string((chirp_connect_t )chirp, payload, length);`
`156`	`149`	`Serial.printf("Send data: %s\n", data);`
`157`	`150`	`digitalWrite(LED_PIN, LOW);`
`158`	`151`	`chirp_connect_free(data);`
`159`	`152`	`}`
`160`	`153`
`161`		`-void`
`162`		`-setupChirp()`
	`154`	`+void setupChirp()`
`163`	`155`	`{`
`164`	`156`	`chirp = new_chirp_connect(CHIRP_APP_KEY, CHIRP_APP_SECRET);`
`165`	`157`	`if (chirp == NULL)`
`@@ -191,8 +183,7 @@ setupChirp()`
`191`	`183`	`Serial.println("Chirp SDK initialised.");`
`192`	`184`	`}`
`193`	`185`
`194`		`-void`
`195`		`-chirpErrorHandler(chirp_connect_error_code_t code)`
	`186`	`+void chirpErrorHandler(chirp_connect_error_code_t code)`
`196`	`187`	`{`
`197`	`188`	`if (code != CHIRP_CONNECT_OK)`
`198`	`189`	`{`
`@@ -204,8 +195,7 @@ chirpErrorHandler(chirp_connect_error_code_t code)`
`204`	`195`
`205`	`196`	`// I2S Audio -------------------------------------------------------------------`
`206`	`197`
`207`		`-void`
`208`		`-setupAudioOutput(int sample_rate)`
	`198`	`+void setupAudioOutput(int sample_rate)`
`209`	`199`	`{`
`210`	`200`	`/*`
`211`	`201`	`Set up I2S audio for UDA1334 DAC output`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,7 @@ void sendChirp()`
`152`	`152`
`153`	`153`	`// I2S Audio -------------------------------------------------------------------`
`154`	`154`
`155`		`-void`
`156`		`-i2s_init()`
	`155`	`+void i2s_init()`
`157`	`156`	`{`
`158`	`157`	`// Enable clocks`
`159`	`158`	`NRF_I2S->CONFIG.TXEN = I2S_CONFIG_TXEN_TXEN_Enabled << I2S_CONFIG_TXEN_TXEN_Pos;`
`@@ -187,8 +186,7 @@ i2s_init()`
`187`	`186`	`NRF_I2S->PSEL.SDOUT = I2S_DATA_PIN << I2S_PSEL_SDOUT_PIN_Pos;`
`188`	`187`	`}`
`189`	`188`
`190`		`-void`
`191`		`-i2s_start()`
	`189`	`+void i2s_start()`
`192`	`190`	`{`
`193`	`191`	`NRF_I2S->ENABLE = 1;`
`194`	`192`