Skip to content

Commit

Permalink
Update to FatFS 0.1, add touch support
Browse files Browse the repository at this point in the history
  • Loading branch information
@x893
x893 committed Feb 10, 2014
1 parent 94d883a commit 5ca2a4c
Show file tree
Hide file tree
Showing 38 changed files with 2,590 additions and 2,136 deletions.
144 changes: 134 additions & 10 deletions cnc.uvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,11 @@
</GroupArmAds>
</GroupOption>
<Files>
<File>
<FileName>startup_stm32f429_439xx.s</FileName>
<FileType>2</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\startup_stm32f429_439xx.s</FilePath>
</File>
<File>
<FileName>system_stm32f4xx.c</FileName>
<FileType>1</FileType>
Expand Down Expand Up @@ -781,6 +786,11 @@
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\stm32f429i_discovery_sdram.c</FilePath>
</File>
<File>
<FileName>stm32f429i_discovery_ioe.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\stm32f429i_discovery_ioe.c</FilePath>
</File>
<File>
<FileName>usb_bsp.c</FileName>
<FileType>1</FileType>
Expand All @@ -791,11 +801,6 @@
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\usbh_usr.c</FilePath>
</File>
<File>
<FileName>startup_stm32f429_439xx.s</FileName>
<FileType>2</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\startup_stm32f429_439xx.s</FilePath>
</File>
<File>
<FileName>ff.c</FileName>
<FileType>1</FileType>
Expand Down Expand Up @@ -957,6 +962,63 @@
</Group>
<Group>
<GroupName>STM32_USB_HOST_Library</GroupName>
<GroupOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<GroupArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
<Aads>
<interw>2</interw>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<thumb>2</thumb>
<SplitLS>2</SplitLS>
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Aads>
</GroupArmAds>
</GroupOption>
<Files>
<File>
<FileName>usbh_msc_bot.c</FileName>
Expand Down Expand Up @@ -1002,6 +1064,63 @@
</Group>
<Group>
<GroupName>STM32_USB_OTG_Driver</GroupName>
<GroupOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<GroupArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
<Aads>
<interw>2</interw>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<thumb>2</thumb>
<SplitLS>2</SplitLS>
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Aads>
</GroupArmAds>
</GroupOption>
<Files>
<File>
<FileName>usb_core.c</FileName>
Expand Down Expand Up @@ -1793,6 +1912,11 @@
<Group>
<GroupName>STM32F429-DISCO</GroupName>
<Files>
<File>
<FileName>startup_stm32f429_439xx.s</FileName>
<FileType>2</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\startup_stm32f429_439xx.s</FilePath>
</File>
<File>
<FileName>system_stm32f4xx.c</FileName>
<FileType>1</FileType>
Expand All @@ -1813,6 +1937,11 @@
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\stm32f429i_discovery_sdram.c</FilePath>
</File>
<File>
<FileName>stm32f429i_discovery_ioe.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\stm32f429i_discovery_ioe.c</FilePath>
</File>
<File>
<FileName>usb_bsp.c</FileName>
<FileType>1</FileType>
Expand All @@ -1823,11 +1952,6 @@
<FileType>1</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\usbh_usr.c</FilePath>
</File>
<File>
<FileName>startup_stm32f429_439xx.s</FileName>
<FileType>2</FileType>
<FilePath>.\src\libhardware\STM32F429I-DISCO\startup_stm32f429_439xx.s</FilePath>
</File>
<File>
<FileName>ff.c</FileName>
<FileType>1</FileType>
Expand Down
3 changes: 2 additions & 1 deletion src/application/gcode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,10 @@ uint8_t gc_execute_line(char *line)
char letter;
double value, oldPosition[3], dx, dy, dz, moveLength, offset[3], radius = 0;
int pause_value = 0;
gc.status_code = GCSTATUS_OK;
uint8_t radius_mode = false;

gc.status_code = GCSTATUS_OK;

if (line[0] == ';'
|| line[0] == '('
|| line[0] == '%'
Expand Down
Loading

0 comments on commit 5ca2a4c

Please sign in to comment.