SevenW
Member
The latest windows precompiled IDE does not seem to have the latest libmaple. So I cloned libmaple and more or less expected that I could copy the code into the maple IDE, just like I am used to do with extensions like SDFat. Apparantly not. The folder structure is different. Obviously I have no clue.
Is there some document or forum thread where this is explained?
mlundinse
Member
You have to copy the files from the libmaple folder structure to the more flat maple-ide structure. In the maple ide source distribution there is a script that should do this, but it doesnt work with the present libmaple, at lest not for me under Linux.
If I recall correctly:
libmaple/wirish + libmaple/libmaple --> leaflabs/cores/maple
libmaple/wirish/include + libmaple/libmaple/include --> leaflabs/cores/maple/include (keep the wirish and libmaple subdirectories )
same with usd directories and stm32f1 directories
So basically you combine the wirish and the libmaple folders in libmaple into leaflabs/cores/maple while keeping the subdirectory structure
SevenW
Member
@mlundinse: OK, thanks, that helps understanding it. Handy for copying it back to my git clone as well.
Through another thread I found a pointer to the copy-to-ide bash script. Imanged to run it in Windows, with PowerShell that had been installed with Git for windows:
cd <local libmaple folder>
bash
./support/scripts/copy-to-ide <Full path to maple-ide-0.0.12 folder>
then the script logs:
Copying libmaple source
cp: cannot stat `./libmaple/usb/*.h': No such file or directory
cp: cannot stat `./libmaple/usb/*.c': No such file or directory
cp: cannot stat `./wirish/comm/*.cpp': No such file or directory
cp: cannot stat `./wirish/comm/*.h': No such file or directory
cp: cannot stat `./wirish/boards/*.h': No such file or directory
cp: cannot stat `./wirish/boards/*.cpp': No such file or directory
cp: cannot stat `./support/ld/maple': No such file or directory
cp: cannot stat `./support/ld/maple_mini': No such file or directory
cp: cannot stat `./support/ld/maple_native': No such file or directory
cp: cannot stat `./support/ld/maple_RET6': No such file or directory
cp: cannot stat `./support/ld/names.inc': No such file or directory
Copying over libraries
Creating libmaple-version.txt
Done.
I suspect that the script is not updated with refactorings in libmaple folder structure. Indeed I seem to be missing some files/folders. I see whether I can fix the script and test further.
SevenW
Member
I am stuck now on this. I figured out some bits, but don't know what to do with stm32fx folders and stuff from support/ld.
This is my understanding sofar:
- source files go directly in hardware/leaflabs/cores/maple
- include files go into a subfolder named after the source location (libmaple or wirish)
folder structure in hardware/leaflabs/cores/maple:
libmaple
wirish
board
usb
series #from stm32f1/include
when I add the stm32f1 folder, I get a build error:
\hardware\leaflabs\cores\maple\stm32f1\performance\isrs.S:29: fatal error: libmaple/stm32.h: No such file or directory
when I remove them various definitions such as ADC3 and GPIOA are not found.
mlundinse
Member
as you se several .c and .h files appearwith the same name in different places
containg more specialized definitions or functions in the specifically named subdirectories
.h files found among .c and .cpp files, often called xxx_private.h should be kept with the .c and .cpp files and not be moved to the include directories.
The files in the include directory are the files found originally in libmaple/include/libmaple and wirish/include/wirish and they should be in cores/maple/inclue/libmaple and cores/maple/include/wirish, except for the WProgram.h found in cores/maple/include/
SevenW
Member
so folder structure should be:
cores/maple //many source files
cores/maple/include //WProgram.h
cores/maple/include/libmaple
cores/maple/include/wirish
cores/maple/stm32f1/
cores/maple/stm32f1/include/series
cores/maple/usbmy IDE does not search the include path. So apparantly this needs to be configured somewhere in the IDE (compiler oprions?)
And what do I do with the things in support/ld?
mlundinse
Member
I am a bit embarrased, but I have been looking in a folder where I been working to set up a recent version of libmaple for maple-ide, just as you. I have now rechecked the status.
Maple IDE uses a single flat directory with folder containing the board specific limker files. Keep thoose from the original IDE structure.
The newer libmaple have refactored to old code into several files in different directories with same name. So there are two choises:
Move files from subdirectories and rename them to not conflict with other files of the same name. Fixup include directives in the source files. This is a bit of messy work but possible ( I did it before reverting to second method below).
or ...
patch the IDE to use the libmaple structure. I have worked on that but never got around to clean it up and really package it for easy use. I use it myself under Linux. So I will try and clean it up and push it to Githib later this weekend.
Sorry for the confusin, I thought it could be done simply and had forgotten my own previous problems.
Regards
Magnus
mlundinse
Member
I have updated my github repo for Maple IDE to reflect my current working copy.
https://github.com/mlu/maple-ide/commits/master
This version also uses the latest versions of the arm-none-eabi toolchain
I have only built this under Linux (Fedora 18) and the instructions has not been tested by anyone else as far as I know. It is a bit of a mess but it works for me as it is.
SevenW
Member
@mlundinse: Thanks for the quick reply.
So the pre-build maplIDE0.0.12 is basically incompatible with the libmaple master branch. I then expect that the maple-ide master brach is compatible with libmaple master. Or at least your fork of maple-ide.
It would involve building maple-ide on Windows (for me), and that might be a bit of a challenge as well.
How nice would it be to have a pre-build latest maple-ide?
Thanks
SevenW
mlundinse
Member
Yes, a prebuilt new version would be great.
The build is really compiling the java stuff in the application, that can be done under windows without installing the gcc, just using a full java dev version.
I dont have that setup for windows at the moment, but the windows/make.sh contains all the commands to build the IDE.
@SevenW
IMHO, it seems to be much less pain to set up the unix toolchain
http://leaflabs.com/docs/unix-toolchain.html
http://static.leaflabs.com/pub/leaflabs/maple-docs/snapshots/2012-09-04/unix-toolchain-win-setup.html
and use the example project template
https://github.com/mbolivar/example-libmaple-project
with your code editor of choice,
than to hack the current IDE.
You must log in to post.
