Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ESP32: Console output can be disabled

This commit is contained in:
murata 2022-03-21 18:26:05 +09:00 committed by Andrew Tridgell
parent 1e485c20fc
commit 9d2ffdc028
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_HAL_ESP32/AnalogIn.cpp
View File

@ -179,7 +179,7 @@ bool AnalogSource::set_pin(uint8_t ardupin)
int8_t pinconfig_offset = AnalogIn::find_pinconfig(ardupin); int8_t pinconfig_offset = AnalogIn::find_pinconfig(ardupin);
if (pinconfig_offset == -1 ) { if (pinconfig_offset == -1 ) {
hal.console->printf("AnalogIn: sorry set_pin() can't determine ADC1 offset from ardupin : %d \n",ardupin); DEV_PRINTF("AnalogIn: sorry set_pin() can't determine ADC1 offset from ardupin : %d \n",ardupin);
return false; return false;
} }
@ -208,7 +208,7 @@ bool AnalogSource::set_pin(uint8_t ardupin)
esp_adc_cal_characterize(ADC_UNIT_1, atten, ADC_WIDTH_BIT_12, DEFAULT_VREF, &adc_chars); esp_adc_cal_characterize(ADC_UNIT_1, atten, ADC_WIDTH_BIT_12, DEFAULT_VREF, &adc_chars);
printf("AnalogIn: Adding gpio on: %d\n", gpio); printf("AnalogIn: Adding gpio on: %d\n", gpio);
hal.console->printf("AnalogIn: set_pin() FROM (ardupin:%d adc1_offset:%d gpio:%d) TO (ardupin:%d adc1_offset:%d gpio:%d)\n", \ DEV_PRINTF("AnalogIn: set_pin() FROM (ardupin:%d adc1_offset:%d gpio:%d) TO (ardupin:%d adc1_offset:%d gpio:%d)\n", \
_ardupin,_pin,_gpio,ardupin,newgpioAdcPin,gpio); _ardupin,_pin,_gpio,ardupin,newgpioAdcPin,gpio);
_pin = newgpioAdcPin; _pin = newgpioAdcPin;
_ardupin = ardupin; _ardupin = ardupin;
@ -336,7 +336,7 @@ AP_HAL::AnalogSource *AnalogIn::channel(int16_t ardupin)
float scaler = -1; float scaler = -1;
if ((ardupin != ANALOG_INPUT_NONE) && (pinconfig_offset == -1 )) { if ((ardupin != ANALOG_INPUT_NONE) && (pinconfig_offset == -1 )) {
hal.console->printf("AnalogIn: sorry channel() can't determine ADC1 offset from ardupin : %d \n",ardupin); DEV_PRINTF("AnalogIn: sorry channel() can't determine ADC1 offset from ardupin : %d \n",ardupin);
ardupin = ANALOG_INPUT_NONE; // default it to this not terrible value and allow to continue ardupin = ANALOG_INPUT_NONE; // default it to this not terrible value and allow to continue
} }
// although ANALOG_INPUT_NONE=255 is not a valid pin, we let it through here as // although ANALOG_INPUT_NONE=255 is not a valid pin, we let it through here as
@ -351,18 +351,18 @@ AP_HAL::AnalogSource *AnalogIn::channel(int16_t ardupin)
_channels[j] = new AnalogSource(ardupin,gpioAdcPin, scaler,0.0f,1); _channels[j] = new AnalogSource(ardupin,gpioAdcPin, scaler,0.0f,1);
if (ardupin != ANALOG_INPUT_NONE) { if (ardupin != ANALOG_INPUT_NONE) {
hal.console->printf("AnalogIn: channel:%d attached to ardupin:%d at adc1_offset:%d on gpio:%d\n",\ DEV_PRINTF("AnalogIn: channel:%d attached to ardupin:%d at adc1_offset:%d on gpio:%d\n",\
j,ardupin, gpioAdcPin, _channels[j]->_gpio); j,ardupin, gpioAdcPin, _channels[j]->_gpio);
} }
if (ardupin == ANALOG_INPUT_NONE) { if (ardupin == ANALOG_INPUT_NONE) {
hal.console->printf("AnalogIn: channel:%d created but using delayed adc and gpio pin configuration\n",j ); DEV_PRINTF("AnalogIn: channel:%d created but using delayed adc and gpio pin configuration\n",j );
} }
return _channels[j]; return _channels[j];
} }
} }
hal.console->printf("AnalogIn: out of channels\n"); DEV_PRINTF("AnalogIn: out of channels\n");
return nullptr; return nullptr;
} }

2
libraries/AP_HAL_ESP32/Storage.cpp
View File

@ -156,7 +156,7 @@ bool Storage::_flash_write_data(uint8_t sector, uint32_t offset, const uint8_t *
if (now - _last_re_init_ms > 5000) { if (now - _last_re_init_ms > 5000) {
_last_re_init_ms = now; _last_re_init_ms = now;
bool ok = _flash.re_initialise(); bool ok = _flash.re_initialise();
hal.console->printf("Storage: failed at %u:%u for %u - re-init %u\n", DEV_PRINTF("Storage: failed at %u:%u for %u - re-init %u\n",
(unsigned)sector, (unsigned)offset, (unsigned)length, (unsigned)ok); (unsigned)sector, (unsigned)offset, (unsigned)length, (unsigned)ok);
#ifdef STORAGEDEBUG #ifdef STORAGEDEBUG
printf("Storage: failed at %u:%u for %u - re-init %u\n", printf("Storage: failed at %u:%u for %u - re-init %u\n",