therm-ng Changeset - 667b32311f8f · protofusion repositories

Changeset - 667b32311f8f

Parent rev.

Child rev.

[Not reviewed]

default

19 4 15

Ethan Zonca - 8 years ago 2017-06-23 12:34:32
ezonca@sealandaire.com

Reorganize structure and cleanup

23 files changed with 8 insertions and 172 deletions:

.cproject

inc/buttons.h

inc/config.h

inc/dma.h

inc/system/error.h

rename

inc/system/flash.h

rename

inc/system/gpio.h

rename

inc/system/interrupts.h

rename

inc/system/system.h

rename

inc/system/watchdog.h

rename

lib/ssd1306/ssd1306.c

rename

lib/ssd1306/ssd1306.h

rename

src/buttons.c

src/display.c

src/dma.c

src/main.c

src/system/error.c

rename

src/system/flash.c

rename

src/system/gpio.c

rename

src/system/interrupts.c

rename

src/system/sbrk.c

rename

src/system/system.c

rename

src/system/watchdog.c

rename

0 comments (0 inline, 0 general)

.cproject

➞

Show inline comments

@@ @@ -56,7 +56,9 @@ @@
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.119815874" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/STM32F3xx_HAL_Driver/Inc}&quot;"/>
@@ @@ -70,7 +72,9 @@ @@
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.1718280814" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/STM32F3xx_HAL_Driver/Inc}&quot;"/>
@@ @@ -84,6 +88,8 @@ @@
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1649547949" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/lib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/inc/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CMSIS/Device/ST/STM32F3xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ldscripts/STM32F302K8_FLASH.ld}&quot;"/>

inc/buttons.h

➞

Show inline comments

deleted file

inc/config.h

➞

Show inline comments

@@ @@ -30,16 +30,8 @@ @@
 #define LED_POWER GPIOF,GPIO_PIN_0
 #define MAX_CS GPIOA,GPIO_PIN_15
 #define SW_BTN  GPIOB, GPIO_PIN_4
 #define SW_UP   GPIOB, GPIO_PIN_7
 #define SW_DOWN GPIOB, GPIO_PIN_3
 #define SW_LEFT GPIOB, GPIO_PIN_5
 #define SW_RIGHT GPIOB, GPIO_PIN_6
 #define SSR_PIN GPIOA, GPIO_PIN_1
 // Visual niceness
 #define hal_init() HAL_Init()
 // Add bootloader option to top of idle screen menu
 #define BOOTLOADER_SHORTCUT

inc/dma.h

➞

Show inline comments

deleted file

inc/system/error.h

➞

Show inline comments

file renamed from inc/error.h to inc/system/error.h

inc/system/flash.h

➞

Show inline comments

file renamed from inc/flash.h to inc/system/flash.h

inc/system/gpio.h

➞

Show inline comments

file renamed from inc/gpio.h to inc/system/gpio.h

inc/system/interrupts.h

➞

Show inline comments

file renamed from inc/interrupts.h to inc/system/interrupts.h

inc/system/system.h

➞

Show inline comments

file renamed from inc/system.h to inc/system/system.h

inc/system/watchdog.h

➞

Show inline comments

file renamed from inc/watchdog.h to inc/system/watchdog.h

lib/ssd1306/ssd1306.c

➞

Show inline comments

file renamed from src/ssd1306.c to lib/ssd1306/ssd1306.c

lib/ssd1306/ssd1306.h

➞

Show inline comments

file renamed from inc/ssd1306.h to lib/ssd1306/ssd1306.h

src/buttons.c

➞

Show inline comments

deleted file

src/display.c

➞

Show inline comments

 #include "display.h"
 #include "gpio.h"
 #include "ssd1306.h"
+#include "ssd1306/ssd1306.h"
 #include "system/stringhelpers.h"
 #include "flash.h"

src/dma.c

➞

Show inline comments

deleted file

src/main.c

➞

Show inline comments

@@ @@ -14,10 +14,8 @@ @@
 #include "pid.h"
 #include "error.h"
 #include "flash.h"
 #include "ssd1306.h"
 #include "dma.h"
 #include "ssd1306/ssd1306.h"
 #include "interrupts.h"
 #include "buttons.h"
 therm_settings_t set;

src/system/error.c

➞

Show inline comments

file renamed from src/error.c to src/system/error.c

src/system/flash.c

➞

Show inline comments

file renamed from src/flash.c to src/system/flash.c

src/system/gpio.c

➞

Show inline comments

file renamed from src/gpio.c to src/system/gpio.c

src/system/interrupts.c

➞

Show inline comments

file renamed from src/interrupts.c to src/system/interrupts.c

src/system/sbrk.c

➞

Show inline comments

file renamed from src/sbrk.c to src/system/sbrk.c

src/system/system.c

➞

Show inline comments

file renamed from src/system.c to src/system/system.c

src/system/watchdog.c

➞

Show inline comments

file renamed from src/watchdog.c to src/system/watchdog.c

0 comments (0 inline, 0 general)