minor clean up

This commit is contained in:
hathach 2023-02-06 16:11:37 +07:00
parent 5837ad98fa
commit bcfb07c748
No known key found for this signature in database
GPG key ID: F5D50C6D51D17CBA
3 changed files with 13 additions and 15 deletions

View file

@ -35,17 +35,6 @@ pinmap pinmapping[] = {
static volatile uint32_t _millis = 0;
void Serial_printf(const char format[], ...) {
char buf[256];
va_list ap;
va_start(ap, format);
vsnprintf(buf, sizeof(buf), format, ap);
tud_cdc_write(buf, strlen(buf));
va_end(ap);
tud_cdc_write_flush();
}
void board_timer_handler(void) {
_millis++;
}
@ -64,7 +53,6 @@ void delay(uint32_t ms) {
}
static pinmap *getMapping(uint32_t pinnum) {
pinmap *pindeets = NULL;

View file

@ -59,7 +59,7 @@ typedef struct _pinmapping {
bool adc_inited; // inited as adc
} pinmap;
void Serial_printf(const char format[], ...) __attribute__ ((format (printf, 1, 0)));
//void Serial_printf(const char format[], ...) __attribute__ ((format (printf, 1, 0)));
uint32_t millis(void);
void delay(uint32_t ms);
void digitalWrite(uint32_t pinnum, bool value);
@ -69,3 +69,5 @@ void pinMode(uint32_t pinnum, uint8_t state);
void setColor(uint32_t color);
uint32_t neoWheel(uint8_t WheelPos);
uint32_t makeColor(uint8_t r, uint8_t g, uint8_t b);
#define Serial_printf(...) do { printf(__VA_ARGS__); tud_cdc_write_flush(); } while(0)

View file

@ -39,7 +39,10 @@
void loop(void);
uint8_t all_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, PIN_SDA, PIN_SCL, PIN_MOSI, PIN_MISO, PIN_SCK, AD5};
uint8_t all_pins[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
PIN_SDA, PIN_SCL, PIN_MOSI, PIN_MISO, PIN_SCK, AD5
};
bool test = true;
@ -66,6 +69,11 @@ int main(void)
setColor(0);
pinMode(13, OUTPUT);
// wait for Serial connection
if (test) {
while( !tud_cdc_connected() ) tud_task();
}
while (1) {
loop();
tud_task();
@ -100,7 +108,7 @@ void loop(void) {
}
delay(100);
Serial_printf("\n\r\n\rHello Metro M7 iMX RT1011 Test! %d\n\r", millis());
Serial_printf("\n\r\n\rHello Metro M7 iMX RT1011 Test! %lu\n\r", millis());
#if 0
if ( !testpins(0, 2, all_pins, sizeof(all_pins))) return;