therm Changeset - 91fbdc7bc1b8 · protofusion repositories

Changeset - 91fbdc7bc1b8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 2

Ethan Zonca - 10 years ago 2014-08-24 00:20:24
ez@ethanzonca.com

Moved itoa functions to stringhelpers

4 files changed with 81 insertions and 69 deletions:

Makefile

main.c

stringhelpers.c

stringhelpers.h

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -30,24 +30,25 @@ vpath %.c $(DISCOVERY) $(STD_PERIPH)/src @@
           $(STMLIB)/STM32_USB-FS_Device_Library/Class/hid/src \
           $(STMLIB)/STM32_USB-FS_Device_Library/Core/src
 vpath %.s $(STARTUP)
 ASRC=startup_stm32l1xx_mdp.s
 # Project Source Files
 SRC=main.c
 SRC+=stm32l1xx_it.c
 SRC+=system_stm32l1xx.c
 SRC+=stm32l100c_discovery.c
 SRC+=ssd1306.c
 SRC+=stringhelpers.c
 # Discovery Source Files
 #SRC+=stm32f4_discovery_lis302dl.c
 #SRC+=stm32f4_discovery.c
 #SRC+=stm32f4_discovery_audio_codec.c
 # Standard Peripheral Source Files
 SRC+=stm32l1xx_syscfg.c
 SRC+=misc.c
 SRC+=stm32l1xx_adc.c
 SRC+=stm32l1xx_dac.c
 SRC+=stm32l1xx_dma.c

main.c

➞

Show inline comments

 #include "main.h"
 #include "stm32l100c_discovery.h"
 #include "ssd1306.h"
 // USB includes
 #include "hw_config.h"
 #include "usb_lib.h"
 #include "usb_desc.h"
 #include "usb_pwr.h"
 #include "stringhelpers.h"
 #define SSR_PERIOD 200
 #define LED_POWER GPIOB,GPIO_Pin_9
 #define LED_STAT  GPIOA,GPIO_Pin_15
 #define MAX_CS GPIOB,GPIO_Pin_12
 // TODO: Grab buttonpresses with interrupts
 // TODO: Eliminate screen buffer since we aren't using it...
 #define SW_BTN  GPIOB, GPIO_Pin_3
 #define SW_UP   GPIOB, GPIO_Pin_4
@@ @@ -37,93 +38,24 @@ enum state { @@
     STATE_SETP,
     STATE_SETI,
     STATE_SETD,
     STATE_PREHEAT_BREW,
     STATE_MAINTAIN_BREW,
     STATE_PREHEAT_STEAM,
     STATE_MAINTAIN_STEAM,
 };
 char* itoa(int16_t i, char b[]){
     char const digit[] = "0123456789";
     char* p = b;
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     uint16_t shifter = i;
     do{ //Move to where representation ends
         ++p;
         shifter = shifter/10;
     }while(shifter);
     *p = '\0';
     do{ //Move back, inserting digits as you go
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}
 char* itoa_fp(int16_t i, uint8_t frac, char b[]){
     char const digit[] = "0123456789";
     // set p to beginning of char array
     char* p = b;
     // If negative, set current char to '-' and inc, unnegate number
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     // Init shifter to numeric value
     uint16_t shifter = i;
     uint16_t frac_shifter = frac;
     // Iterate through 10s places, incrementing text pointer as we go
     do{
         ++p;
         shifter = shifter/10;
     }while(shifter);
     ++p; // increment for decimal point
     do{
         ++p;
         frac_shifter = frac_shifter/10;
     }while(frac_shifter);
     // Null-terminate the string
     *p = '\0';
     // Go backwards and write out fractional digits
     do{
         *--p = digit[frac%10];
         frac = frac/10;
     }while(frac);
     *--p = '.'; // insert decimal point
     // Go backwards and write out remaining digits
     do{
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}
 static __IO uint32_t TimingDelay;
 // Move to header file
 void init_gpio();
 void init_spi();
 void process();
 void machine();
 int main(void)
+{

stringhelpers.c

➞

Show inline comments

@@ new file 100644 @@
 #include <inttypes.h>
 char* itoa(int16_t i, char b[]){
     char const digit[] = "0123456789";
     char* p = b;
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     uint16_t shifter = i;
     do{ //Move to where representation ends
         ++p;
         shifter = shifter/10;
     }while(shifter);
     *p = '\0';
     do{ //Move back, inserting digits as you go
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}
 char* itoa_fp(int16_t i, uint8_t frac, char b[]){
     char const digit[] = "0123456789";
     // set p to beginning of char array
     char* p = b;
     // If negative, set current char to '-' and inc, unnegate number
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
     // Init shifter to numeric value
     uint16_t shifter = i;
     uint16_t frac_shifter = frac;
     // Iterate through 10s places, incrementing text pointer as we go
     do{
         ++p;
         shifter = shifter/10;
     }while(shifter);
     ++p; // increment for decimal point
     do{
         ++p;
         frac_shifter = frac_shifter/10;
     }while(frac_shifter);
     // Null-terminate the string
     *p = '\0';
     // Go backwards and write out fractional digits
     do{
         *--p = digit[frac%10];
         frac = frac/10;
     }while(frac);
     *--p = '.'; // insert decimal point
     // Go backwards and write out remaining digits
     do{
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}

stringhelpers.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef STRINGHELPERS_H
 #define STRINGHELPERS_H
 char* itoa(int16_t i, char b[]);
 char* itoa_fp(int16_t i, uint8_t frac, char b[]);
 #endif

0 comments (0 inline, 0 general)