Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 261 → Rev 262

/DUBwise/trunk/shared/src/DUBwiseLangDefs.java
181,5 → 181,6
public final static int STRINGID_INCOMPATIBLEDEVICE=177;
public final static int STRINGID_PARAMRESETOK=178;
public final static int STRINGID_WRITINGPARAMS=179;
public final static int STRING_COUNT=180;
public final static int STRINGID_GRAPHINTERVAL=180;
public final static int STRING_COUNT=181;
}
/DUBwise/trunk/shared/src/MKCommunicator.java
529,13 → 529,20
wait4send();
params.active_paramset=to;
send_command(FC_SLAVE_ADDR,'s',params.field_bak[to]);
}
 
public void set_debug_interval(int interval)
{
send_command(FC_SLAVE_ADDR,'d',interval);
}
public void send_command(int modul,char cmd)
{
send_command(modul,cmd,new int[0]);
}
 
 
public void send_command(int modul,char cmd,int param)
{
int[] params=new int[1];
632,6 → 639,41
}
 
 
public int[][] debug_buff=null;
public int debug_buff_off=0;
public int debug_buff_len=0;
public int debug_buff_interval=0;
public int debug_buff_lastset=0;
public int debug_buff_max=1;
 
public int[] debug_buff_targets=null;
 
public void setup_debug_buff(int[] targets,int len,int interval)
{
debug_buff=new int[len][targets.length];
 
debug_buff_off=0;
debug_buff_len=len;
debug_buff_interval=interval;
debug_buff_targets=targets;
debug_buff_max=1;
debug_buff_lastset=0;
}
 
public int chg_debug_max(int val)
{
if (val>debug_buff_max)
debug_buff_max=val;
if (-val>debug_buff_max)
debug_buff_max=-val;
return val;
}
 
public void destroy_debug_buff()
{
debug_buff_targets=null;
}
 
public void process_data(byte[] data,int len)
{
 
659,6 → 701,19
log("got debug data");
stats.debug_data_count++;
debug_data.set_by_mk_data(Decode64(data,3,len-3),version);
 
if (debug_buff_targets!=null)
{
for (int sp=0;sp<debug_buff_targets.length;sp++)
debug_buff[debug_buff_off][sp]=chg_debug_max(debug_data.analog[debug_buff_targets[sp]]);
if (debug_buff_off>debug_buff_lastset)
debug_buff_lastset=debug_buff_off;
 
debug_buff_off=(debug_buff_off+1)%debug_buff_len;
 
 
}
log("processed debug data");
break;
1092,7 → 1147,7
recieving=true;
int read_count =reader.read(data_in_buff,0,reader.available());
log("Connected - reading data " + read_count);
// log("Connected - reading data " + read_count);
// pos=0;
input=0;
//data_buff[data_buff_pos]="";
/DUBwise/trunk/shared/src/MKWatchDog.java
69,7 → 69,7
if (mk.connected&&(!mk.force_disconnect))
{
 
mk.log("watchdog pre main loop");
// mk.log("watchdog pre main loop");
if (mk.init_bootloader)
{
mk.jump_bootloader();
164,6 → 164,9
 
break;
 
case USER_INTENT_GRAPH:
mk.set_debug_interval(mk.debug_buff_interval);
break;
default:
// mk.log("uncactched intent " +mk.root.canvas.user_intent );
break;