Reverted AVRISP-MKII clone project watchdog based command timeout patch in favour...

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / Lib / ProgrammerConfig.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
index 239227c..9175236 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
@@ -7,7 +7,7 @@
 */
 
 /*
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -40,7 +40,7 @@ struct
 
 bool ProgrammerConfig_ProcessConfiguration(void)
 {
 
 bool ProgrammerConfig_ProcessConfiguration(void)
 {

-       memset(&ProgrammerConfig, sizeof(ProgrammerConfig), 0x00);
+       memset(&ProgrammerConfig, 0x00, sizeof(ProgrammerConfig));

 
        if (!(pf_open("CONF.txt") == FR_OK))
        {
 
        if (!(pf_open("CONF.txt") == FR_OK))
        {


@@ -61,8 +61,8 @@ bool ProgrammerConfig_ProcessConfiguration(void)
                                                                               &ProgrammerConfig.SigBytes[1],
                                                                               &ProgrammerConfig.SigBytes[2],
                                                                               &ProgrammerConfig.SigBytes[3]);
                                                                               &ProgrammerConfig.SigBytes[1],
                                                                               &ProgrammerConfig.SigBytes[2],
                                                                               &ProgrammerConfig.SigBytes[3]);

-
-                       sscanf(CurrentLine, "SPEED = %lu", &ProgrammerConfig.ProgrammingSpeed);
+                                                                                                                                  
+                       sscanf(CurrentLine, "SPEED = %08lu", &ProgrammerConfig.ProgrammingSpeed);

                }
        } while (CurrentLine);
 
                }
        } while (CurrentLine);