new: Support to PIC18F67J60 added to Breadboard board

lcgamboa · Mar 24, 2024 · 829fff5 · 829fff5
1 parent d106025
commit 829fff5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG_auto.md b/CHANGELOG_auto.md
@@ -2,6 +2,8 @@
 
 ### New
 
+* Add initial support to ESP32 RMT TX. [lcgamboa]
+
 * Add support to use analog values in gpboard (gpsim backend) [lcgamboa]
 
 * Add I2C support to ESP32C3. [lcgamboa]
@@ -14,6 +16,10 @@
 
 ### Fix
 
+* Fix spare parts window position on start. [lcgamboa]
+
+* Fix support to multi byte char in command line file name. [lcgamboa]
+
 * Fix path for load rcontrol and debug port from options. [lcgamboa]
 
 

diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,7 @@
 ### FIXMEs
 | Filename | line # | FIXME |
 |:------|:------:|:------|
-| [src/picsimlab1.cc](src/picsimlab1.cc#L1041) | 1041 | remote control disabled |
+| [src/picsimlab1.cc](src/picsimlab1.cc#L1061) | 1061 | remote control disabled |
 | [src/boards/board_uCboard.cc](src/boards/board_uCboard.cc#L298) | 298 | NSTEP must be multiplied for 4 |
 | [src/boards/bsim_simavr.cc](src/boards/bsim_simavr.cc#L1595) | 1595 | avr CONFIG size |
 | [src/devices/io_MCP23X17.cc](src/devices/io_MCP23X17.cc#L134) | 134 | only for BANK=0; |
@@ -12,13 +12,13 @@
 ### TODOs
 | Filename | line # | TODO |
 |:------|:------:|:------|
-| [src/picsimlab4.cc](src/picsimlab4.cc#L416) | 416 | select the better mode for channel trigguer |
+| [src/picsimlab4.cc](src/picsimlab4.cc#L415) | 415 | select the better mode for channel trigguer |
 | [src/boards/board_Arduino_Mega.cc](src/boards/board_Arduino_Mega.cc#L68) | 68 | cboard_Arduino_Mega: add suport to analog inputs A6 and A7 |
 | [src/boards/board_Arduino_Nano.cc](src/boards/board_Arduino_Nano.cc#L69) | 69 | cboard_Arduino_Nano: add suport to analog inputs A6 and A7 |
-| [src/boards/board_McLab2.cc](src/boards/board_McLab2.cc#L98) | 98 | jumper support |
-| [src/boards/board_PICGenios.cc](src/boards/board_PICGenios.cc#L236) | 236 | TEMP cooler must don't work with AQUE=0 |
+| [src/boards/board_McLab2.cc](src/boards/board_McLab2.cc#L100) | 100 | jumper support |
+| [src/boards/board_PICGenios.cc](src/boards/board_PICGenios.cc#L238) | 238 | TEMP cooler must don't work with AQUE=0 |
 | [src/boards/board_RemoteTCP.cc](src/boards/board_RemoteTCP.cc#L176) | 176 | define pins |
-| [src/boards/bsim_gpsim.cc](src/boards/bsim_gpsim.cc#L169) | 169 | add VCC and GND pins |
+| [src/boards/bsim_gpsim.cc](src/boards/bsim_gpsim.cc#L168) | 168 | add VCC and GND pins |
 | [src/boards/bsim_simavr.cc](src/boards/bsim_simavr.cc#L1210) | 1210 | default output value is not used yet (DOV) |
 | [src/boards/bsim_simavr.cc](src/boards/bsim_simavr.cc#L1578) | 1578 | avr ID pointer |
 | [src/boards/bsim_simavr.cc](src/boards/bsim_simavr.cc#L1600) | 1600 | avr ID size |

diff --git a/VERSION b/VERSION
@@ -2,5 +2,5 @@ PACKAGE=picsimlab
 MAINVER=0
 MINORVER=9
 VERSION=0.9.2
-DATE=240302
+DATE=240324
 VERSION_STABLE=0.9.1
diff --git a/src/boards/board_Breadboard.h b/src/boards/board_Breadboard.h
@@ -98,7 +98,8 @@ class cboard_Breadboard : public bsim_picsim, public bsim_simavr {
         return "atmega328p,atmega2560,attiny85,PIC16F1516,PIC16F18324,PIC16F18855,PIC16F1619,PIC16F1788,PIC16F1789,"
                "PIC16F1827,PIC16F1829,PIC16F1847,PIC16F1939,PIC16F1947,PIC16F628A,PIC16F648A,PIC16F688,PIC16F84A,"
                "PIC16F777,PIC16F819,PIC16F877A,PIC16F886,PIC16F887,PIC18F24Q10,PIC18F26K80,PIC18F27K40,PIC18F452,"
-               "PIC18F4520,PIC18F4550,PIC18F45K50,PIC18F4580,PIC18F4620,PIC18F46J50,PIC18F47K40,PIC18F67J94,";
+               "PIC18F4520,PIC18F4550,PIC18F45K50,PIC18F4580,PIC18F4620,PIC18F46J50,PIC18F47K40,PIC18F67J60,"
+               "PIC18F67J94,";
     };
     // Reset board status
     void Reset(void) override;

diff --git a/src/boards/board_C3_DevKitC.cc b/src/boards/board_C3_DevKitC.cc
@@ -667,10 +667,7 @@ void cboard_C3_DevKitC::BoardOptions(int* argc, char** argv) {
 void cboard_C3_DevKitC::board_ButtonEvent(const char* controlname, unsigned int button, unsigned int x, unsigned int y,
                                           unsigned int state) {
     if (!strcmp(controlname, "b_button2")) {
-        std::string fname = PICSimLab.GetSharePath() +
-                            "boards"
-                            "/" BOARD_C3_DevKitC_Name +
-                            "/config.lxrad";
+        std::string fname = PICSimLab.GetSharePath() + "boards/" BOARD_C3_DevKitC_Name + "/config.lxrad";
         if (PICSimLab.SystemCmd(PSC_FILEEXISTS, fname.c_str())) {
             if (PICSimLab.WindowCmd(wconfigId, NULL, PWA_WINDOWLOADXML, fname.c_str())) {
                 char buff[2048];
@@ -726,6 +723,11 @@ void cboard_C3_DevKitC::board_ButtonEvent(const char* controlname, unsigned int
                             }
                         }
                         arg = strtok(NULL, " \n");
+
+                        if ((!arg && (line[0] == '-')) || ((arg) && (arg[0] == '-') && (line[0] == '-'))) {
+                            PICSimLab.WindowCmd(wconfigId, "text2", PWA_TEXTADDLINE, line);
+                            line[0] = 0;
+                        }
                     }
                 } else {
                     PICSimLab.WindowCmd(wconfigId, "text2", PWA_TEXTCLEAR, NULL);

diff --git a/src/boards/board_DevKitC.cc b/src/boards/board_DevKitC.cc
@@ -785,6 +785,11 @@ void cboard_DevKitC::board_ButtonEvent(const char* controlname, unsigned int but
                             }
                         }
                         arg = strtok(NULL, " \n");
+
+                        if ((!arg && (line[0] == '-')) || ((arg) && (arg[0] == '-') && (line[0] == '-'))) {
+                            PICSimLab.WindowCmd(wconfigId, "text2", PWA_TEXTADDLINE, line);
+                            line[0] = 0;
+                        }
                     }
                 } else {
                     PICSimLab.WindowCmd(wconfigId, "text2", PWA_TEXTCLEAR, NULL);