Any way to disable merge with boot loader on upload

Hi,
Ive amended my boards.txt file as follows to allow me the full 32k on the Yun. This works nicely and I can then take the .hex file from the tmp directory. mount a usb stick, ssh into the Yun and run-avrdude /mnt/sda1/filename.hex to upload the file. But I do find having to do all this slows me down.

I can still upload sketches over wifi even with the bootloader as long as they aren't more tun 87% of the yuns available memory. But I would like to know if its possible to change some files in the IDE to disable the merge lua with boot loader feature allowing me to directly upload my 32k programs to the Yun.

As far as I can see the wifi upload just copies the files to the Yun, then uses run-avr dude so all the boot loader stuff must be happening in the IDE

anyone know what files to edit to stop it merging?

    ##############################################################
                yunB.name=Arduino Yún - 32k
                yunB.upload.via_ssh=true
                yunB.vid.0=0x2341
                yunB.pid.0=0x0041
                yunB.vid.1=0x2341
                yunB.pid.1=0x8041
                yunB.upload.tool=avrdude
                yunB.upload.protocol=avr109
                yunB.upload.maximum_size=32768
                yunB.upload.maximum_data_size=2560
                yunB.upload.speed=57600
                yunB.upload.disable_flushing=true
                yunB.upload.use_1200bps_touch=true
                yunB.upload.wait_for_upload_port=true
                yunB.bootloader.tool=avrdude
                yunB.bootloader.low_fuses=0xff
                yunB.bootloader.high_fuses=0xd0
                yunB.bootloader.extended_fuses=0xfb
                yunB.bootloader.file=caterina/Caterina-Yun.hex
                yunB.bootloader.unlock_bits=0x3F
                yunB.bootloader.lock_bits=0x2F
                yunB.build.mcu=atmega32u4
                yunB.build.f_cpu=16000000L
                yunB.build.vid=0x2341
                yunB.build.pid=0x8041
                yunB.build.usb_product="Arduino Yun"
                yunB.build.board=AVR_YUN
                yunB.build.core=arduino
                yunB.build.variant=yun
                yunB.build.extra_flags={build.usb_flags}
                ##############################################################

You can edit /usr/bin/merge-sketch-with-bootloader.lua

with:

#!/usr/bin/lua
do return end

This will make the lua script do nothing.

Ah! so is the merge sketch side done on the Yun, not on the IDE?

mearsy25:
Ah! so is the merge sketch side done on the Yun, not on the IDE?

yes

mearsy25, I was in the middle of writing a blog post somewhat about your question when I answered.

If anyone is interested in how the Arduino IDE talks to the Yun the first section of my blog post talks about that.
http://dev.arbor-io.com/2014/07/10/connecting-arduino-ide-and-als/

Ok so I amended as you suggested, which seems to allow me to upload directly from the IDE. However I have an oddity.

It now uploads however as soon as I press the reset button it locks up. Reset remains unresponsive until the sketch is reuploaded.

I have noticed one thing. If my sketch is 87k (The size which I can comfortably do an still fit the boot loader), then the upload works and so does the reset. As soon as I go to 88k the reset stops working.

I assume for some reason the merge with boot loader is still occurring and even though the ide is allowing me to upload sketches of 88k, once its merged with the boot loader some code is being corrupted leading to the missing reset function.

I may have screwed up

i added the do return end line into the merge lua file but i left the rest of the stuff in there. I assume its still being executed?

Well,

I backed up and edited the merge with boot loader file on the gun and changed the .lua file as per your suggestions with just 2 lines and Im still getting the same thing 87% sketch works 88% sketch. the reset command just locks the thing up.

Any ideas?